人员定报表内容调整

src/assets/styles/mlargeScreen.css

@@ -1083,20 +1083,20 @@
     color: #01f5fe;
     border: 2px solid #01f5fe;
 }
-.el-select-dropdown__list{
-    background-color: #021445 !important;
-    border: 1px solid #01f5fe;
-    color:  #31E5F5;
-}
-.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
-    background-color: #021445 !important;
-    color:  #31E5F5;
-}
-.el-select-dropdown__item{
-    background-color: #021445 !important;
-    color:  #31E5F5;
-    font-size: 16px;
-}
+/*.el-select-dropdown__list{*/
+/*    background-color: #021445 !important;*/
+/*    border: 1px solid #01f5fe;*/
+/*    color:  #31E5F5;*/
+/*}*/
+/*.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{*/
+/*    background-color: #021445 !important;*/
+/*    color:  #31E5F5;*/
+/*}*/
+/*.el-select-dropdown__item{*/
+/*    background-color: #021445 !important;*/
+/*    color:  #31E5F5;*/
+/*    font-size: 16px;*/
+/*}*/
 .el-cascader-panel{
     background-color: #021445 !important;
     color:  #31E5F5;
@@ -1459,7 +1459,7 @@
     box-sizing: border-box;
     overflow-y: scroll;
     background-color: rgba(32,42,67,0.95);
-    
+
 }
 .videoListView_content::-webkit-scrollbar {
   /*滚动条整体样式*/
@@ -1510,4 +1510,4 @@
     bottom: 5px;
     padding: 0 15% 10px;
     box-sizing: border-box;
-}
\ No newline at end of file
+}

src/views/personnelPositioning/peopleLocation/index.vue

@@ -41,7 +41,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="phone" label="电话" align="center"></el-table-column>
-                <el-table-column prop="cameraid" label="摄像头id" align="center"></el-table-column>
+<!--                <el-table-column prop="cameraid" label="摄像头id" align="center"></el-table-column>-->
                 <el-table-column prop="safetyhatmac" label="安全帽MAC" align="center"></el-table-column>
                 <el-table-column prop="safetyhatelectricity" label="安全帽电量" align="center"></el-table-column>
                 <el-table-column prop="safetyhatstatus" label="安全帽状态" align="center">
@@ -103,9 +103,9 @@
           </el-col>
           <el-col :span="12">
             <div class="grid-content">
-              <el-form-item label="摄像头id：" class="form-cell" prop="cameraid">
+              <el-form-item label="身份证号：" class="form-cell" prop="idcard">
                 <div class="cell-box">
-                  <el-input v-model="formData.cameraid" class="cell-input"></el-input>
+                  <el-input v-model="formData.idcard" class="cell-input"></el-input>
                 </div>
               </el-form-item>
             </div>
@@ -163,17 +163,6 @@
             </div>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-            <div class="grid-content">
-              <el-form-item label="身份证号：" class="form-cell" prop="idcard">
-                <div class="cell-box">
-                  <el-input v-model="formData.idcard" class="cell-input"></el-input>
-                </div>
-              </el-form-item>
-            </div>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="24">
             <div class="grid-content">
@@ -226,6 +215,7 @@ export default {
         {label: '红色', value: '1'},
         {label: '黄色', value: '2'},
         {label: '蓝色', value: '3'},
+        {label: '白色', value: '4'},
       ],
       tableData: [],
       allDepartmentData: [],
@@ -234,7 +224,6 @@ export default {
         name: '',
         sex: 1,
         phone: '',
-        cameraid: '',
         idcard: '',
         safetyhatmac: '',
         color: '1',
@@ -246,9 +235,7 @@ export default {
       rules: {
         name: {required: true, message: ' ', trigger: 'blur'},
         phone: {required: true, message: ' ', trigger: 'blur'},
-        cameraid: {required: true, message: ' ', trigger: 'blur'},
         safetyhatmac: {required: true, message: ' ', trigger: 'blur'},
-        idcard: {required: true, message: ' ', trigger: 'blur'},
       },
     }
   },
