zc

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

@@ -12,18 +12,18 @@
         <div class="top-form-box">
           <div class="top-form-left-box">
             <el-form-item label="计划标题" prop="title">
-              <el-input disabled v-model="addForm.title" placeholder="未填写" maxLength="10" style="width: 690px"/>
+              <el-input disabled v-model="addForm.title" placeholder="未填写" style="width: 690px"/>
             </el-form-item>
             <div style="display: flex">
               <el-form-item label="学院" prop="subjectName">
-                <el-input disabled v-model="addForm.subjectName" placeholder="未填写" maxLength="10" style="width: 300px"/>
+                <el-input disabled v-model="addForm.subjectName" placeholder="未填写" style="width: 300px"/>
               </el-form-item>
               <el-form-item label="实验室" prop="subjectName" label-width="110px">
-                <el-input disabled v-model="addForm.subjectName" placeholder="未填写" maxLength="10" style="width: 280px"/>
+                <el-input disabled v-model="addForm.subjectName" placeholder="未填写" style="width: 280px"/>
               </el-form-item>
             </div>
             <el-form-item label="检查要求" prop="checkDemand">
-              <el-input disabled v-model="addForm.checkDemand" placeholder="未填写" maxLength="10" style="width: 690px"/>
+              <el-input disabled v-model="addForm.checkDemand" placeholder="未填写" style="width: 690px"/>
             </el-form-item>
             <el-form-item label="检查结果" prop="checkResult">
               <el-select v-model="addForm.checkResult" placeholder="请选择检查结果" style="width: 690px">

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

@@ -32,7 +32,8 @@
 -->
 <template>
   <el-dialog class="safetyHazard-info-dialog-box" @close="outDialog"
-             :title="infoDialogTitle" :visible.sync="infoDialogType" v-if="infoDialogType"
+             :title="infoDialogData.checkHazardApplyDto.rectifyStatus==1?'已完成':(infoDialogData.checkHazardApplyDto.rectifyStatus==2?'待整改':(infoDialogData.checkHazardApplyDto.rectifyStatus==3?'待复核':(infoDialogData.checkHazardApplyDto.rectifyStatus==4?'暂无法整改':'')))"
+             :visible.sync="infoDialogType" v-if="infoDialogType"
              width="1184px" append-to-body>
     <div class="info-dialog-title-box scrollbar-box">
       <div class="info-dialog-for-title-box" @click="checkTitleButton('info')" :class="infoDialogCheckIndex == 'info'?'info-dialog-for-check':''">
@@ -355,7 +356,6 @@
         headers: {
           Authorization: "Bearer " + getToken(),
         },
-        infoDialogTitle:"编辑",
         infoDialogType:false,
         //img 与 document 展示状态
         imgDocumentType:0,

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

@@ -11,37 +11,31 @@
       <el-form  :model="addForm" label-width="82px">
         <div class="top-form-box">
           <div class="top-form-left-box">
-            <el-form-item label="计划标题" prop="data1">
-              <el-input disabled v-model="addForm.data1" placeholder="未填写" maxLength="10" style="width: 690px"/>
+            <el-form-item label="计划标题" prop="title">
+              <el-input disabled v-model="addForm.title" placeholder="未填写" style="width: 690px"/>
             </el-form-item>
             <div style="display: flex">
-              <el-form-item label="学院" prop="data2">
-                <el-input disabled v-model="addForm.data2" placeholder="未填写" maxLength="10" style="width: 300px"/>
+              <el-form-item label="学院" prop="collegeName">
+                <el-input disabled v-model="addForm.collegeName" placeholder="未填写" style="width: 300px"/>
               </el-form-item>
-              <el-form-item label="实验室" prop="data3" label-width="110px">
-                <el-input disabled v-model="addForm.data3" placeholder="未填写" maxLength="10" style="width: 280px"/>
+              <el-form-item label="实验室" prop="subjectName" label-width="110px">
+                <el-input disabled v-model="addForm.subjectName" placeholder="未填写" style="width: 280px"/>
               </el-form-item>
             </div>
-            <el-form-item label="检查要求" prop="data4">
-              <el-input disabled v-model="addForm.data4" placeholder="未填写" maxLength="10" style="width: 690px"/>
+            <el-form-item label="检查要求" prop="checkDemand">
+              <el-input disabled v-model="addForm.checkDemand" placeholder="未填写" style="width: 690px"/>
             </el-form-item>
