Merge branch 'web-v2' into web-v2-pro

src/api/evacuation3_2/index.js

@@ -122,7 +122,7 @@ export function lineVertex(data) {
 //获取预案详情
 export function selectRiskPlanLeveList(data) {
   return request({
-    url: '/zd-laboratory/plan/lists/',
+    url: '/laboratory/plan/lists/',
     method: 'post',
     data: data
   })
@@ -130,7 +130,7 @@ export function selectRiskPlanLeveList(data) {
 //获取预案详情
 export function setPlanData(data) {
   return request({
-    url: '/zd-laboratory/plan',
+    url: '/laboratory/plan',
     method: 'post',
     data: data
   })
@@ -138,7 +138,7 @@ export function setPlanData(data) {
 //新增预案(名称)
 export function addPlan(data) {
   return request({
-    url: '/zd-laboratory/plan/add',
+    url: '/laboratory/plan/add',
     method: 'post',
     data:data
   })
@@ -146,7 +146,7 @@ export function addPlan(data) {
 //修改预案(名称)
 export function putPlan(data) {
   return request({
-    url: '/zd-laboratory/plan/update',
+    url: '/laboratory/plan/update',
     method: 'put',
     data:data
   })
@@ -155,7 +155,7 @@ export function putPlan(data) {
 //删除预案
 export function delPlanData(data) {
   return request({
-    url: '/zd-laboratory/plan/delete/'+data,
+    url: '/laboratory/plan/delete/'+data,
     method: 'delete',
   })
 }
@@ -163,14 +163,14 @@ export function delPlanData(data) {
 //根据ID查询分级列表
 export function selectRiskPlanLeveListRiskPlanId(id) {
   return request({
-    url: '/zd-laboratory/planLevel/selectRiskPlanLeveList/'+id,
+    url: '/laboratory/planLevel/selectRiskPlanLeveList/'+id,
     method: 'get',
   })
 }
 //新增预案分级数据
 export function planLevelAdd(data) {
   return request({
-    url: '/zd-laboratory/planLevel/add',
+    url: '/laboratory/planLevel/add',
     method: 'post',
     data:data
   })
@@ -178,7 +178,7 @@ export function planLevelAdd(data) {
 //编辑预案分级数据
 export function planLevelPut(data) {
   return request({
-    url: '/zd-laboratory/planLevel/update',
+    url: '/laboratory/planLevel/update',
     method: 'put',
     data:data
   })
@@ -186,7 +186,7 @@ export function planLevelPut(data) {
 //编辑预案分级数据
 export function planLevelDel(data) {
   return request({
-    url: '/zd-laboratory/planLevel/delete/',
+    url: '/laboratory/planLevel/delete/',
     method: 'delete',
     data:data
   })
@@ -195,7 +195,7 @@ export function planLevelDel(data) {
 //获取关联预案实验室列表
 export function getLabRiskPlanJoinSub(data) {
   return request({
-    url: '/zd-laboratory/plan/getLabRiskPlanJoinSub',
+    url: '/laboratory/plan/getLabRiskPlanJoinSub',
     method: 'post',
     data: data
   })
@@ -203,7 +203,7 @@ export function getLabRiskPlanJoinSub(data) {
 //获取非关联预案实验室列表
 export function getLabRiskPlanNoJoinSub(data) {
   return request({
-    url: '/zd-laboratory/plan/getLabRiskPlanNoJoinSub',
+    url: '/laboratory/plan/getLabRiskPlanNoJoinSub',
     method: 'post',
     data: data
   })
@@ -211,7 +211,7 @@ export function getLabRiskPlanNoJoinSub(data) {
 //删除关联实验室
 export function deleteRiskPlanJoinSub(data) {
   return request({
-    url: '/zd-laboratory/plan/deleteRiskPlanJoinSub',
+    url: '/laboratory/plan/deleteRiskPlanJoinSub',
     method: 'delete',
     data: data
   })
@@ -219,7 +219,7 @@ export function deleteRiskPlanJoinSub(data) {
 //新增关联实验室
 export function riskPlanJoinSub(data) {
   return request({
-    url: '/zd-laboratory/plan/riskPlanJoinSub',
+    url: '/laboratory/plan/riskPlanJoinSub',
     method: 'post',
     data: data
   })
@@ -227,7 +227,7 @@ export function riskPlanJoinSub(data) {
 //批量关联实验室
 export function riskPlanBatchJoinSub(data) {
   return request({
-    url: '/zd-laboratory/plan/riskPlanBatchJoinSub',
+    url: '/laboratory/plan/riskPlanBatchJoinSub',
     method: 'post',
     data: data
   })

src/api/evacuationBigData/index.js

@@ -167,7 +167,7 @@ export function isCancelOutFile(query) {
 //查询当前用户下的预案触发数据
 export function selectTriggerInfo(query) {
   return request({
-    url: '/zd-laboratory/plan/selectTriggerInfo',
+    url: '/laboratory/plan/selectTriggerInfo',
     method: 'get',
     params: query
   })
@@ -175,7 +175,7 @@ export function selectTriggerInfo(query) {
 //标记查看的预案
 export function riskPlanId(query) {
   return request({
-    url: '/zd-laboratory/plan/writerEnterRiskPlan',
+    url: '/laboratory/plan/writerEnterRiskPlan',
     method: 'get',
     params: query
   })

src/api/safetyCheck/index.js

@@ -329,7 +329,7 @@ export function hideHistoryPlanTitle(query) {
 //检查计划-查询当前学校下实验室数量
 export function getAllSubNum(query) {
   return request({
-    url: '/zd-laboratory/subject/getAllSubNum',
+    url: '/laboratory/subject/getAllSubNum',
     method: 'get',
     params: query
   })
@@ -338,7 +338,7 @@ export function getAllSubNum(query) {
 //检查计划-查询当前学校下学院列表与实验室数量
 export function conditionCollegeInfo(query) {
   return request({
-    url: '/zd-laboratory/subject/conditionCollegeInfo',
+    url: '/laboratory/subject/conditionCollegeInfo',
     method: 'get',
     params: query
   })
@@ -347,7 +347,7 @@ export function conditionCollegeInfo(query) {
 //检查计划-查询选中院系下的实验室列表
 export function findSubInfoByDeptIds(data) {
   return request({
-    url: '/zd-laboratory/subject/findSubInfoByDeptIds',
+    url: '/laboratory/subject/findSubInfoByDeptIds',
     method: 'post',
     data: data
   })
@@ -356,7 +356,7 @@ export function findSubInfoByDeptIds(data) {
 //检查计划-查询实验室(已过滤/未选)
 export function conditionSubjectInfo(data) {
   return request({
-    url: '/zd-laboratory/subject/conditionSubjectInfo',
+    url: '/laboratory/subject/conditionSubjectInfo',
     method: 'post',
     data: data
   })
@@ -622,7 +622,7 @@ export function getCheckPlanBySubId(query) {
 //通用接口-根据名称查询实验室列表
 export function buildBySubList(query) {
   return request({
-    url: '/zd-laboratory/subject/buildBySub/list',
+    url: '/laboratory/subject/buildBySub/list',
     method: 'get',
     params: query
   })
@@ -683,7 +683,7 @@ export function hiddenDataItemsSubListTop(query) {
 //工作台跳转后-按名称搜索权限下实验室列表
 export function listSubAdmin(query){
   return request({
-    url: '/zd-laboratory/subject/list/listSubAdmin',
+    url: '/laboratory/subject/list/listSubAdmin',
     method: 'get',
     params: query
   })
@@ -727,3 +727,12 @@ export function getRectifyNotificationView(id){
 //下载-告知书
 //下载-检查材料
 //批量下载-检查材料
+
+//获取权限范围(巡查/自查)
+export function getGentle(query){
+  return request({
+    url: '/zd-security/checkSet/getGentle',
+    method: 'get',
+    params: query
+  })
+}

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -429,7 +429,7 @@ export default {
   },
   data(){
     return{
-      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/zd-laboratory/subject/importSubData", // 上传地址
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/laboratory/subject/importSubData", // 上传地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -1370,7 +1370,7 @@ export default {
     importButton(item){
       if(item.command == 1){
         //  下载模板
-        this.download('/zd-laboratory/subject/exportSubTemplate', {}, `实验室导入模板.xlsx`)
+        this.download('/laboratory/subject/exportSubTemplate', {}, `实验室导入模板.xlsx`)
       }else if(item.command == 2){
         //  导入数据
         console.log('导入数据');
@@ -1379,11 +1379,11 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('/zd-laboratory/subject/exportSubTemplate', {}, `实验室导入模板.xlsx`)
+      this.download('/laboratory/subject/exportSubTemplate', {}, `实验室导入模板.xlsx`)
     },
     /*下载失败列表*/
     failureExcel(){
-      this.download('/zd-laboratory/subject/exportProblemData', {}, `实验室导入模板失败报表.xlsx`)
+      this.download('/laboratory/subject/exportProblemData', {}, `实验室导入模板失败报表.xlsx`)
     },
   },
   beforeDestroy() {

src/views/login.vue

@@ -272,7 +272,8 @@ export default {
               localStorage.setItem('identityType',res.data.screen_type);
             }
             this.fullScreen();
-            this.$router.push({ path: this.redirect || "/home" }).catch(()=>{});
+            //this.$router.push({ path: this.redirect || "/home" }).catch(()=>{});
+            this.$router.push({ path: this.redirect || "/safetyCheck/worktable" }).catch(()=>{});
           }).catch(() => {
             this.loading = false;
             if (this.captchaOnOff) {

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>
@@ -260,7 +260,7 @@
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          checkPlanDelete({id:obj.id}).then(response => {
+          checkPlanDelete({id:obj.id,checkType:obj.checkType}).then(response => {
             self.msgSuccess(response.msg)
             self.getList();
           })

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>
@@ -260,7 +260,7 @@
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          checkPlanDelete({id:obj.id}).then(response => {
+          checkPlanDelete({id:obj.id,checkType:obj.checkType}).then(response => {
             self.msgSuccess(response.msg)
             self.getList();
           })

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"
@@ -78,9 +78,13 @@
               </el-form-item>
               <el-form-item label="检查类型" prop="checkType">
                 <el-select v-model="addForm.checkType" placeholder="请选择检查类型"
-                           :disabled="planType == 2" style="width: 500px">
-                  <el-option :key="1" label="校院巡查" :value="1"></el-option>
-                  <el-option :key="2" label="实验室自查" :value="2"></el-option>
+                           disabled style="width: 500px">
+                  <el-option
+                    v-for="item in checkTypeList"
+                    :key="item.key"
+                    :label="item.label"
+                    :value="item.key">
+                  </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="计划周期" prop="dateRange">
@@ -218,7 +222,7 @@
   import lookImgDialog from '@/components/lookImgDialog/lookImgDialog.vue'
   import { listDepartments,listbuildings } from "@/api/system/dept";
   import { buildBySubList,getCheckPlanBySubId,findCheckManage,checkOptionList,
-           checkManageUpdate,checkManageAdd,countHazardNum } from "@/api/safetyCheck/index";
+           checkManageUpdate,checkManageAdd,countHazardNum,getGentle } from "@/api/safetyCheck/index";
   export default {
     name: 'index',
     components: {
@@ -237,6 +241,8 @@
             return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
           }
         },
+        //检查类型
+        checkTypeList:[{ key:1, label:"校院巡查", },{ key:2, label:"实验室自查", }],
         //学院列表
         deptSelectList:[],
         //楼栋列表
@@ -254,7 +260,7 @@
           title:"",
           checkResult:"",
           rectifyNotice:"",
-          checkType:"",
+          checkType:2,
           dateRange:[],
           rectifyDeadline:"",
           checkHazardDtoList:[],
@@ -313,6 +319,10 @@
         //自主输入与列表选择相关数据
         planList:[],
         planType:1,//1手动 2选择
+        //权限范围
+        adminGentle:false,
+        applyGentle:false,
+        myApplyGentle:false,
       }
     },
     created(){
@@ -321,8 +331,17 @@
     mounted(){
       this.checkOptionList();
       this.listDepartments();
+      this.getGentle();
     },
     methods:{
+      //获取权限范围
+      getGentle(){
+        getGentle().then(response => {
+          this.$set(this,'adminGentle',response.data.adminGentle);
+          this.$set(this,'applyGentle',response.data.applyGentle);
+          this.$set(this,'myApplyGentle',response.data.myApplyGentle);
+        });
+      },
       //提交按钮
       upDataButton(type){
         this.$refs["addForm"].validate(valid => {
@@ -521,7 +540,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;
         });
@@ -591,6 +610,16 @@
       planButton(type){
         this.initializationAddFormData();
         this.$set(this,'planType',type);
+        if(type == 1){
+          this.$set(this.addForm,'checkType',2);
+          this.$set(this,'checkTypeList',[{
+            key:2,
+            label:"实验室自查",
+          }]);
+        }else if(type == 2){
+          this.$set(this.addForm,'checkType',null);
+          this.$set(this,'checkTypeList',[{ key:1, label:"校院巡查", },{ key:2, label:"实验室自查", }]);
+        }
       },
       //查询详情
       findCheckManage(id){
@@ -626,7 +655,7 @@
         this.$set(this.addForm,'checkPlanId','');
         this.$set(this.addForm,'title','');
         this.$set(this.addForm,'checkRange',3);
-        this.$set(this.addForm,'checkType','');
+        this.$set(this.addForm,'checkType',2);
         this.$set(this.addForm,'dateRange',[]);
         this.$set(this.addForm,'checkResult','');
         this.$set(this.addForm,'rectifyNotice','');
@@ -644,7 +673,7 @@
           title:"",
           checkResult:"",
           rectifyNotice:"",
-          checkType:"",
+          checkType:2,
           dateRange:[],
           rectifyDeadline:"",
           checkHazardDtoList:[],

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;