@@ -336,7 +323,6 @@ export default {
         name: '',
         sex: 1,
         phone: '',
-        cameraid: '',
         idcard: '',
         safetyhatmac: '',
         color: '1',

src/views/personnelPositioning/peopleLogData/index.vue

@@ -7,8 +7,8 @@
         <!-- 搜索 -->
         <label class="el-form-item-label" style="font-weight: 500;">安全帽</label>
         <el-input v-model="query.safetyhatmac" clearable size="small" placeholder="请输入安全帽MAC" style="width:180px;"/>
-        <label class="el-form-item-label" style="font-weight: 500;">摄像头id</label>
-        <el-input v-model="query.cameraid" clearable size="small" placeholder="请输入id" style="width:180px;"/>
+<!--        <label class="el-form-item-label" style="font-weight: 500;">摄像头id</label>-->
+<!--        <el-input v-model="query.cameraid" clearable size="small" placeholder="请输入id" style="width:180px;"/>-->
         <label class="el-form-item-label" style="font-weight: 500;">人员姓名</label>
         <el-input v-model="query.name" clearable size="small" placeholder="请输入姓名" style="width:180px;"/>
         <label class="el-form-item-label" style="font-weight: 500;">工种</label>
@@ -32,7 +32,7 @@
             <div class="content">
               <el-table :data="tableData" v-loading="loading" border style="width:auto">
                 <el-table-column prop="safetyhatmac" label="安全帽MAC" align="center"></el-table-column>
-                <el-table-column prop="cameraid" label="摄像头id" align="center"></el-table-column>
+<!--                <el-table-column prop="cameraid" label="摄像头id" align="center"></el-table-column>-->
                 <el-table-column prop="type" label="工种" align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.type=='1'?'访客':'员工' }}</span>