-            <el-form-item label="检查结果" prop="data5">
-              <el-input disabled v-model="addForm.data5" placeholder="未填写" maxLength="10" style="width: 690px"/>
+            <el-form-item label="检查结果" prop="checkResult">
+              <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:0 15px;">{{addForm.checkResult==0?'不符合':(addForm.checkResult==1?'符合':'')}}</p>
             </el-form-item>
-            <div style="display: flex">
-              <el-form-item label="整改告知书" prop="data6" style="width: 300px">
+            <div style="display: flex" v-if="addForm.checkResult==0">
+              <el-form-item :label="addForm.rectifyNotice == 1?'整改告知书':'整改通知书'" style="width: 300px">
                 <div class="data-button-box">
                   <p class="look-button" @click="lookDocumentButton(1)">查看</p>
                   <p class="download-button" @click="downloadButton">下载</p>
                 </div>
               </el-form-item>
-              <el-form-item label="整改通知书" prop="data6" style="width: 300px">
-                <div class="data-button-box">
-                  <p class="look-button" @click="lookDocumentButton(1)">查看</p>
-                  <p class="download-button" @click="downloadButton">下载</p>
-                </div>
-              </el-form-item>
-              <el-form-item label="材料附件" prop="data6" style="width: 300px">
+              <el-form-item label="材料附件" style="width: 300px">
                 <div class="data-button-box">
                   <p class="look-button" @click="lookDocumentListButton(1)">查看</p>
                 </div>
@@ -49,31 +43,31 @@
             </div>
           </div>
           <div class="top-form-right-box">
-            <el-form-item label="检查类型" prop="data6">
-              <el-input disabled v-model="addForm.data6" placeholder="未填写" maxLength="10" style="width: 450px"/>
+            <el-form-item label="检查类型" prop="checkType">
+              <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:450px;padding:0 15px;">{{addForm.checkType==1?'校园巡查':(addForm.checkType==2?'实验室自查':'')}}</p>
             </el-form-item>
-            <el-form-item label="楼栋" prop="data8">
-              <el-input disabled v-model="addForm.data8" placeholder="未填写" maxLength="10" style="width: 450px"/>
+            <el-form-item label="楼栋" prop="buildName">
+              <el-input disabled v-model="addForm.buildName" placeholder="未填写" maxLength="10" style="width: 450px"/>
             </el-form-item>
-            <el-form-item label="计划周期" prop="data9">
-              <el-input disabled v-model="addForm.data9" placeholder="未填写" maxLength="10" style="width: 450px"/>
+            <el-form-item :label="addForm.checkType==1?'计划周期':(addForm.checkType==2?'任务周期':'')" prop="data9">
+              <el-input disabled v-model="addForm.cycleStartTime+' 至 '+addForm.cycleEndTime" placeholder="未填写" maxLength="10" style="width: 450px"/>
             </el-form-item>
-            <el-form-item label="整改期限" prop="data10">
-              <el-input disabled v-model="addForm.data10" placeholder="未填写" maxLength="10" style="width: 450px"/>
+            <el-form-item label="整改期限" prop="rectifyDeadline" v-if="addForm.checkResult==0">
+              <el-input disabled v-model="addForm.rectifyDeadline" placeholder="未填写" maxLength="10" style="width: 450px"/>
             </el-form-item>
-            <el-form-item label="材料附件" prop="data6" style="width: 450px">
+            <el-form-item label="材料附件" style="width: 450px" v-if="addForm.checkResult==1">
               <div class="data-button-box">
                 <p class="look-button" @click="lookDocumentListButton(1)">查看</p>
               </div>
             </el-form-item>
           </div>
         </div>
-        <div class="bottom-form-box">
+        <div class="bottom-form-box" v-if="addForm.checkResult==0">
           <div class="bottom-form-title-box">
             <p>不符合项</p>
-            <p>隐患数：{{addForm.rectificationList.length}}</p>
+            <p>隐患数：{{addForm.dangerNum}}</p>
           </div>
-          <div class="for-max-big-box" v-for="(item,index) in addForm.rectificationList" :key="index">
+          <div class="for-max-big-box" v-for="(item,index) in addForm.checkHazardDtoList" :key="index">
             <div class="for-title-box">
               <p class="for-title-p">第{{index+1}}隐患项</p>
             </div>
@@ -86,7 +80,7 @@
                     <p></p>
                   </div>
                   <div class="right-min-content-box">
