zc

src/api/safetyCheck/index.js

@@ -235,11 +235,11 @@ export function checkSetAdd(data) {
 }
 
 //检查配置 人员列表查询
-export function checkStaffUserList(query) {
+export function checkStaffUserList(data) {
   return request({
     url: '/zd-security/checkStaffUser/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: data
   })
 }
 
@@ -463,6 +463,7 @@ export function findGroupList(data) {
 
 //安全隐患-校院巡察/实验室自查-安全隐患列表
 //安全隐患-校院巡察/批量审核列表
+//整改报告-报告隐患列表
 export function checkHazardList(query) {
   return request({
     url: '/zd-security/checkHazard/list',

src/views/safetyCheck/checkConfiguration/configDialog.vue

@@ -366,9 +366,12 @@
         let leftObj = JSON.parse(JSON.stringify(this.userQueryParamsLeft));
         leftObj.filtCheckUserIdList = [];
         for(let i=0;i<self.dialogTableDataList.length;i++){
-          leftObj.filtCheckUserIdList.push(self.dialogTableDataList[i].userId);
+          let obj = {
+            userId:self.dialogTableDataList[i].userId,
+            subjectId:self.dialogTableDataList[i].subId
+          }
+          leftObj.filtCheckUserIdList.push(obj)
         }
-        leftObj.filtCheckUserIdList = leftObj.filtCheckUserIdList+'';
         if(this.leftDateRange[0]){
           leftObj.beginTime = this.leftDateRange[0]
         }else{
@@ -412,9 +415,12 @@
         let rightObj = JSON.parse(JSON.stringify(this.userQueryParamsRight));
         rightObj.notFiltCheckUserIdList = [];
         for(let i=0;i<self.dialogTableDataList.length;i++){
-          rightObj.notFiltCheckUserIdList.push(self.dialogTableDataList[i].userId);
+          let obj = {
+            userId:self.dialogTableDataList[i].userId,
+            subjectId:self.dialogTableDataList[i].subId
+          }
+          rightObj.notFiltCheckUserIdList.push(obj)
         }
-        rightObj.notFiltCheckUserIdList = rightObj.notFiltCheckUserIdList+'';
 
         if(this.rightDateRange[0]){
           rightObj.beginTime = this.rightDateRange[0]
@@ -441,7 +447,7 @@
             let userIdsRight = JSON.parse(JSON.stringify(this.$refs.rightUserTable.selection))
             for(let i=0;i<userIdsRight.length;i++){
               for(let s=0;s<list.length;s++){
-                if(userIdsRight[i].userId == list[s].userId){
+                if(userIdsRight[i].userId == list[s].userId && userIdsRight[i].subjectId == list[s].subId){
                   list.splice(s,1);
                   s--
                 }
@@ -459,6 +465,7 @@
           if(this.$refs.leftUserTable.selection[0]){
             let list = JSON.parse(JSON.stringify(this.dialogTableDataList));
             let userIdsLeft = JSON.parse(JSON.stringify(this.$refs.leftUserTable.selection))
+            console.log('userIdsLeft',userIdsLeft)
             for(let i=0;i<userIdsLeft.length;i++){
               let obj = {
                 subId:userIdsLeft[i].subjectId,

src/views/safetyCheck/components/addPage/addPage.vue

@@ -121,7 +121,7 @@
               </el-form-item>
               <el-form-item label="隐患照片" label-width="123px">
                 <div class="for-img-box" v-for="(img,imgIndex) in item.uploadDtoList" :key="imgIndex">
-                  <img class="for-img" :src="img.fileUrl">
+                  <img class="for-img" :src="img.fileUrl" @click="lookImg(item.uploadDtoList,imgIndex)">
                   <p class="for-del-button el-icon-circle-close" @click="delImg(index,imgIndex)"></p>
                 </div>
                 <el-upload
@@ -150,17 +150,22 @@
       <p class="add-button-two-90" @click="upDataButton(1)">保存</p>
       <p class="inquire-button-one" @click="upDataButton(2)">提交</p>
     </div>
+    <lookImgDialog ref="lookImgDialog"></lookImgDialog>
   </div>
 </template>
 
 <script>
   import { getToken } from "@/utils/auth";
+  import lookImgDialog from '@/components/lookImgDialog/lookImgDialog.vue'
   import { findCheckManage,checkOptionList,checkManageUpdate } from '@/api/safetyCheck/index'
   export default {
     name: 'addPage',
     props:{
       propsAddData:{},
     },
+    components: {
+      lookImgDialog,
+    },
     data(){
       return{
         uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
@@ -302,6 +307,14 @@
         this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckCode',obj.code);
         this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckName',obj.name);
       },
+      //查看图片
+      lookImg(list,index){
+        for(let i=0;i<list.length;i++){
+          list[i].name = list[i].fileName;
+          list[i].url = list[i].fileUrl;
+        }
+        this.$refs.lookImgDialog.lookImgDialogOpen(1,list,index);
+      },
       /*==========上传相关==========*/
       handleAvatarSuccess(res,item) {
         if(item.uploadDtoList.length>4){
@@ -534,6 +547,7 @@
             height:80px;
             display: inline-block;
             overflow: hidden;
+            cursor: pointer;
           }
           .for-del-button{
             background: rgba(0,0,0,0.7);

src/views/safetyCheck/components/infoDialog/infoDialog.vue

@@ -171,7 +171,8 @@
               <p></p>
             </div>
             <div class="right-box img-box">
-              <img :src="imgItem.fileUrl" v-for="(imgItem,index) in infoDialogData.checkHazardApplyDto.uploadDtoList" :key="index" @click="lookImg(infoDialogData.data17,index)">
+              <img :src="imgItem.fileUrl" v-for="(imgItem,index) in infoDialogData.checkHazardApplyDto.uploadDtoList"
+                   :key="index" @click="lookImg(infoDialogData.checkHazardApplyDto.uploadDtoList,index)">
             </div>
           </div>
         </div>
@@ -191,7 +192,7 @@
           <div class="img-box">
             <p>整改照片</p>
             <div>
-              <img :src="imgItem.fileUrl" @click="lookImg(item.lookImgList,imgIndex)"
+              <img :src="imgItem.fileUrl" @click="lookImg(item.uploadDtoList,imgIndex)"
                    v-for="(imgItem,imgIndex) in item.uploadDtoList" :key="imgIndex">
             </div>
           </div>
@@ -436,11 +437,13 @@
             if(response.data.checkRectifyApplyList[response.data.checkRectifyApplyList.length-1].applyFlag == 1){
               if(response.data.checkHazardApplyDto.applyGentle){
                 //已整改
-                this.$set(this,'addFormType',2)
-                if(response.data.checkRectifyApplyList.length>2){
-                  this.$set(this,'addFormTitle',this.frequencyCalculation(response.data.checkRectifyApplyList.length,2)+'复核')
-                }else{
-                  this.$set(this,'addFormTitle','整改复核')
+                if(response.data.checkHazardApplyDto.rectifyStatus != 4){
+                  this.$set(this,'addFormType',2)
+                  if(response.data.checkRectifyApplyList.length>2){
+                    this.$set(this,'addFormTitle',this.frequencyCalculation(response.data.checkRectifyApplyList.length,2)+'复核')
+                  }else{
+                    this.$set(this,'addFormTitle','整改复核')
+                  }
                 }
               }
             }else if(response.data.checkRectifyApplyList[response.data.checkRectifyApplyList.length-1].applyFlag == 2){

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

@@ -144,7 +144,7 @@
                   </div>
                   <div class="right-min-content-box" style="height:120px;">
                     <div class="img-box">
-                      <img :src="imgItem.fileUrl" @click="lookImg(item.imgList,imgIndex)"
+                      <img :src="imgItem.fileUrl" @click="lookImg(item.uploadDtoList,imgIndex)"
                            v-for="(imgItem,imgIndex) in item.uploadDtoList" :ley="imgIndex">
                     </div>
                   </div>
@@ -229,6 +229,10 @@
       },
       //查看图片
       lookImg(list,index){
+        for(let i=0;i<list.length;i++){
+          list[i].name = list[i].fileName;
+          list[i].url = list[i].fileUrl;
+        }
         this.$refs.lookImgDialog.lookImgDialogOpen(1,list,index);
       },
       // 单个下载按钮

src/views/safetyCheck/rectificationReport/index.vue

@@ -153,7 +153,7 @@
       goPage(type,data){
         if(this.pageType != type){
           if(type == 2){
-            this.$set(this,'propsListPageData',data.id);
+            this.$set(this.propsListPageData,'id',data.id);
           }
           this.$set(this,'pageType',type);
         }

src/views/safetyCheck/rectificationReport/listPage.vue

@@ -49,13 +49,13 @@
         />
       </div>
     </div>
+    <infoDialog v-if="infoDialogType" :propsInfoDialogData="propsInfoDialogData"></infoDialog>
     <lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
   </div>
 </template>
 
 <script>
-  import { listDepartments } from "@/api/system/dept";
-  import { findByCheckPlanId } from '@/api/safetyCheck/index'
+  import { checkHazardList } from '@/api/safetyCheck/index'
   import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
   import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
   export default {
@@ -94,7 +94,6 @@
 
     },
     mounted(){
-      this.listDepartments();
       this.getList();
     },
     methods:{
@@ -157,10 +156,10 @@
       },
       //获取数据列表
       getList(){
-        // findByCheckPlanId(obj).then(response => {
-        //   this.total = response.data.total;
-        //   this.tableList = response.data.records;
-        // });
+        checkHazardList({managerId:this.propsListPageData.id}).then(response => {
+          this.total = response.data.total;
+          this.tableList = response.data.records;
+        });
       },
       /** 搜索按钮操作 */
       handleQuery() {
@@ -193,24 +192,6 @@
           this.$set(this,'lookDocumentType',false);
         }
       },
-      //查看多个文档
-      lookDocumentListButton(type,row){
-        if(type==1){
-          this.$set(this,'propsLookDocumentListData',{
-            title:"查看附件",
-            list:row.list
-          });
-          this.$set(this,'lookDocumentListType',true);
-        }else{
-          this.$set(this,'lookDocumentListType',false);
-        }
-      },
-      //获取学院列表
-      listDepartments(){
-        listDepartments().then(response => {
-          this.deptSelectList = response.data;
-        });
-      },
     },
   }
 </script>

src/views/safetyCheck/snapshotManagement/infoPage.vue

@@ -184,6 +184,10 @@
         this.$parent.goPage(1);
       },
       lookImg(list,index){
+        for(let i=0;i<list.length;i++){
+          list[i].name = list[i].fileName;
+          list[i].url = list[i].fileUrl;
+        }
         this.$refs.lookImgDialog.lookImgDialogOpen(1,list,index);
       },
       /*==========上传相关==========*/