zc

src/api/safetyCheck/index.js

@@ -462,7 +462,6 @@ export function findGroupList(data) {
 /***************************安全隐患***************************/
 
 //安全隐患-校院巡察/实验室自查-安全隐患列表
-//安全隐患-校院巡察/批量审核列表
 //整改报告-报告隐患列表
 export function checkHazardList(query) {
   return request({
@@ -472,6 +471,15 @@ export function checkHazardList(query) {
   })
 }
 
+//安全隐患-校院巡察/批量审核列表
+export function batchApprovalList(query) {
+  return request({
+    url: '/zd-security/checkHazard/batchApprovalList',
+    method: 'get',
+    params: query
+  })
+}
+
 //安全隐患-暂无法整改列表数据
 export function unableRectifyList(query) {
   return request({
@@ -602,11 +610,21 @@ export function countHazardNum(query) {
 }
 
 //通用接口-根据实验室id查询该实验室有关计划
-export function getCheckPlanBySubId(data) {
+export function getCheckPlanBySubId(query) {
   return request({
-    url: '/zd-security/user/checkManage/getCheckPlanBySubId',
-    method: 'post',
-    data: data
+    url: '/zd-security/checkManage/getCheckPlanBySubId',
+    method: 'get',
+    params: query
+  })
+}
+
+//通用接口-根据楼栋ID查询实验室列表
+//通用接口-根据名称查询实验室列表
+export function buildBySubList(query) {
+  return request({
+    url: '/laboratory/subject/buildBySub/list',
+    method: 'get',
+    params: query
   })
 }
 

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

@@ -120,7 +120,7 @@
                   v-model="item.hazardDescribe">
                 </el-input>
               </el-form-item>
-              <el-form-item label="隐患照片" label-width="123px">
+              <el-form-item label="隐患照片" :prop="'checkHazardDtoList.'+index+'.uploadDtoList'" :rules="rules.uploadDtoList" label-width="123px">
                 <div class="for-img-box" v-for="(img,imgIndex) in item.uploadDtoList" :key="imgIndex">
                   <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>
@@ -182,16 +182,7 @@
         addPageTitle:"",
         //新增-编辑
         options:[],
-        addForm:{
-          checkResult:0,
-          rectifyNotice:0,
-          checkHazardDtoList:[
-            {
-              lookType:true,
-              uploadDtoList:[],
-            }
-          ],
-        },
+        addForm:{},
         //上传用名称保存
         upDataName:"",
         // 表单校验
@@ -215,6 +206,9 @@
             { required: true, message: "请输入隐患描述", trigger: "blur" },
             { required: true, message: "请输入隐患描述", validator: this.spaceJudgment, trigger: "blur" },
           ],
+          uploadDtoList: [
+            { required: true, message: "请上传隐患照片", trigger: "blur" },
+          ],
         },
         //隐患发生次数
         hazardCheckCount:0,

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

@@ -3,9 +3,9 @@
     <div class="title-max-box">
       <p class="title-p">检查详情</p>
       <p class="title-button add-button-one-90" @click="outButton">返回</p>
-      <img class="position-img" v-if="imgType == 1" src="@/assets/ZDimages/safetyCheck/icon_xyxc_qx.png">
-      <img class="position-img" v-if="imgType == 2" src="@/assets/ZDimages/safetyCheck/icon_xyxc_sys.png">
-      <img class="position-img" v-if="imgType == 3" src="@/assets/ZDimages/safetyCheck/icon_xyxc_xy.png">
+      <img class="position-img" v-if="addForm.checkRange == 1" src="@/assets/ZDimages/safetyCheck/icon_xyxc_qx.png">
+      <img class="position-img" v-if="addForm.checkRange == 2" src="@/assets/ZDimages/safetyCheck/icon_xyxc_xy.png">
+      <img class="position-img" v-if="addForm.checkRange == 3" src="@/assets/ZDimages/safetyCheck/icon_xyxc_sys.png">
     </div>
     <div class="content-max-box scrollbar-box">
       <el-form  :model="addForm" label-width="82px">

src/views/safetyCheck/safetyHazard/batchAudit.vue

@@ -119,7 +119,7 @@
 </template>
 
 <script>
-  import { checkHazardList,batchApprove } from '@/api/safetyCheck/index'
+  import { batchApprovalList,batchApprove } from '@/api/safetyCheck/index'
   import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
   export default {
     name: 'batchAudit',
@@ -258,7 +258,7 @@
           obj.endTime = "";
         }
         obj.hazardType = this.propsBatchAuditData.hazardType
-        checkHazardList(obj).then(response => {
+        batchApprovalList(obj).then(response => {
           this.total = response.data.total;
           this.tableList = response.data.records;
         });

src/views/safetyCheck/worktable/toDoListBox.vue

@@ -42,8 +42,8 @@
           <p v-if="queryParams.manageStatus == 2">复核</p>
         </div>
         <img class="position-img" v-if="item.checkRange == 1" src="@/assets/ZDimages/safetyCheck/icon_xyxc_qx.png">
-        <img class="position-img" v-if="item.checkRange == 2" src="@/assets/ZDimages/safetyCheck/icon_xyxc_sys.png">
-        <img class="position-img" v-if="item.checkRange == 3" src="@/assets/ZDimages/safetyCheck/icon_xyxc_xy.png">
+        <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>
     </div>