zc

src/views/safetyCheck/checkConfiguration/checkUserPage.vue

@@ -23,7 +23,7 @@
         <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
         <p class="reset-button-one" @click="resetQuery">重置</p>
       </el-form-item>
-      <el-form-item style="float: right;">
+      <el-form-item style="float: right;" v-hasPermi="['check:set:query']">
         <el-col :span="1.5">
           <p class="inquire-button-one"
              style="width:100px;"

src/views/safetyCheck/checkConfiguration/configDialog.vue

@@ -7,7 +7,7 @@
         <div class="configDialog-content-min-box">
           <p class="configDialog-content-min-title">实验室检查人员配置：</p>
           <div class="configDialog-content-min-checkbox">
-            <el-checkbox-group v-model="checkDataList" @change="checkboxChange">
+            <el-checkbox-group v-model="checkDataList" @change="checkboxChange" :disabled="!editType">
               <el-checkbox style="width:170px;margin-right:70px;"
                            v-for="item in checkList" :value="item.key" :label="item.key" :key="item.key">{{item.label}}</el-checkbox>
             </el-checkbox-group>
@@ -21,7 +21,7 @@
           </div>
         </div>
       </div>
-      <div class="dialog-footer-box">
+      <div class="dialog-footer-box" v-hasPermi="['check:set:edit']">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="addDialogOff">取消</p>
         <p class="dialog-footer-button-primary" @click="upDataButton">确定</p>
@@ -74,7 +74,7 @@
               </el-form-item>
             </el-form>
             <el-table ref="leftUserTable" border :data="userTableListLeft" @selection-change="userChangeLeft" :row-key="getRowKeys">
-              <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
+              <el-table-column v-if="editType" type="selection" width="50" :reserve-selection="true" align="center"/>
               <el-table-column label="姓名" align="center" prop="userName" show-overflow-tooltip/>
               <el-table-column label="学号" align="center" prop="userNumber" show-overflow-tooltip width="80"/>
               <el-table-column label="手机号" align="center" prop="phonenumber" show-overflow-tooltip width="100"/>
@@ -92,8 +92,8 @@
           </div>
         </div>
         <div class="center-box">
-          <p class="el-icon-arrow-left" @click="userArrowButton(1)"></p>
-          <p class="el-icon-arrow-right" @click="userArrowButton(2)"></p>
+          <p v-if="editType" class="el-icon-arrow-left" @click="userArrowButton(1)"></p>
+          <p v-if="editType" class="el-icon-arrow-right" @click="userArrowButton(2)"></p>
         </div>
         <div class="right-max-box">
           <div class="dept-table-title-box">
@@ -139,7 +139,7 @@
               </el-form-item>
             </el-form>
             <el-table ref="rightUserTable" border :data="userTableListRight" @selection-change="userChangeRight" :row-key="getRowKeys">
-              <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
+              <el-table-column v-if="editType" type="selection" width="50" :reserve-selection="true" align="center"/>
               <el-table-column label="姓名" align="center" prop="userName" show-overflow-tooltip/>
               <el-table-column label="学号" align="center" prop="userNumber" show-overflow-tooltip width="80"/>
               <el-table-column label="手机号" align="center" prop="phonenumber" show-overflow-tooltip width="100"/>
@@ -157,7 +157,7 @@
           </div>
         </div>
       </div>
-      <div class="dialog-footer-box">
+      <div class="dialog-footer-box" v-hasPermi="['check:set:edit']">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="addDialogOff">返回</p>
         <p class="dialog-footer-button-primary" @click="addUserButton">确定</p>
@@ -177,6 +177,7 @@
     },
     data(){
       return{
+        editType:this.hasPermiDom(['check:set:edit']),
         configDialogType:true,
         configPageType:1,
         checkDataList:[],
@@ -455,8 +456,8 @@
             }
             this.$set(this,'dialogTableDataList',list);
             this.$refs.rightUserTable.clearSelection();
-            this.userGetListLeft();
-            this.userGetListRight();
+            this.userHandleQueryLeft();
+            this.userHandleQueryRight();
           }else{
             this.msgError('请先勾选右侧列表')
           }
@@ -482,30 +483,10 @@
               }
               list.push(obj);
             }
-            // for(let i=0;i<self.userIdsLeft.length;i++){
-            //   for(let o=0;o<self.userTableListLeft.length;o++){
-            //     if(self.userIdsLeft[i] == self.userTableListLeft[o].userId){
-            //       let obj = {
-            //         subId:self.userTableListLeft[o].subjectId,
-            //         subName:self.userTableListLeft[o].subjectName,
-            //         subRom:self.userTableListLeft[o].roomNum,
-            //         deptId:self.userTableListLeft[o].deptId,
-            //         deptName:self.userTableListLeft[o].deptName,
-            //         userId:self.userTableListLeft[o].userId,
-            //         nickName:self.userTableListLeft[o].userName,
-            //         userNumber:self.userTableListLeft[o].userNumber,
-            //         phonenumber:self.userTableListLeft[o].phonenumber,
-            //         validBeginTime:self.userTableListLeft[o].validBeginTime,
-            //         validEndTime:self.userTableListLeft[o].validEndTime,
-            //       }
-            //       list.push(obj);
-            //     }
-            //   }
-            // }
             this.$set(this,'dialogTableDataList',list);
             this.$refs.leftUserTable.clearSelection();
-            this.userGetListLeft();
-            this.userGetListRight();
+            this.userHandleQueryLeft();
+            this.userHandleQueryRight();
           }else{
             this.msgError('请先勾选左侧列表')
           }

