dedsudiyu hace 2 años
padre
commit
79ba5da04f

+ 2 - 2
src/views/comprehensive/personnel/onDutyConfiguration/index.vue

@@ -87,7 +87,7 @@
       <div class="top-title-select-box">
         <div class="top-title-num-box">
           <p>日期:</p>
-          <p>已选{{checkList.length}}天</p>
+          <p>已选{{checkList.length}}天</p>
         </div>
         <el-form :model="formData" ref="upForm" :rules="rules">
           <el-form-item label="实验室:" prop="subCheckList" class="form-item" label-width="80px">
@@ -312,7 +312,7 @@
             ]
           }]
         }],
-        //已选人员数据
+        //已选人员数据
         userCheckList:[],
         showSearch:true,
         loading:false,

+ 1 - 1
src/views/comprehensive/personnel/patrolRecord/index.vue

@@ -62,7 +62,7 @@
             <div class="year-big-box">
               <div class="for-year-big-box" v-for="(item,index) in year.list" :key="item.key">
                 <p class="for-year-top-big-box" :class="item.disable?'for-year-top-big-box-color':''">{{item.date}}</p>
-                <div class="for-year-bottom-big-box" :class="!item.disable&&item.noSignedInCount>0?'red-backgroud-color':''" v-if="item.signInCount>0" @click.stop="goPage('info',item)">{{item.noSignedInCount>0?item.noSignedInCount:item.signInCount}}人</div>
+                <div class="for-year-bottom-big-box" :class="!item.disable&&item.noSignedInCount>0?'red-backgroud-color':''" v-if="item.signInCount>0&&!item.disable" @click.stop="goPage('info',item)">{{item.noSignedInCount>0?item.noSignedInCount:item.signInCount}}人</div>
               </div>
             </div>
           </div>

+ 8 - 8
src/views/emergencyManagement/electronicInformationBoard/index.vue

@@ -143,14 +143,14 @@
             { required: true, message: "请选择实验室", trigger: "change" },
             { required: true, message: "请选择实验室", validator: this.spaceJudgment, trigger: "change" },
           ],
-          location: [
-            { required: true, message: "请输入安装位置", trigger: "change" },
-            { required: true, message: "请输入安装位置", validator: this.spaceJudgment, trigger: "change" },
-          ],
-          isStart: [
-            { required: true, message: "请选择是否关联门禁", trigger: "change" },
-            { required: true, message: "请选择是否关联门禁", validator: this.spaceJudgment, trigger: "change" },
-          ],
+          // location: [
+          //   { required: true, message: "请输入安装位置", trigger: "change" },
+          //   { required: true, message: "请输入安装位置", validator: this.spaceJudgment, trigger: "change" },
+          // ],
+          // isStart: [
+          //   { required: true, message: "请选择是否关联门禁", trigger: "change" },
+          //   { required: true, message: "请选择是否关联门禁", validator: this.spaceJudgment, trigger: "change" },
+          // ],
         },
         selectList:[],
         selectListData:[],