-                    <p class="button-p" @click="addDialogOpen(true,item)">已完成 <i class="el-icon-d-arrow-right"></i></p>
+                    <p class="button-p" @click="addDialogOpen(true,item)">{{item.rectifyStatus==1?'已完成':(item.rectifyStatus==2?'待整改':(item.rectifyStatus==3?'待复核':(item.rectifyStatus==4?'暂无法整改':'')))}} <i class="el-icon-d-arrow-right"></i></p>
                   </div>
                 </div>
                 <div class="min-content-box">
@@ -97,10 +91,8 @@
                   </div>
                   <div class="right-min-content-box" style="height:120px;">
                     <div class="inspection-box">
-                      <p class="scrollbar-box">1 检查项目名称 — 1.1 检查项目名称名称名称名称 — 1.1.1 检查项目名称名称名称名称名
-                        称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称
-                      </p>
-                      <p>此检查项在当前实验室累计出现 <span>9</span> 次隐患</p>
+                      <p class="scrollbar-box">{{item.hazardCheckProStr}}</p>
+                      <p v-if="item.hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{item.hazardCheckCount}}</span> 次隐患</p>
                     </div>
                   </div>
                 </div>
@@ -113,7 +105,7 @@
                   <div class="right-min-content-box" style="height:120px;">
                     <div class="text-box">
                       <p class="null-p"></p>
-                      <p class="text-p">一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十</p>
+                      <p class="text-p">{{item.hazardDescribe}}</p>
                       <p class="null-p"></p>
                     </div>
                   </div>
@@ -127,7 +119,7 @@
                     <p></p>
                   </div>
                   <div class="right-min-content-box">
-                    <p class="title-p">一般隐患</p>
+                    <p class="title-p">{{item.hazardLevel==0?'一般隐患':(item.hazardLevel==1?'重大隐患':(item.hazardLevel==2?'管理问题':''))}}</p>
                   </div>
                 </div>
                 <div class="min-content-box">
@@ -139,7 +131,7 @@
                   <div class="right-min-content-box" style="height:120px;">
                     <div class="text-box">
                       <p class="null-p"></p>
-                      <p class="text-p">一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十</p>
+                      <p class="text-p">{{item.hazardCheckPoint}}</p>
                       <p class="null-p"></p>
                     </div>
                   </div>
@@ -152,8 +144,8 @@
                   </div>
                   <div class="right-min-content-box" style="height:120px;">
                     <div class="img-box">
-                      <img :src="imgItem.url" @click="lookImg(item.imgList,imgIndex)"
-                           v-for="(imgItem,imgIndex) in item.imgList" :ley="imgIndex">
+                      <img :src="imgItem.fileUrl" @click="lookImg(item.imgList,imgIndex)"
+                           v-for="(imgItem,imgIndex) in item.uploadDtoList" :ley="imgIndex">
                     </div>
                   </div>
                 </div>
@@ -198,90 +190,7 @@
         //页面
         imgType:1,
         infoDialogType:false,
-        addForm:{
-          data1:0,
-          data2:0,
-          data3:0,
-          data4:0,
-          data5:0,
-          data6:0,
-          data7:[
-            {
-              name:"考勤一体机连接地址配置方法.docx",
-              url:"/statics/bigFile/2023042615/17558d57-744c-47ae-84b0-3acdd5559d19.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"www.baidu.com",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            },
-            {
-              name:"我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容",
-              url:"statics/bigFile/2023022011/f23a32c8-bf8e-40b5-9e52-04cf73fc6037.docx",
-            }
-          ],
-          rectificationList:[
-            {
-              lookType:true,
-              imgList:[
-                {name:"1",url:'https://img2.baidu.com/it/u=3219906533,2982923681&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=500'},
-                {name:"2",url:'https://img1.baidu.com/it/u=567782244,1695500002&fm=253&fmt=auto&app=138&f=JPEG?w=753&h=500'},
-                {name:"3",url:'https://img1.baidu.com/it/u=2995157981,91041597&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=750'},
-                {name:"4",url:'https://img0.baidu.com/it/u=561734853,2461096286&fm=253&fmt=auto&app=138&f=JPEG?w=889&h=500'},
-                {name:"5",url:'https://img2.baidu.com/it/u=567357414,4240886412&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=500'},
-              ],
-            },
-            {
-              lookType:true,
-              imgList:[
-                {name:"1",url:'https://img2.baidu.com/it/u=3219906533,2982923681&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=500'},
-                {name:"2",url:'https://img1.baidu.com/it/u=567782244,1695500002&fm=253&fmt=auto&app=138&f=JPEG?w=753&h=500'},
-                {name:"3",url:'https://img1.baidu.com/it/u=2995157981,91041597&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=750'},
-                {name:"4",url:'https://img0.baidu.com/it/u=561734853,2461096286&fm=253&fmt=auto&app=138&f=JPEG?w=889&h=500'},
-                {name:"5",url:'https://img2.baidu.com/it/u=567357414,4240886412&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=500'},
-              ],
-            },
-          ],
-        },
+        addForm:{},
       }
     },
     created(){},