src/views/safetyCheck/checkConfiguration/rectificationUserPage.vue

@@ -23,7 +23,7 @@
         <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
         <p class="reset-button-one" @click="resetQuery">重置</p>
       </el-form-item>
-      <el-form-item style="float: right;">
+      <el-form-item style="float: right;" v-hasPermi="['check:set:query']">
         <el-col :span="1.5">
           <p class="inquire-button-one"
              style="width:100px;"

src/views/safetyCheck/checkItemLibrary/index.vue

@@ -7,7 +7,7 @@
           <el-input
             maxlength="10"
             v-model="queryParams.searchValue"
-            placeholder="预案名称/创建人"
+            placeholder="序号/检查项目/检查要点"
             clearable
             size="small"/>
         </el-form-item>
@@ -15,13 +15,13 @@
           <p class="inquire-button-one" @click="onSearch">查询</p>
           <p class="reset-button-one" @click="resetForm">重置</p>
         </el-form-item>
-        <el-form-item style="float: right;">
+        <el-form-item style="float: right;" v-hasPermi="['check:option:add']">
           <p class="inquire-button-one" style="width:80px;" @click="addDialogOpen(1)">+ 添加</p>
         </el-form-item>
-        <el-form-item style="float: right;">
+        <el-form-item style="float: right;" v-hasPermi="['check:option:remove']">
           <p class="add-button-two-90" style="width:100px;" @click="allDel">批量删除</p>
         </el-form-item>
-        <el-form-item style="float: right;">
+        <el-form-item style="float: right;" v-hasPermi="['check:option:export']">
           <el-dropdown @command="exportButton">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
@@ -66,9 +66,10 @@
           <template slot-scope="scope">
             <div class="table-button-box">
               <p class="table-button-null"></p>
-              <p class="table-button-p" v-if="scope.row.level != 3" @click="addDialogOpen(2,scope.row)">新增</p>
-              <p class="table-button-p" @click="addDialogOpen(3,scope.row)">编辑</p>
-              <p class="table-button-p" @click="delItem(scope.row)">删除</p>
+              <p class="table-button-p" v-if="scope.row.level != 3" v-hasPermi="['check:option:add']"
+                 @click="addDialogOpen(2,scope.row)">新增</p>
+              <p class="table-button-p" @click="addDialogOpen(3,scope.row)" v-hasPermi="['check:option:edit']">编辑</p>
+              <p class="table-button-p" @click="delItem(scope.row)" v-hasPermi="['check:option:remove']">删除</p>
               <p class="table-button-null"></p>
             </div>
           </template>

src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -158,7 +158,7 @@
     </div>
     <lookImgDialog ref="lookImgDialog"></lookImgDialog>
     <infoDialog v-if="infoDialogType" :propsInfoDialogData="propsInfoDialogData"></infoDialog>
-    <lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
+    <lookDocumentDataDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDataDialog>
     <lookDocumentListDialog v-if="lookDocumentListType" :propsLookDocumentListData="propsLookDocumentListData"></lookDocumentListDialog>
   </div>
 </template>
@@ -166,7 +166,7 @@
 <script>
   import { findCheckManage,getFindByCheckPlanId } from '@/api/safetyCheck/index'
   import lookImgDialog from '@/components/lookImgDialog/lookImgDialog.vue'