@@ -210,7 +210,7 @@ export default {
       var param = this.query;
       param.page = this.page - 1;
       param.size = this.size;
-      param.vague = {cameraid:param.cameraid||undefined,safetyhatmac:param.safetyhatmac||undefined,name:param.name||undefined};
+      param.vague = {safetyhatmac:param.safetyhatmac||undefined,name:param.name||undefined};
       param.exact = {type:param.type};
       param.sort = `date,desc`;
       this.$nextTick(() => {
@@ -274,6 +274,7 @@ export default {
         safetyhatmac: this.peoItem.safetyhatmac,
         page: this.pagePos - 1,
         size: this.sizePos,
+        sort: `date,desc`
       };
       param.daterange = undefined;
       if (this.posDate && this.posDate.length) {
@@ -396,7 +397,7 @@ export default {
       var param = this.query;
       param.page = this.page - 1;
       param.size = this.size;
-      param.vague = {cameraid:param.cameraid||undefined,safetyhatmac:param.safetyhatmac||undefined,name:param.name||undefined};
+      param.vague = {safetyhatmac:param.safetyhatmac||undefined,name:param.name||undefined};
       param.exact = {type:param.type};
       param.sort = `date,desc`;
 

src/views/personnelPositioning/visitPeople/index.vue

@@ -5,8 +5,8 @@
       <!--工具栏-->
       <div class="head-container">
         <!-- 搜索 -->
-        <label class="el-form-item-label" style="font-weight: 500;">摄像头id</label>
-        <el-input v-model="query.cameraid" clearable size="small" placeholder="请输入id" style="width:180px;"/>
+<!--        <label class="el-form-item-label" style="font-weight: 500;">摄像头id</label>-->
+<!--        <el-input v-model="query.cameraid" clearable size="small" placeholder="请输入id" style="width:180px;"/>-->
         <label class="el-form-item-label" style="font-weight: 500;">安全帽</label>
         <el-input v-model="query.safetyhatmac" clearable size="small" placeholder="请输入安全帽MAC" style="width:180px;"/>
         <label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
@@ -34,7 +34,7 @@
             </div>
             <div class="content">
               <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
-                <el-table-column prop="cameraid" label="摄像头id" align="center"></el-table-column>
+<!--                <el-table-column prop="cameraid" label="摄像头id" align="center"></el-table-column>-->
                 <el-table-column prop="safetyhatmac" label="安全帽MAC" align="center"></el-table-column>
                 <el-table-column prop="safetyhatelectricity" label="安全帽电量" align="center"></el-table-column>
                 <el-table-column prop="safetyhatstatus" label="安全帽状态" align="center">
@@ -63,15 +63,15 @@
     <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="visible" :title="title" width="800px">
       <el-form :model="formData" :rules="rules" ref="formViewRef" :inline="true" :status-icon="true">
         <el-row>
-          <el-col :span="12">
-            <div class="grid-content">
-              <el-form-item label="摄像头id：" class="form-cell" prop="cameraid">
-                <div class="cell-box">
-                  <el-input v-model="formData.cameraid" class="cell-input"></el-input>
-                </div>
-              </el-form-item>
-            </div>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <div class="grid-content">-->
+<!--              <el-form-item label="摄像头id：" class="form-cell" prop="cameraid">-->
+<!--                <div class="cell-box">-->
+<!--                  <el-input v-model="formData.cameraid" class="cell-input"></el-input>-->
+<!--                </div>-->
+<!--              </el-form-item>-->
+<!--            </div>-->
+<!--          </el-col>-->
           <el-col :span="12">
             <div class="grid-content">
               <el-form-item label="安全帽MAC：" class="form-cell" prop="safetyhatmac">
@@ -113,11 +113,11 @@ export default {
 
       tableData: [],
       formData: {
-        cameraid: '',
+        // cameraid: '',
         safetyhatmac: '',
       },
       rules: {
-        cameraid: {required: true, message: ' ', trigger: 'blur'},
+        // cameraid: {required: true, message: ' ', trigger: 'blur'},
         safetyhatmac: {required: true, message: ' ', trigger: 'blur'},
 
       },
@@ -133,7 +133,7 @@ export default {
       var param = this.query;
       param.page = this.page - 1;
       param.size = this.size;
-      param.vague = {cameraid:param.cameraid||undefined,safetyhatmac:param.safetyhatmac||undefined};
+      param.vague = {safetyhatmac:param.safetyhatmac||undefined};
       param.exact = {"type":"1"};
       param.sort = `date,desc`;
       param.daterange = undefined;
@@ -155,7 +155,6 @@ export default {
       this.title = '新增';
       this.visible = true;
       this.formData = {
-        cameraid: '',
         safetyhatmac: '',
       };
     },
@@ -201,7 +200,7 @@ export default {
       var param = this.query;
       param.page = this.page - 1;
       param.size = this.size;
-      param.vague = {cameraid:param.cameraid||undefined,safetyhatmac:param.safetyhatmac||undefined};
+      param.vague = {safetyhatmac:param.safetyhatmac||undefined};
       param.exact = {"type":"1"};
       param.sort = `date,desc`;
       param.daterange = undefined;

src/views/productionPlanManagement/productionPlan/index.vue

@@ -32,12 +32,12 @@
                 实际产出：<span style="font-size:18px;font-weight:400;color:#356eec">{{ day.totalProduce }}</span> 吨<br>
               </div>
             </div>
-<!--            <div style="width:100%;font-size:12px;padding-left:5px;">采点分配概览：</div>-->
-<!--            <div class="fbListBox">-->
-<!--              <div v-for="item in day.sumList" :style="{width:item.pv+'%',height:'2px',margin:'2px',background:'#8fbc8f'}">-->
-<!--                <div :style="{width:item.av+'%',height:'2px',background:'#00a0e9'}"></div>-->
-<!--              </div>-->
-<!--            </div>-->
+            <div style="width:100%;font-size:12px;padding-left:5px;">采点分配概览：</div>
+            <div class="fbListBox">
+              <div v-for="item in day.sumList" :style="{width:item.pv+'%',height:'2px',margin:'2px',background:'#8fbc8f'}">
+                <div :style="{width:item.av+'%',height:'2px',background:'#00a0e9'}"></div>
+              </div>
+            </div>
           </div>
           <div v-else>
             <div style="width: 100%;display:flex">