zc

src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/index.vue

@@ -102,15 +102,15 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-hasPermi="['safety:checkManage_1:query']"
-                   v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                   v-show="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
                 <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_1:query','safety:checkManage_1:edit']"
-                   v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                   v-show="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_1:query','safety:checkManage_1:edit']"
-                   v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                   v-show="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_1:query','safety:checkManage_1:edit']"
-                   style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
-                <p class="table-button-p" v-if="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
-                <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
+                   style="color:#999" v-show="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
+                <p class="table-button-p" v-show="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
+                <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
             </template>

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -1269,6 +1269,9 @@
       display: flex;
       overflow: hidden;
       height:610px;
+      .el-table__empty-text{
+        background-size: 20%!important;
+      }
       .left-max-box{
         width:270px;
         border-right:1px dashed #D8D8D8;
@@ -1476,6 +1479,9 @@
       overflow: hidden;
       height:610px;
       margin-right:30px;
+      .el-table__empty-text{
+        background-size: 24%!important;
+      }
       .dept-table-title-box{
         display: flex;
         padding:0 20px;
@@ -1536,6 +1542,9 @@
       overflow: hidden;
       height:610px;
       margin-right:30px;
+      .el-table__empty-text{
+        background-size: 30%!important;
+      }
       .dept-table-title-box{
         display: flex;
         padding:0 20px;
@@ -1621,6 +1630,9 @@
       overflow: hidden;
       height:610px;
       margin-right:30px;
+      .el-table__empty-text{
+        background-size: 30%!important;
+      }
       .dept-table-title-box{
         display: flex;
         padding:0 20px;

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/index.vue

@@ -87,14 +87,14 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-hasPermi="['security:checkPlan_1:query']"
-                   v-if="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
+                   v-show="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkPlan_1:query','security:checkPlan_1:edit']"
-                   v-if="scope.row.checkStatus==1" @click="addDialogOpen(2,scope.row)">编辑</p>
+                   v-show="scope.row.checkStatus==1" @click="addDialogOpen(2,scope.row)">编辑</p>
                 <p class="table-button-p" v-hasPermi="['security:checkManage_3:list']"
                    @click="goPage(2,scope.row)">自查管理</p>
                 <p class="table-button-p" v-hasPermi="['security:checkPlan_1:remove']"
-                   v-if="scope.row.checkStatus==1" @click="deleteObj(scope.row)">删除</p>
-                <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
+                   v-show="scope.row.checkStatus==1" @click="deleteObj(scope.row)">删除</p>
+                <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
             </template>

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/listPage.vue

@@ -95,15 +95,15 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-hasPermi="['security:checkManage_3:query']"
-                   v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                   v-show="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkManage_3:query','security:checkManage_3:edit']"
-                   v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                   v-show="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkManage_3:query','security:checkManage_3:edit']"
-                   v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                   v-show="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p"
-                   style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
-                <p class="table-button-p" v-if="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
-                <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
+                   style="color:#999" v-show="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
+                <p class="table-button-p" v-show="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
+                <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
             </template>

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -100,15 +100,15 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-hasPermi="['safety:checkManage:query']"
-                   v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                   v-show="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
                 <p class="table-button-p" v-hasPermiAnd="['safety:checkManage:query','safety:checkManage:edit']"
-                   v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                   v-show="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-hasPermiAnd="['safety:checkManage:query','safety:checkManage:edit']"
-                   v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                   v-show="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-hasPermiAnd="['safety:checkManage:query','safety:checkManage:edit']"
-                   style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
-                <p class="table-button-p" v-if="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
-                <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
+                   style="color:#999" v-show="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
+                <p class="table-button-p" v-show="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
+                <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
             </template>

src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue

@@ -1644,6 +1644,9 @@
       display: flex;
       overflow: hidden;
       height:610px;
+      .el-table__empty-text{
+        background-size: 20%!important;
+      }
       .left-max-box{
         width:270px;
         border-right:1px dashed #D8D8D8;
@@ -1854,6 +1857,9 @@
       overflow: hidden;
       height:610px;
       margin-right:30px;
+      .el-table__empty-text{
+        background-size: 24%!important;
+      }
       .dept-table-title-box{
         display: flex;
         padding:0 20px;
@@ -1914,6 +1920,9 @@
       overflow: hidden;
       height:610px;
       margin-right:30px;
+      .el-table__empty-text{
+        background-size: 30%!important;
+      }
       .dept-table-title-box{
         display: flex;
         padding:0 20px;
@@ -1999,6 +2008,9 @@
       overflow: hidden;
       height:610px;
       margin-right:30px;
+      .el-table__empty-text{
+        background-size: 30%!important;
+      }
       .dept-table-title-box{
         display: flex;
         padding:0 20px;

src/views/safetyCheck/schoolInspection/inspectionPlan/index.vue

@@ -87,14 +87,14 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-hasPermi="['security:checkPlan:query']"
-                   v-if="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
+                   v-show="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkPlan:query','security:checkPlan:edit']"
-                   v-if="scope.row.checkStatus==1" @click="addDialogOpen(2,scope.row)">编辑</p>
+                   v-show="scope.row.checkStatus==1" @click="addDialogOpen(2,scope.row)">编辑</p>
                 <p class="table-button-p" v-hasPermi="['security:checkManage_2:list']"
                    @click="goPage(2,scope.row)">巡查管理</p>
                 <p class="table-button-p" v-hasPermi="['security:checkPlan:remove']"
-                   v-if="scope.row.checkStatus==1" @click="deleteObj(scope.row)">删除</p>
-                <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
+                   v-show="scope.row.checkStatus==1" @click="deleteObj(scope.row)">删除</p>
+                <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
             </template>

src/views/safetyCheck/schoolInspection/inspectionPlan/listPage.vue

@@ -95,15 +95,15 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-hasPermi="['security:checkManage_2:query']"
-                   v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                   v-show="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
-                   v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                   v-show="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
-                   v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                   v-show="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
-                   style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
-                <p class="table-button-p" v-if="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
-                <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
+                   style="color:#999" v-show="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
+                <p class="table-button-p" v-show="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
+                <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
             </template>

src/views/safetyCheck/startInspection/index.vue

@@ -8,7 +8,7 @@
           <div class="top-form-box">
             <div class="top-form-left-box">
               <el-form-item label="实验室" prop="subId">
-                <el-select placeholder="请输入关键词" filterable remote reserve-keyword style="width: 500px"
+                <el-select placeholder="搜索实验室或房间号" filterable remote reserve-keyword style="width: 500px"
                            v-model="addForm.subId" @change="subChange" :remote-method="getSubList">
                   <el-option
                     v-for="item in subSelectList"
@@ -521,7 +521,7 @@
       },
       //根据楼栋id查询实验室列表
       buildBySubList(data,type){
-        let obj = type == 1?{buildId:data}:{name:data}
+        let obj = type == 1?{buildId:data}:{searchValue:data}
         buildBySubList(obj).then(response => {
           this.subSelectList = response.data;
         });

src/views/safetyCheck/worktable/hiddenDangerStatisticsEcharts.vue

@@ -5,7 +5,7 @@
       <p :class="hdLevel==2?'check-p':''" @click="titleButtonClick(2)">二级指标</p>
       <p :class="hdLevel==3?'check-p':''" @click="titleButtonClick(3)">三级指标</p>
     </div>
-    <p v-if="nullType" style="line-height:100px;text-align: center;color:#999;">暂无数据</p>
+    <img  v-if="nullType" class="null-img" src="@/assets/ZDimages/null-data-1.png">
     <div class="hiddenDangerStatisticsEcharts-box" id="hiddenDangerStatisticsEcharts-box">
     </div>
   </div>
@@ -289,6 +289,11 @@
 <style scoped lang="scss">
   .hiddenDangerStatisticsEcharts{
     height:483px;
+    overflow: hidden;
+    .null-img{
+      width:160px;
+      margin:100px 0 0 170px;
+    }
     .title-button-box{
       display: flex;
       border:1px solid #0183fa;

src/views/safetyCheck/worktable/toDoListBox.vue

@@ -49,7 +49,7 @@
         <img class="position-img" v-if="item.checkRange == 2" src="@/assets/ZDimages/safetyCheck/icon_xyxc_xy.png">
         <img class="position-img" v-if="item.checkRange == 3" src="@/assets/ZDimages/safetyCheck/icon_xyxc_sys.png">
       </div>
-      <p class="null-p" v-if="!tableList[0]">暂无数据</p>
+      <img  v-if="!tableList[0]" class="null-img" src="@/assets/ZDimages/null-data-1.png">
     </div>
     <infoDialog v-if="infoDialogType" :propsInfoDialogData="propsInfoDialogData"></infoDialog>
     <lookDocumentListDialog v-if="lookDocumentListType" :propsLookDocumentListData="propsLookDocumentListData"></lookDocumentListDialog>
@@ -292,6 +292,10 @@
       position: relative;
       padding:0 20px 20px;
       flex:1;
+      .null-img{
+        width:160px;
+        margin:160px 0 0 170px;
+      }
       .for-list-box{
         height:190px;
         border-radius:20px;