-  import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
+  import lookDocumentDataDialog from '@/components/lookDocumentDialog/lookDocumentDataDialog.vue'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
   import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
   export default {
@@ -177,7 +177,7 @@
     components: {
       lookImgDialog,
       infoDialog,
-      lookDocumentDialog,
+      lookDocumentDataDialog,
       lookDocumentListDialog
     },
     data(){

src/views/safetyCheck/dataStatistics/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container dataStatistics">
     <div class="title-box">
-      <div :class="pageType == 1?'checkTitle':''" @click="checkTitleButton(1)">
+      <div :class="pageType == 1?'checkTitle':''" @click="checkTitleButton(1)" v-hasPermi="['safety:dataSub:list']">
         <p>按实验室</p>
         <p></p>
       </div>
-      <div :class="pageType == 2?'checkTitle':''" @click="checkTitleButton(2)">
+      <div :class="pageType == 2?'checkTitle':''" @click="checkTitleButton(2)" v-hasPermi="['safety:dataHazard:list']">
         <p>按安全隐患</p>
         <p></p>
       </div>
-      <div :class="pageType == 3?'checkTitle':''" @click="checkTitleButton(3)">
+      <div :class="pageType == 3?'checkTitle':''" @click="checkTitleButton(3)" v-hasPermi="['safety:dataItem:list']">
         <p>按检查指标</p>
         <p></p>
       </div>

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

@@ -97,14 +97,18 @@
             </template>
           </el-table-column>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="157"/>
-          <el-table-column label="操作" align="center" prop="deptName" width="230">
+          <el-table-column label="操作" align="center" prop="deptName" width="280">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-if="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-hasPermi="['safety:checkManage_1:query']"
+                   v-if="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>
+                <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>
+                <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.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
@@ -123,24 +127,24 @@
     </div>
     <addPage v-if="pageType==2" :propsAddData="propsAddData"></addPage>
     <infoPage v-if="pageType==3" :propsInfoData="propsInfoData"></infoPage>
-    <lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
+    <lookDocumentDataDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDataDialog>
     <lookDocumentListDialog v-if="lookDocumentListType" :propsLookDocumentListData="propsLookDocumentListData"></lookDocumentListDialog>
   </div>
 </template>
 
 <script>
   import { listDepartments } from "@/api/system/dept";
-  import { checkManageList } from '@/api/safetyCheck/index'
+  import { checkManageList,getFindByCheckPlanId } from '@/api/safetyCheck/index'
   import addPage from '@/views/safetyCheck/components/addPage/addPage.vue'
   import infoPage from '@/views/safetyCheck/components/infoPage/infoPage.vue'
-  import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
+  import lookDocumentDataDialog from '@/components/lookDocumentDialog/lookDocumentDataDialog.vue'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
   export default {
     name: 'index',
     components: {
       addPage,
       infoPage,
-      lookDocumentDialog,
+      lookDocumentDataDialog,
       lookDocumentListDialog
     },
     data(){
@@ -276,11 +280,21 @@
       //查看多个文档
       lookDocumentListButton(type,row){
         if(type==1){
-          this.$set(this,'propsLookDocumentListData',{
-            title:"查看附件",
-            list:row.list
+          getFindByCheckPlanId({checkPlanId:row.id}).then(response => {
+            let list = [];
+            for(let i=0;i<response.data.length;i++){
+              let obj = {
+                name:response.data[i].fileName,
+                url:response.data[i].fileUrl,
+              }
+              list.push(obj);
+            }
+            this.$set(this,'propsLookDocumentListData',{
+              title:"查看附件",
+              list:list
+            });
+            this.$set(this,'lookDocumentListType',true);
           });
-          this.$set(this,'lookDocumentListType',true);
         }else{
           this.$set(this,'lookDocumentListType',false);
         }

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

@@ -931,8 +931,8 @@
             }
             this.$set(this,'dialogTableSubDataList',list);
             this.$refs.rightSubTable.clearSelection();
-            this.subGetListLeft();
-            this.subGetListRight();
+            this.subHandleQueryLeft();
+            this.subHandleQueryRight();
           }else{
             this.msgError('请先勾选右侧列表')
           }
@@ -952,8 +952,8 @@
             }
             this.$set(this,'dialogTableSubDataList',list);
             this.$refs.leftSubTable.clearSelection();
-            this.subGetListLeft();
-            this.subGetListRight();
+            this.subHandleQueryLeft();
+            this.subHandleQueryRight();
           }else{
             this.msgError('请先勾选左侧列表')
           }

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

@@ -50,7 +50,7 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <el-form-item style="float: right;">
+          <el-form-item style="float: right;" v-hasPermi="['safety:checkPlan_1:add']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
                  style="width:130px;"
@@ -69,27 +69,31 @@
               <p>{{scope.row.checkRange==1?'全校':(scope.row.checkRange==2?'学院':(scope.row.checkRange==3?'实验室':''))}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="任务周期" align="center" prop="cycleStartTime" show-overflow-tooltip width="280">
+          <el-table-column label="任务周期" align="center" prop="cycleStartTime" show-overflow-tooltip width="260">
             <template slot-scope="scope">
               <p>{{scope.row.cycleStartTime}} 至 {{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
             </template>
           </el-table-column>
-          <el-table-column label="状态" align="center" prop="checkStatus" show-overflow-tooltip width="130">
+          <el-table-column label="状态" align="center" prop="checkStatus" show-overflow-tooltip width="80">
             <template slot-scope="scope">
               <p :class="scope.row.checkStatus==1?'checkStatus-color-1':(scope.row.checkStatus==2?'checkStatus-color-2':(scope.row.checkStatus==3?'checkStatus-color-3':''))">{{scope.row.checkStatus==1?'未开始':(scope.row.checkStatus==2?'进行中':(scope.row.checkStatus==3?'已结束':''))}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="检查进度" align="center" prop="checkSchedule" show-overflow-tooltip width="220"/>
+          <el-table-column label="检查进度" align="center" prop="checkSchedule" show-overflow-tooltip width="210"/>
           <el-table-column label="创建人" align="center" prop="createName" show-overflow-tooltip width="130"/>
           <el-table-column label="创建时间" sortable="custom" align="center" prop="createTime" show-overflow-tooltip width="157"/>
-          <el-table-column label="操作" align="center" prop="deptName" width="200">
+          <el-table-column label="操作" align="center" prop="deptName" width="280">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-if="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
-                <p class="table-button-p" v-if="scope.row.checkStatus==1" @click="addDialogOpen(2,scope.row)">编辑</p>
-                <p class="table-button-p" @click="goPage(2,scope.row)">自查管理</p>
-                <p class="table-button-p" v-if="scope.row.checkStatus==1" @click="deleteObj(scope.row)">删除</p>
+                <p class="table-button-p" v-hasPermi="['safety:checkPlan_1:query']"
+                   v-if="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
+                <p class="table-button-p" v-hasPermiAnd="['safety:checkPlan_1:query','safety:checkPlan_1:edit']"
+                   v-if="scope.row.checkStatus==1" @click="addDialogOpen(2,scope.row)">编辑</p>
+                <p class="table-button-p" v-hasPermi="['safety:checkManage_3:list']"
+                   @click="goPage(2,scope.row)">自查管理</p>
+                <p class="table-button-p" v-hasPermi="['safety: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>
                 <p class="table-button-null"></p>
               </div>
@@ -115,7 +119,7 @@
   import addDialog from './addDialog.vue'
   import listPage from './listPage.vue'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
-  import { checkPlanList,checkPlanDelete } from '@/api/safetyCheck/index'
+  import { checkPlanList,checkPlanDelete,getFindByCheckPlanId } from '@/api/safetyCheck/index'
   export default {
     name: 'index',
     components: {
@@ -266,11 +270,21 @@
       //查看多个文档
       lookDocumentListButton(type,row){
         if(type==1){
-          this.$set(this,'propsLookDocumentListData',{
-            title:"查看附件",
-            list:row.list
+          getFindByCheckPlanId({checkPlanId:row.id}).then(response => {
+            let list = [];
+            for(let i=0;i<response.data.length;i++){
+              let obj = {
+                name:response.data[i].fileName,
+                url:response.data[i].fileUrl,
+              }
+              list.push(obj);
+            }
+            this.$set(this,'propsLookDocumentListData',{
+              title:"查看附件",
+              list:list
+            });
+            this.$set(this,'lookDocumentListType',true);
           });
-          this.$set(this,'lookDocumentListType',true);
         }else{
           this.$set(this,'lookDocumentListType',false);
         }

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

@@ -90,14 +90,18 @@
             </template>
           </el-table-column>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="157"/>
-          <el-table-column label="操作" align="center" prop="deptName" width="230">
+          <el-table-column label="操作" align="center" prop="deptName" width="280">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-if="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-hasPermi="['safety:checkManage_3:query']"
+                   v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_3:query','safety:checkManage_3:edit']"
+                   v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_3:query','safety:checkManage_3:edit']"
+                   v-if="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.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
@@ -116,17 +120,17 @@
     </div>
     <addPage v-if="pageType==2" :propsAddData="propsAddData"></addPage>
     <infoPage v-if="pageType==3" :propsInfoData="propsInfoData"></infoPage>
-    <lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
+    <lookDocumentDataDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDataDialog>
     <lookDocumentListDialog v-if="lookDocumentListType" :propsLookDocumentListData="propsLookDocumentListData"></lookDocumentListDialog>
   </div>
 </template>
 
 <script>
   import { listDepartments } from "@/api/system/dept";
-  import { findByCheckPlanId } from '@/api/safetyCheck/index'
+  import { findByCheckPlanId,getFindByCheckPlanId } from '@/api/safetyCheck/index'
   import addPage from '@/views/safetyCheck/components/addPage/addPage.vue'
   import infoPage from '@/views/safetyCheck/components/infoPage/infoPage.vue'
-  import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
+  import lookDocumentDataDialog from '@/components/lookDocumentDialog/lookDocumentDataDialog.vue'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
   export default {
     name: 'index',
@@ -136,7 +140,7 @@
     components: {
       addPage,
       infoPage,
-      lookDocumentDialog,
+      lookDocumentDataDialog,
       lookDocumentListDialog
     },
     data(){
@@ -267,11 +271,21 @@
       //查看多个文档
       lookDocumentListButton(type,row){
         if(type==1){
-          this.$set(this,'propsLookDocumentListData',{
-            title:"查看附件",
-            list:row.list
+          getFindByCheckPlanId({checkPlanId:row.id}).then(response => {
+            let list = [];
+            for(let i=0;i<response.data.length;i++){
+              let obj = {
+                name:response.data[i].fileName,
+                url:response.data[i].fileUrl,
+              }
+              list.push(obj);
+            }
+            this.$set(this,'propsLookDocumentListData',{
+              title:"查看附件",
+              list:list
+            });
+            this.$set(this,'lookDocumentListType',true);
           });
-          this.$set(this,'lookDocumentListType',true);
         }else{
           this.$set(this,'lookDocumentListType',false);
         }

src/views/safetyCheck/rectificationReport/index.vue

@@ -39,7 +39,7 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <el-form-item style="float: right;">
+          <el-form-item style="float: right;" v-hasPermi="['safety:checkRectify:export']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
                  style="width:100px;"
@@ -84,7 +84,7 @@
       </div>
     </div>
     <listPage v-if="pageType == 2" :propsListPageData="propsListPageData"></listPage>
-    <lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
+    <lookDocumentDataDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDataDialog>
   </div>
 </template>
 
@@ -92,12 +92,12 @@
   import { listDepartments } from "@/api/system/dept";
   import { checkRectifyList,genReport,genReportZip } from '@/api/safetyCheck/index'
   import listPage from './listPage.vue'
-  import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
+  import lookDocumentDataDialog from '@/components/lookDocumentDialog/lookDocumentDataDialog.vue'
   export default {
     name: 'index',
     components: {
       listPage,
-      lookDocumentDialog
+      lookDocumentDataDialog
     },
     data(){
       return{

src/views/safetyCheck/rectificationReport/listPage.vue

@@ -17,7 +17,7 @@
           <el-table-column label="整改期限" sortable="custom" align="center" prop="rectifyDeadline" show-overflow-tooltip width="130"/>
           <el-table-column label="整改状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
             <template slot-scope="scope">
-              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2?'rectifyStatusColorB':(scope.row.rectifyStatus==3?'rectifyStatusColorC':''))">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
+              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2||scope.row.rectifyStatus==3?'rectifyStatusColorB':(scope.row.rectifyStatus==4?'rectifyStatusColorC':''))">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':(scope.row.rectifyStatus==4?'暂无法整改':'')))}}</p>
             </template>
           </el-table-column>
           <el-table-column label="整改时间" sortable="custom" align="center" prop="rectifyTime" show-overflow-tooltip width="220">
@@ -50,21 +50,21 @@
       </div>
     </div>
     <infoDialog v-if="infoDialogType" :propsInfoDialogData="propsInfoDialogData"></infoDialog>
-    <lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
+    <lookDocumentDataDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDataDialog>
   </div>
 </template>
 
 <script>
   import { checkHazardList } from '@/api/safetyCheck/index'
   import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
-  import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
+  import lookDocumentDataDialog from '@/components/lookDocumentDialog/lookDocumentDataDialog.vue'
   export default {
     name: 'index',
     props:{
       propsListPageData:{},
     },
     components: {
-      lookDocumentDialog,
+      lookDocumentDataDialog,
       infoDialog
     },
     data(){
@@ -228,6 +228,15 @@
         flex-direction: column;
         padding:20px;
         overflow: hidden;
+        .rectifyStatusColorA{
+          color:#23B303;
+        }
+        .rectifyStatusColorB{
+          color:#0183FA;
+        }
+        .rectifyStatusColorC{
+          color:#EE0606;
+        }
       }
     }
   }

src/views/safetyCheck/safetyHazard/cannotListPage.vue

@@ -58,7 +58,8 @@
           <template slot-scope="scope">
             <div class="table-button-box">
               <p class="table-button-null"></p>
-              <p class="table-button-p" @click="addDialogOpen(true,scope.row)">详情</p>
+              <p class="table-button-p" v-hasPermi="['safety:rectifyHazard:query']"
+                 @click="addDialogOpen(true,scope.row)">详情</p>
               <p class="table-button-null"></p>
             </div>
           </template>

src/views/safetyCheck/safetyHazard/departmentListPage.vue

@@ -60,7 +60,7 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <el-form-item style="float: right;">
+          <el-form-item style="float: right;" v-hasPermi="['safety:rectifyHazard:approve']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
                  style="width:90px;"
@@ -98,7 +98,8 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" @click="addDialogOpen(true,scope.row)">详情</p>
+                <p class="table-button-p" v-hasPermi="['safety:rectifyHazard:query']"
+                   @click="addDialogOpen(true,scope.row)">详情</p>
                 <p class="table-button-null"></p>
               </div>
             </template>

src/views/safetyCheck/safetyHazard/schoolListPage.vue

@@ -60,7 +60,7 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <el-form-item style="float: right;">
+          <el-form-item style="float: right;" v-hasPermi="['safety:rectifyHazard:approve']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
                  style="width:90px;"
@@ -98,7 +98,8 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" @click="addDialogOpen(true,scope.row)">详情</p>
+                <p class="table-button-p" v-hasPermi="['safety:rectifyHazard:query']"
+                   @click="addDialogOpen(true,scope.row)">详情</p>
                 <p class="table-button-null"></p>
               </div>
             </template>

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

@@ -454,8 +454,8 @@
             }
             this.$set(this,'dialogTableDataList',list);
             this.$refs.rightUserTable.clearSelection();
-            this.userGetListLeft();
-            this.userGetListRight();
+            this.userHandleQueryLeft();
+            this.userHandleQueryRight();
           }else{
             this.msgError('请先勾选右侧列表')
           }
@@ -481,8 +481,8 @@
             }
             this.$set(this,'dialogTableDataList',list);
             this.$refs.leftUserTable.clearSelection();
-            this.userGetListLeft();
-            this.userGetListRight();
+            this.userHandleQueryLeft();
+            this.userHandleQueryRight();
           }else{
             this.msgError('请先勾选左侧列表')
           }

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

@@ -36,7 +36,7 @@
           <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
           <p class="reset-button-one" @click="resetQuery">重置</p>
         </el-form-item>
-        <el-form-item style="float: right;">
+        <el-form-item style="float: right;" v-hasPermi="['safety:checkGroup:add']">
           <el-col :span="1.5">
             <p class="inquire-button-one"
                style="width:130px;"
@@ -78,13 +78,13 @@
         <el-table-column label="操作时间" align="center" prop="updateTime" show-overflow-tooltip width="250">
           <template slot-scope="scope">{{scope.row.updateTime?scope.row.updateTime:scope.row.createTime}}</template>
         </el-table-column>
-        <el-table-column label="操作" align="center" prop="deptName" width="200">
+        <el-table-column label="操作" align="center" prop="deptName" width="200" v-if="tableButtonType">
           <template slot-scope="scope">
             <div class="table-button-box">
               <p class="table-button-null"></p>
-              <p class="table-button-p" @click="addDialogOpen(3,scope.row)">详情</p>
-              <p class="table-button-p" @click="addDialogOpen(2,scope.row)">编辑</p>
-              <p class="table-button-p" @click="deleteObj(scope.row)">删除</p>
+              <p class="table-button-p" @click="addDialogOpen(3,scope.row)" v-hasPermi="['safety:checkGroup:query']">详情</p>
+              <p class="table-button-p" @click="addDialogOpen(2,scope.row)" v-hasPermiAnd="['safety:checkGroup:query','safety:checkGroup:edit']">编辑</p>
+              <p class="table-button-p" @click="deleteObj(scope.row)" v-hasPermi="['safety:checkGroup:remove']">删除</p>
               <p class="table-button-null"></p>
             </div>
           </template>
@@ -112,6 +112,7 @@
     },
     data(){
       return{
+        tableButtonType:this.hasPermiDom(['safety:checkGroup:query','safety:checkGroup:edit','safety:checkGroup:remove']),
         addDialogType:false,
         addDialogData:{},
         queryParams:{

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

@@ -95,14 +95,18 @@
             </template>
           </el-table-column>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="157"/>
-          <el-table-column label="操作" align="center" prop="deptName" width="230">
+          <el-table-column label="操作" align="center" prop="deptName" width="280">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-if="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-hasPermi="['safety:checkManage:query']"
+                   v-if="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>
+                <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>
+                <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.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
@@ -121,24 +125,24 @@
     </div>
     <addPage v-if="pageType==2" :propsAddData="propsAddData"></addPage>
     <infoPage v-if="pageType==3" :propsInfoData="propsInfoData"></infoPage>
-    <lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
+    <lookDocumentDataDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDataDialog>
     <lookDocumentListDialog v-if="lookDocumentListType" :propsLookDocumentListData="propsLookDocumentListData"></lookDocumentListDialog>
   </div>
 </template>
 
 <script>
   import { listDepartments } from "@/api/system/dept";
-  import { checkManageList } from '@/api/safetyCheck/index'
+  import { checkManageList,getFindByCheckPlanId } from '@/api/safetyCheck/index'
   import addPage from '@/views/safetyCheck/components/addPage/addPage.vue'
   import infoPage from '@/views/safetyCheck/components/infoPage/infoPage.vue'
-  import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
+  import lookDocumentDataDialog from '@/components/lookDocumentDialog/lookDocumentDataDialog.vue'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
   export default {
     name: 'index',
     components: {
       addPage,
       infoPage,
-      lookDocumentDialog,
+      lookDocumentDataDialog,
       lookDocumentListDialog
     },
     data(){
@@ -274,11 +278,21 @@
       //查看多个文档
       lookDocumentListButton(type,row){
         if(type==1){
-          this.$set(this,'propsLookDocumentListData',{
-            title:"查看附件",
-            list:row.list
+          getFindByCheckPlanId({checkPlanId:row.id}).then(response => {
+            let list = [];
+            for(let i=0;i<response.data.length;i++){
+              let obj = {
+                name:response.data[i].fileName,
+                url:response.data[i].fileUrl,
+              }
+              list.push(obj);
+            }
+            this.$set(this,'propsLookDocumentListData',{
+              title:"查看附件",
+              list:list
+            });
+            this.$set(this,'lookDocumentListType',true);
           });
-          this.$set(this,'lookDocumentListType',true);
         }else{
           this.$set(this,'lookDocumentListType',false);
         }

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

@@ -1180,8 +1180,8 @@
             }
             this.$set(this,'dialogTableSubDataList',list);
             this.$refs.rightSubTable.clearSelection();
-            this.subGetListLeft();
-            this.subGetListRight();
+            this.subHandleQueryLeft();
+            this.subHandleQueryRight();
           }else{
             this.msgError('请先勾选右侧列表')
           }
@@ -1201,8 +1201,8 @@
             }
             this.$set(this,'dialogTableSubDataList',list);
             this.$refs.leftSubTable.clearSelection();
-            this.subGetListLeft();
-            this.subGetListRight();
+            this.subHandleQueryLeft();
+            this.subHandleQueryRight();
           }else{
             this.msgError('请先勾选左侧列表')
           }
@@ -1291,8 +1291,8 @@
             }
             this.$set(this,'dialogTableDataList',list);
             this.$refs.rightUserTable.clearSelection();
-            this.userGetListLeft();
-            this.userGetListRight();
+            this.userHandleQueryLeft();
+            this.userHandleQueryRight();
           }else{
             this.msgError('请先勾选右侧列表')
           }
@@ -1318,8 +1318,8 @@
             }
             this.$set(this,'dialogTableDataList',list);
             this.$refs.leftUserTable.clearSelection();
-            this.userGetListLeft();
-            this.userGetListRight();
+            this.userHandleQueryLeft();
+            this.userHandleQueryRight();
           }else{
             this.msgError('请先勾选左侧列表')
           }

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

@@ -50,7 +50,7 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <el-form-item style="float: right;">
+          <el-form-item style="float: right;" v-hasPermi="['safety:checkPlan:add']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
                  style="width:130px;"
@@ -69,27 +69,31 @@
               <p>{{scope.row.checkRange==1?'全校':(scope.row.checkRange==2?'学院':(scope.row.checkRange==3?'实验室':''))}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="计划周期" align="center" prop="cycleStartTime" show-overflow-tooltip width="280">
+          <el-table-column label="计划周期" align="center" prop="cycleStartTime" show-overflow-tooltip width="260">
             <template slot-scope="scope">
               <p>{{scope.row.cycleStartTime}} 至 {{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
             </template>
           </el-table-column>
-          <el-table-column label="状态" align="center" prop="checkStatus" show-overflow-tooltip width="130">
+          <el-table-column label="状态" align="center" prop="checkStatus" show-overflow-tooltip width="80">
             <template slot-scope="scope">
               <p :class="scope.row.checkStatus==1?'checkStatus-color-1':(scope.row.checkStatus==2?'checkStatus-color-2':(scope.row.checkStatus==3?'checkStatus-color-3':''))">{{scope.row.checkStatus==1?'未开始':(scope.row.checkStatus==2?'进行中':(scope.row.checkStatus==3?'已结束':''))}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="检查进度" align="center" prop="checkSchedule" show-overflow-tooltip width="220"/>
+          <el-table-column label="检查进度" align="center" prop="checkSchedule" show-overflow-tooltip width="210"/>
           <el-table-column label="创建人" align="center" prop="createName" show-overflow-tooltip width="130"/>
           <el-table-column label="创建时间" sortable="custom" align="center" prop="createTime" show-overflow-tooltip width="157"/>
-          <el-table-column label="操作" align="center" prop="deptName" width="200">
+          <el-table-column label="操作" align="center" prop="deptName" width="280">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-if="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
-                <p class="table-button-p" v-if="scope.row.checkStatus==1" @click="addDialogOpen(2,scope.row)">编辑</p>
-                <p class="table-button-p" @click="goPage(2,scope.row)">巡查管理</p>
-                <p class="table-button-p" v-if="scope.row.checkStatus==1" @click="deleteObj(scope.row)">删除</p>
+                <p class="table-button-p" v-hasPermi="['safety:checkPlan:query']"
+                   v-if="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
+                <p class="table-button-p" v-hasPermiAnd="['safety:checkPlan:query','safety:checkPlan:edit']"
+                   v-if="scope.row.checkStatus==1" @click="addDialogOpen(2,scope.row)">编辑</p>
+                <p class="table-button-p" v-hasPermi="['safety:checkManage:list']"
+                   @click="goPage(2,scope.row)">巡查管理</p>
+                <p class="table-button-p" v-hasPermi="['safety: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>
                 <p class="table-button-null"></p>
               </div>
@@ -115,7 +119,7 @@
   import addDialog from './addDialog.vue'
   import listPage from './listPage.vue'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
-  import { checkPlanList,checkPlanDelete } from '@/api/safetyCheck/index'
+  import { checkPlanList,checkPlanDelete,getFindByCheckPlanId } from '@/api/safetyCheck/index'
   export default {
     name: 'index',
     components: {
@@ -266,11 +270,21 @@
       //查看多个文档
       lookDocumentListButton(type,row){
         if(type==1){
-          this.$set(this,'propsLookDocumentListData',{
-            title:"查看附件",
-            list:row.list
+          getFindByCheckPlanId({checkPlanId:row.id}).then(response => {
+            let list = [];
+            for(let i=0;i<response.data.length;i++){
+              let obj = {
+                name:response.data[i].fileName,
+                url:response.data[i].fileUrl,
+              }
+              list.push(obj);
+            }
+            this.$set(this,'propsLookDocumentListData',{
+              title:"查看附件",
+              list:list
+            });
+            this.$set(this,'lookDocumentListType',true);
           });
-          this.$set(this,'lookDocumentListType',true);
         }else{
           this.$set(this,'lookDocumentListType',false);
         }

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

@@ -90,14 +90,18 @@
             </template>
           </el-table-column>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="157"/>
-          <el-table-column label="操作" align="center" prop="deptName" width="230">
+          <el-table-column label="操作" align="center" prop="deptName" width="280">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-if="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-hasPermi="['safety:checkManage_2:query']"
+                   v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_2:query','safety:checkManage_2:edit']"
+                   v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_2:query','safety:checkManage_2:edit']"
+                   v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_2:query','safety: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.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
@@ -116,17 +120,17 @@
     </div>
     <addPage v-if="pageType==2" :propsAddData="propsAddData"></addPage>
     <infoPage v-if="pageType==3" :propsInfoData="propsInfoData"></infoPage>
-    <lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
+    <lookDocumentDataDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDataDialog>
     <lookDocumentListDialog v-if="lookDocumentListType" :propsLookDocumentListData="propsLookDocumentListData"></lookDocumentListDialog>
   </div>
 </template>
 
 <script>
   import { listDepartments } from "@/api/system/dept";
-  import { findByCheckPlanId } from '@/api/safetyCheck/index'
+  import { findByCheckPlanId,getFindByCheckPlanId } from '@/api/safetyCheck/index'
   import addPage from '@/views/safetyCheck/components/addPage/addPage.vue'
   import infoPage from '@/views/safetyCheck/components/infoPage/infoPage.vue'
-  import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
+  import lookDocumentDataDialog from '@/components/lookDocumentDialog/lookDocumentDataDialog.vue'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
   export default {
     name: 'index',
@@ -136,7 +140,7 @@
     components: {
       addPage,
       infoPage,
-      lookDocumentDialog,
+      lookDocumentDataDialog,
       lookDocumentListDialog
     },
     data(){
@@ -267,11 +271,21 @@
       //查看多个文档
       lookDocumentListButton(type,row){
         if(type==1){
-          this.$set(this,'propsLookDocumentListData',{
-            title:"查看附件",
-            list:row.list
+          getFindByCheckPlanId({checkPlanId:row.id}).then(response => {
+            let list = [];
+            for(let i=0;i<response.data.length;i++){
+              let obj = {
+                name:response.data[i].fileName,
+                url:response.data[i].fileUrl,
+              }
+              list.push(obj);
+            }
+            this.$set(this,'propsLookDocumentListData',{
+              title:"查看附件",
+              list:list
+            });
+            this.$set(this,'lookDocumentListType',true);
           });
-          this.$set(this,'lookDocumentListType',true);
         }else{
           this.$set(this,'lookDocumentListType',false);
         }

src/views/safetyCheck/snapshotManagement/index.vue

@@ -58,7 +58,7 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <el-form-item style="float: right;">
+          <el-form-item style="float: right;" v-hasPermi="['safety:rectifyClap:add']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
                  style="width:100px;margin-right:0;"
@@ -96,7 +96,7 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" @click="goPage(3,scope.row)">详情</p>
+                <p class="table-button-p" @click="goPage(3,scope.row)" v-hasPermi="['safety:rectifyClap:query']">详情</p>
                 <p class="table-button-null"></p>
               </div>
             </template>

src/views/safetyCheck/snapshotManagement/infoPage.vue

@@ -105,7 +105,7 @@
         </el-form>
       </div>
     </div>
-    <div class="button-box dialog-footer-box" v-if="infoData.rectifyStatus == 0">
+    <div class="button-box dialog-footer-box" v-if="infoData.rectifyStatus == 0 && infoData.rectifyGentle">
       <p class="dialog-footer-button-null"></p>
       <p class="dialog-footer-button-info" @click="outButton">取消</p>
       <p class="dialog-footer-button-primary" @click="upDataButton">确定</p>

src/views/safetyCheck/snapshotManagement/listPage.vue

@@ -89,7 +89,7 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" @click="goPage(3,scope.row)">详情</p>
+                <p class="table-button-p" @click="goPage(3,scope.row)" v-hasPermi="['safety:rectifyClap:query']">详情</p>
                 <p class="table-button-null"></p>
               </div>
             </template>

src/views/safetyCheck/worktable/toDoListBox.vue

@@ -18,7 +18,10 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="toDoListBox-list-box scrollbar-box">
+    <div class="toDoListBox-list-box scrollbar-box"
+         @mouseleave="tableTimerFun"
+         @mouseenter="tableTimerOff"
+         ref="scrollDiv">
       <div  class="for-list-box"
             v-for="(item,index) in tableList" :key="index">
         <div class="for-name-box">
@@ -54,7 +57,7 @@
 </template>
 
 <script>
-  import { todoList, tobeReviewed } from '@/api/safetyCheck/index'
+  import { todoList, tobeReviewed,getFindByCheckPlanId } from '@/api/safetyCheck/index'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
   import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
   export default {
@@ -74,23 +77,15 @@
           manageStatus:0,
           searchValue:"",
         },
-        tableList:[
-          {
-            subjectName:"实验室名称-房间号实验室名称-房间号实验室名称-房间号实验室名称-房间号",
-            title:"计划标题计划标题计划标题",
-            collegeName:"环境与测绘学院",
-            cycleStartTime:"2023-03-01",
-            cycleEndTime:"2023-03-31",
-            checkType:"1",
-            isOverdue:"1",
-            manageStatus:"1",
-          },
-        ],
+        tableList:[],
         total:0,
         //跳转巡查权限
         goInspectionManagement:false,
         //跳转自查权限
-        goSelfInspectionManagement:false
+        goSelfInspectionManagement:false,
+        /*****************数据滚动相关*****************/
+        tableTimer: null,
+
       }
     },
     created(){
@@ -101,6 +96,30 @@
 
     },
     methods:{
+      //滚动方法
+      tableActionFun() {
+        this.$refs.scrollDiv.scrollTop = 0;
+        this.tableTimerFun();
+      },
+      //开始滚动
+      tableTimerFun() {
+        if(this.tableList[3]){
+          this.tableTimer = setInterval(() => {
+            let csrollTop = this.$refs.scrollDiv.scrollTop
+            let maxHeight = this.$refs.scrollDiv.scrollHeight - this.$refs.scrollDiv.offsetHeight
+            if (csrollTop >= maxHeight) {
+              this.$refs.scrollDiv.scrollTop = 0;
+            } else {
+              this.$refs.scrollDiv.scrollTop += 1;
+            }
+          }, 30);
+        }
+      },
+      //停止滚动
+      tableTimerOff(){
+        clearInterval(this.tableTimer)
+      },
+      //跳转
       goPage(item){
         //跳转 巡查/自查页面
         if(item.checkType == 1){
@@ -136,7 +155,6 @@
             let obj = {
               id:data.hazardId
             }
-            console.log(obj)
             this.$set(this,'propsInfoDialogData',obj);
             this.$set(this,'infoDialogType',type);
           }else{
@@ -152,14 +170,16 @@
       },
       //获取数据列表
       getList(){
-        console.log(this.queryParams.manageStatus)
+        clearInterval(this.tableTimer);
         if(this.queryParams.manageStatus == 2){
           tobeReviewed(this.queryParams.searchValue).then(response => {
             this.$set(this,'tableList',response.rows);
+            this.tableActionFun();
           });
         }else{
           todoList(this.queryParams).then(response => {
             this.$set(this,'tableList',response.rows);
+            this.tableActionFun();
           });
         }
       },
@@ -170,11 +190,21 @@
       //查看多个文档
       lookDocumentListButton(type,item){
         if(type==1){
-          this.$set(this,'propsLookDocumentListData',{
-            title:"查看附件",
-            list:item.data7
+          getFindByCheckPlanId({checkPlanId:item.id}).then(response => {
+            let list = [];
+            for(let i=0;i<response.data.length;i++){
+              let obj = {
+                name:response.data[i].fileName,
+                url:response.data[i].fileUrl,
+              }
+              list.push(obj);
+            }
+            this.$set(this,'propsLookDocumentListData',{
+              title:"查看附件",
+              list:list
+            });
+            this.$set(this,'lookDocumentListType',true);
           });
-          this.$set(this,'lookDocumentListType',true);
         }else{
           this.$set(this,'lookDocumentListType',false);
         }
@@ -201,6 +231,16 @@
           }
         }
       },
+    },
+    beforeDestroy() {
+      //清除定时器
+      clearInterval(this.tableTimer);
+      console.log("beforeDestroy");
+    },
+    destroyed() {
+      //清除定时器
+      clearInterval(this.tableTimer);
+      console.log("destroyed");
     }
   }
 </script>
@@ -247,11 +287,9 @@
       }
     }
     .toDoListBox-list-box{
+      position: relative;
       padding:0 20px 20px;
       flex:1;
-      .for-list-box:nth-child(1){
-        margin:0;
-      }
       .for-list-box{
         height:190px;
         border-radius:20px;