@@ -302,10 +211,10 @@
             let obj = {
               id:data.id
             }
+            console.log(obj)
             this.$set(this,'propsInfoDialogData',obj);
             this.$set(this,'infoDialogType',type);
           }else{
-            this.getList();
             this.$set(this,'infoDialogType',type);
           }
         }

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

@@ -190,6 +190,7 @@
             this.$set(this,'pageType',type);
           }else if(type == 3){
             //详情
+            this.$set(this,'propsInfoData',{id:id});
             this.$set(this,'pageType',type);
           }else if(type == 4){
             //返回并刷新

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

@@ -86,10 +86,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.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-if="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
-                <p class="table-button-p" v-if="scope.row.checkStatus!=1" @click="goPage(2,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>

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

@@ -190,6 +190,7 @@
             this.$set(this,'pageType',type);
           }else if(type == 3){
             //详情
+            this.$set(this,'propsInfoData',{id:id});
             this.$set(this,'pageType',type);
           }else if(type == 4){
             //返回并刷新

src/views/safetyCheck/rectificationReport/index.vue

@@ -1,87 +1,89 @@
 <template>
   <div class="app-container rectificationReport">
-    <div class="title-box">
-      <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
-        <el-form-item label="关键字" prop="searchValue">
-          <el-input
-            maxLength="30"
-            v-model="queryParams.searchValue"
-            placeholder="计划任务/实验室/房间号"
-            clearable
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item label="学院" prop="deptId" label-width="50px">
-          <el-select v-model="queryParams.deptId" clearable placeholder="学院" style="width: 150px">
-            <el-option
-              v-for="item in deptSelectList"
-              :key="item.deptId"
-              :label="item.deptName"
-              :value="item.deptId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="检查时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
-          <el-date-picker
-            :clearable="false"
-            v-model="dateRange"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <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-col :span="1.5">
-            <p class="inquire-button-one"
-               style="width:100px;"
-               @click="allDownload"
-            >批量下载</p>
-          </el-col>
-        </el-form-item>
-      </el-form>
+    <div class="rectificationReport-page" v-if="pageType == 1">
+      <div class="title-box">
+        <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
+          <el-form-item label="关键字" prop="searchValue">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.searchValue"
+              placeholder="计划任务/实验室/房间号"
+              clearable
+              style="width: 200px"
+            />
+          </el-form-item>
+          <el-form-item label="学院" prop="deptId" label-width="50px">
+            <el-select v-model="queryParams.deptId" clearable placeholder="学院" style="width: 150px">
+              <el-option
+                v-for="item in deptSelectList"
+                :key="item.deptId"
+                :label="item.deptName"
+                :value="item.deptId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="检查时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <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-col :span="1.5">
+              <p class="inquire-button-one"
+                 style="width:100px;"
+                 @click="allDownload"
+              >批量下载</p>
+            </el-col>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="content-box">
+        <el-table  border :data="tableList" ref="multipleTable" @selection-change="handleSelectionChange"  :row-key="getRowKeys">
+          <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
+          <el-table-column label="序号" align="center"  type="index" width="50" />
+          <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip/>
+          <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="160"/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="160"/>
+          <el-table-column label="房间号" align="center" prop="roomNumber" show-overflow-tooltip width="80"/>
+          <el-table-column label="楼栋" align="center" prop="buildName" show-overflow-tooltip width="100"/>
+          <el-table-column label="隐患数" align="center" prop="hazardCount" show-overflow-tooltip width="80"/>
+          <el-table-column label="计划周期" align="center" prop="cycleTime" show-overflow-tooltip width="200"/>
+          <el-table-column label="检查者" align="center" prop="checkUser" show-overflow-tooltip width="80"/>
+          <el-table-column label="检查时间" align="center" prop="checkTime" show-overflow-tooltip width="120"/>
+          <el-table-column label="操作" align="center" prop="deptName" width="200">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p" @click="goPage(2,scope.row)">检查详情</p>
+                <p class="table-button-p" @click="lookDocumentButton(1,scope.row)">查看</p>
+                <p class="table-button-p" @click="downloadButton(scope.row)">下载</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
     </div>
-    <div class="content-box">
-      <el-table  border :data="tableList" ref="multipleTable" @selection-change="handleSelectionChange"  :row-key="getRowKeys">
-        <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
-        <el-table-column label="序号" align="center"  type="index" width="50" />
-        <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip/>
-        <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="160"/>
-        <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="160"/>
-        <el-table-column label="房间号" align="center" prop="roomNumber" show-overflow-tooltip width="80"/>
-        <el-table-column label="楼栋" align="center" prop="buildName" show-overflow-tooltip width="100"/>
-        <el-table-column label="隐患数" align="center" prop="hazardCount" show-overflow-tooltip width="80"/>
-        <el-table-column label="计划周期" align="center" prop="cycleTime" show-overflow-tooltip width="200"/>
-        <el-table-column label="检查者" align="center" prop="checkUser" show-overflow-tooltip width="80"/>
-        <el-table-column label="检查时间" align="center" prop="checkTime" show-overflow-tooltip width="120"/>
-        <el-table-column label="操作" align="center" prop="deptName" width="200">
-          <template slot-scope="scope">
-            <div class="table-button-box">
-              <p class="table-button-null"></p>
-              <p class="table-button-p" @click="addDialogOpen(true)">检查详情</p>
-              <p class="table-button-p" @click="lookDocumentButton(1,scope.row)">查看</p>
-              <p class="table-button-p" @click="downloadButton(scope.row)">下载</p>
-              <p class="table-button-null"></p>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination :page-sizes="[20, 30, 40, 50]"
-                  v-show="total>0"
-                  :total="total"
-                  :page.sync="queryParams.pageNum"
-                  :limit.sync="queryParams.pageSize"
-                  @pagination="getList"
-      />
-    </div>
-    <infoDialog v-if="infoDialogType" :propsInfoDialogData="propsInfoDialogData"></infoDialog>
+    <listPage v-if="pageType == 2" :propsListPageData="propsListPageData"></listPage>
     <lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
   </div>
 </template>
@@ -89,21 +91,21 @@
 <script>
   import { listDepartments } from "@/api/system/dept";
   import { checkRectifyList,genReport,genReportZip } from '@/api/safetyCheck/index'
-  import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
+  import listPage from './listPage.vue'
   import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
   export default {
     name: 'index',
     components: {
-      infoDialog,
+      listPage,
       lookDocumentDialog
     },
     data(){
       return{
         //子组件数据
-        infoDialogType:false,
         lookDocumentType:false,
         propsLookDocumentData:{},
-        propsInfoDialogData:{},
+        propsListPageData:{},
+        pageType:1,
         deptSelectList:[],
         queryParams:{
           pageNum:1,
@@ -148,18 +150,12 @@
         this.download('/zd-security/checkRectify/genReport/'+row.id, {}, row.title+'.docx')
       },
       //开关详情页面
-      addDialogOpen(type,data){
-        if(this.infoDialogType != type){
-          if(type){
-            let obj = {
-              id:data.id
-            }
-            this.$set(this,'propsInfoDialogData',obj);
-            this.$set(this,'infoDialogType',type);
-          }else{
-            this.getList();
-            this.$set(this,'infoDialogType',type);
+      goPage(type,data){
+        if(this.pageType != type){
+          if(type == 2){
+            this.$set(this,'propsListPageData',data.id);
           }
+          this.$set(this,'pageType',type);
         }
       },
       //查看单个文档
@@ -237,40 +233,46 @@
     display: flex !important;
     flex-direction: column;
     overflow: hidden;
-    .title-box{
-      padding-top:20px;
-      .form-button-max-big-box{
-        display: inline-block;
-        .form-button-big-box{
-          display: flex;
-          div{
-            position: relative;
-            height:40px;
-            width:100px;
-            line-height: 40px;
-            text-align: center;
-            color:#0045AF;
-            font-size:14px;
-            border:1px solid #0045AF;
-            border-radius:4px;
-            margin-left:10px;
-            font-weight:500;
-            cursor: pointer;
-          }
-          .checkDiv{
-            color:#fff;
-            background-color:#0045AF;
-            border:1px solid #0045AF;
-          }
-        }
-      }
-    }
-    .content-box{
+    .rectificationReport-page{
       flex: 1;
-      display: flex;
+      display: flex !important;
       flex-direction: column;
-      padding:0 20px 20px;
       overflow: hidden;
+      .title-box{
+        padding-top:20px;
+        .form-button-max-big-box{
+          display: inline-block;
+          .form-button-big-box{
+            display: flex;
+            div{
+              position: relative;
+              height:40px;
+              width:100px;
+              line-height: 40px;
+              text-align: center;
+              color:#0045AF;
+              font-size:14px;
+              border:1px solid #0045AF;
+              border-radius:4px;
+              margin-left:10px;
+              font-weight:500;
+              cursor: pointer;
+            }
+            .checkDiv{
+              color:#fff;
+              background-color:#0045AF;
+              border:1px solid #0045AF;
+            }
+          }
+        }
+      }
+      .content-box{
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding:0 20px 20px;
+        overflow: hidden;
+      }
     }
   }
 </style>

src/views/safetyCheck/rectificationReport/listPage.vue

@@ -0,0 +1,253 @@
+<!--自查子项管理-->
+<template>
+  <div class="rectificationReport-listPage">
+    <div class="rectificationReport-listPage-page" v-if="pageType == 1">
+      <div class="title-box">
+        <p>检查详情</p>
+        <p class="add-button-one-90" style="width:80px;" @click="outButton">返回</p>
+      </div>
+      <div class="content-box">
+        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
+          <el-table-column label="序号" align="center"  type="index" width="60" />
+          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip/>
+          <el-table-column label="隐患描述" align="center" prop="hazardDescribe" show-overflow-tooltip width="220"/>
+          <el-table-column label="实验室" align="center" prop="subRoom" show-overflow-tooltip width="170"/>
+          <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="160"/>
+          <el-table-column label="整改人" align="center" prop="rectifyName" show-overflow-tooltip width="90"/>
+          <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>
+            </template>
+          </el-table-column>
+          <el-table-column label="整改时间" sortable="custom" align="center" prop="rectifyTime" show-overflow-tooltip width="220">
+            <template slot-scope="scope">
+              <p>{{scope.row.rectifyTime}}<span v-if="scope.row.overdueStatus==1" style="margin-left:10px;color:#EE0606;">已逾期</span></p>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核状态" align="center" prop="examineResult" show-overflow-tooltip width="80">
+            <template slot-scope="scope">
+              {{scope.row.examineResult == 1?'已通过':(scope.row.examineResult == 2?'已驳回':(scope.row.examineResult == 3?'待审核':''))}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="80">
+            <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-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
+    </div>
+    <lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
+  </div>
+</template>
+
+<script>
+  import { listDepartments } from "@/api/system/dept";
+  import { findByCheckPlanId } from '@/api/safetyCheck/index'
+  import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
+  import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
+  export default {
+    name: 'index',
+    props:{
+      propsListPageData:{},
+    },
+    components: {
+      lookDocumentDialog,
+      infoDialog
+    },
+    data(){
+      return{
+        //子组件数据
+        lookDocumentType:false,
+        propsLookDocumentData:{},
+        infoDialogType:false,
+        propsInfoDialogData:{},
+        //学院列表
+        deptSelectList:[],
+        pageType:1,
+        queryParams:{
+          pageNum:1,
+          pageSize:20,
+          manageStatus:'-1',
+          checkTimeSort:0,
+          searchValue:"",
+          deptId:""
+        },
+        dateRange:[],
+        tableList:[],
+        total:0,
+      }
+    },
+    created(){
+
+    },
+    mounted(){
+      this.listDepartments();
+      this.getList();
+    },
+    methods:{
+      //开关详情页面
+      addDialogOpen(type,data){
+        if(this.infoDialogType != type){
+          if(type){
+            let obj = {
+              id:data.id
+            }
+            this.$set(this,'propsInfoDialogData',obj);
+            this.$set(this,'infoDialogType',type);
+          }else{
+            this.getList();
+            this.$set(this,'infoDialogType',type);
+          }
+        }
+      },
+      //返回按钮
+      outButton(){
+        this.$parent.goPage(1);
+      },
+      //开始检查
+      goAddPage(type,id){
+        if(this.pageType != type){
+          if(type == 1){
+            //返回
+            this.$set(this,'pageType',type);
+          }else if(type == 2){
+            //开始检查/编辑
+            this.$set(this,'propsAddData',{
+              id:id,
+              title:'实验室自查',
+            });
+            this.$set(this,'pageType',type);
+          }else if(type == 3){
+            //详情
+            this.$set(this,'propsInfoData',{id:id});
+            this.$set(this,'pageType',type);
+          }else if(type == 4){
+            //返回并刷新
+            this.getList();
+            this.$set(this,'pageType',1);
+          }
+        }
+      },
+      //时间排序方法
+      sortChange(val){
+        if(val.prop == 'checkTime'){
+          this.$set(this.queryParams,'checkTimeSort',val.order=='ascending'?'1':(val.order=='descending'?'2':"0"));
+          this.getList();
+        }
+      },
+      //范围选择
+      topLeftClickType(type){
+        if(this.queryParams.buttonType != type){
+          this.$set(this.queryParams,'buttonType',type);
+          this.getList();
+        }
+      },
+      //获取数据列表
+      getList(){
+        // findByCheckPlanId(obj).then(response => {
+        //   this.total = response.data.total;
+        //   this.tableList = response.data.records;
+        // });
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.$set(this.queryParams,'pageNum',1);
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.$set(this,'dateRange',[]);
+        this.$set(this,'queryParams',{
+          pageNum:1,
+          pageSize:20,
+          manageStatus:'-1',
+          checkTimeSort:0,
+          searchValue:"",
+          deptId:""
+        });
+        this.handleQuery();
+      },
+      //查看单个文档
+      lookDocumentButton(type,row){
+        if(type==1){
+          this.$set(this,'propsLookDocumentData',{
+            title:"整改报告",
+            name:row.name,
+            url:row.url
+          });
+          this.$set(this,'lookDocumentType',true);
+        }else{
+          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>
+
+<style scoped lang="scss">
+  .rectificationReport-listPage{
+    flex: 1;
+    display: flex !important;
+    flex-direction: column;
+    overflow: hidden;
+    .rectificationReport-listPage-page{
+      flex: 1;
+      display: flex !important;
+      flex-direction: column;
+      overflow: hidden;
+      .title-box{
+        border-bottom:1px solid #dedede;
+        display: flex;
+        p:nth-child(1){
+          flex:1;
+          font-size:16px;
+          margin-left:20px;
+          line-height:80px;
+          color:#0045AF;
+          font-weight:500;
+        }
+        p:nth-child(2){
+          margin:20px 20px 0 0;
+        }
+      }
+      .content-box{
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding:20px;
+        overflow: hidden;
+      }
+    }
+  }
+</style>

src/views/safetyCheck/safetyHazard/departmentListPage.vue

@@ -89,7 +89,11 @@
               <p>{{scope.row.rectifyTime}}<span v-if="scope.row.overdueStatus==1" style="margin-left:10px;color:#EE0606;">已逾期</span></p>
             </template>
           </el-table-column>
-          <el-table-column label="审核状态" align="center" prop="examineResult" show-overflow-tooltip width="80"/>
+          <el-table-column label="审核状态" align="center" prop="examineResult" show-overflow-tooltip width="80">
+            <template slot-scope="scope">
+              {{scope.row.examineResult == 1?'已通过':(scope.row.examineResult == 2?'已驳回':(scope.row.examineResult == 3?'待审核':''))}}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" width="80">
             <template slot-scope="scope">
               <div class="table-button-box">

src/views/safetyCheck/safetyHazard/schoolListPage.vue

@@ -91,7 +91,7 @@
           </el-table-column>
           <el-table-column label="审核状态" align="center" prop="examineResult" show-overflow-tooltip width="80">
             <template slot-scope="scope">
-              <p>{{scope.row.examineResult}}</p>
+              {{scope.row.examineResult == 1?'已通过':(scope.row.examineResult == 2?'已驳回':(scope.row.examineResult == 3?'待审核':''))}}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="80">

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

@@ -86,10 +86,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.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-if="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
-                <p class="table-button-p" v-if="scope.row.checkStatus!=1" @click="goPage(2,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>

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

@@ -190,6 +190,7 @@
             this.$set(this,'pageType',type);
           }else if(type == 3){
             //详情
+            this.$set(this,'propsInfoData',{id:id});
             this.$set(this,'pageType',type);
           }else if(type == 4){
             //返回并刷新