dedsudiyu 2 years ago
parent
commit
aa8ba52363

+ 63 - 16
src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/infoDialog.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <el-dialog class="selfInspectionManagement-info-dialog-box"
+  <el-dialog class="safetyHazard-info-dialog-box" @close="outDialog"
              :title="infoDialogTitle" :visible.sync="infoDialogType" v-if="infoDialogType"
              :title="infoDialogTitle" :visible.sync="infoDialogType" v-if="infoDialogType"
              width="1184px" append-to-body>
              width="1184px" append-to-body>
     <div class="info-dialog-title-box">
     <div class="info-dialog-title-box">
@@ -18,7 +18,7 @@
       </div>
       </div>
     </div>
     </div>
     <div class="info-dialog-content-box scrollbar-box">
     <div class="info-dialog-content-box scrollbar-box">
-      <div class="info-dialog-content-info" v-if="infoDialogCheckIndex == 'info'">
+      <div class="info-dialog-content-info" v-if="infoDialogCheckIndex == 'info' && imgDocumentType == 0">
         <div class="text-box-box">
         <div class="text-box-box">
           <p>计划标题</p>
           <p>计划标题</p>
           <p>{{infoDialogData.data1}}</p>
           <p>{{infoDialogData.data1}}</p>
@@ -64,7 +64,7 @@
           </div>
           </div>
         </div>
         </div>
         <div class="button-box">
         <div class="button-box">
-          <p>整改通知书</p>
+          <p>整改通知书?整改告知书</p>
           <p class="inquire-button-one" @click="lookDocument">查看</p>
           <p class="inquire-button-one" @click="lookDocument">查看</p>
           <p class="add-button-one-90">下载</p>
           <p class="add-button-one-90">下载</p>
         </div>
         </div>
@@ -142,7 +142,8 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <div class="info-dialog-content-type" v-for="(item,index) in infoDialogList" :key="index" v-if="infoDialogCheckIndex == index">
+      <div class="info-dialog-content-type" v-if="infoDialogCheckIndex == index && imgDocumentType == 0"
+           v-for="(item,index) in infoDialogList" :key="index">
         <!--已整改-->
         <!--已整改-->
         <div class="has-rectification" v-if="item.rectificationType == 1">
         <div class="has-rectification" v-if="item.rectificationType == 1">
           <div class="button-box">
           <div class="button-box">
@@ -192,9 +193,14 @@
               <p>{{item.dataH}}</p>
               <p>{{item.dataH}}</p>
             </div>
             </div>
           </div>
           </div>
+          <div class="button-box">
+            <p>整改报告书</p>
+            <p class="inquire-button-one" @click="lookDocument">查看</p>
+            <p class="add-button-one-90">下载</p>
+          </div>
         </div>
         </div>
       </div>
       </div>
-      <div class="info-dialog-content-add" v-if="infoDialogCheckIndex == 'add'">
+      <div class="info-dialog-content-add" v-if="infoDialogCheckIndex == 'add' && imgDocumentType == 0">
         <el-form  :model="addForm" :rules="rules" label-width="90px">
         <el-form  :model="addForm" :rules="rules" label-width="90px">
           <!--待整改-->
           <!--待整改-->
           <div class="stay-rectification" v-if="addFormType == 1">
           <div class="stay-rectification" v-if="addFormType == 1">
@@ -254,14 +260,14 @@
           </div>
           </div>
         </el-form>
         </el-form>
       </div>
       </div>
-      <div class="info-dialog-content-img" v-if="infoDialogCheckIndex == 'img'">
+      <div class="info-dialog-content-img" v-if="imgDocumentType == 1">
         <img :src="imgList[imgIndex].url">
         <img :src="imgList[imgIndex].url">
         <p class="el-icon-arrow-left left-button-p" @click="infoLeftButton"></p>
         <p class="el-icon-arrow-left left-button-p" @click="infoLeftButton"></p>
         <p class="el-icon-arrow-right right-button-p" @click="infoRightButton"></p>
         <p class="el-icon-arrow-right right-button-p" @click="infoRightButton"></p>
         <p class="bottom-num-text">{{imgIndex+1}} / {{imgList.length}}</p>
         <p class="bottom-num-text">{{imgIndex+1}} / {{imgList.length}}</p>
         <p class="out-button" @click="outLook">返回</p>
         <p class="out-button" @click="outLook">返回</p>
       </div>
       </div>
-      <div class="info-dialog-content-document" v-if="infoDialogCheckIndex == 'document'">
+      <div class="info-dialog-content-document" v-if="imgDocumentType == 2">
         <iframe
         <iframe
           class="iframe"
           class="iframe"
           :src="iframeSrc" scrolling="auto" frameborder="0">
           :src="iframeSrc" scrolling="auto" frameborder="0">
@@ -293,6 +299,8 @@
         },
         },
         infoDialogTitle:"编辑",
         infoDialogTitle:"编辑",
         infoDialogType:true,
         infoDialogType:true,
+        //img 与 document 展示状态
+        imgDocumentType:0,
         infoDialogCheckIndex:'info',
         infoDialogCheckIndex:'info',
         infoDialogData:{
         infoDialogData:{
           data1:"2023年3月份校级督导检查",
           data1:"2023年3月份校级督导检查",
@@ -382,10 +390,10 @@
 
 
     },
     },
     methods:{
     methods:{
-
       //标签切换
       //标签切换
       checkTitleButton(index){
       checkTitleButton(index){
         if(this.infoDialogCheckIndex != index){
         if(this.infoDialogCheckIndex != index){
+          this.$set(this,'imgDocumentType',0);
           this.$set(this,'infoDialogCheckIndex',index);
           this.$set(this,'infoDialogCheckIndex',index);
         }
         }
       },
       },
@@ -397,17 +405,16 @@
       lookDocument(url){
       lookDocument(url){
         url = 'http://192.168.1.43/labSystem/statics/bigFile/2023042514/96ca9fcb-bb8e-4e90-a74a-5e94abea3816.pdf'
         url = 'http://192.168.1.43/labSystem/statics/bigFile/2023042514/96ca9fcb-bb8e-4e90-a74a-5e94abea3816.pdf'
         this.iframeSrc = this.urlJudge(url)
         this.iframeSrc = this.urlJudge(url)
-        this.$set(this,'infoDialogCheckIndex','document');
+        this.$set(this,'imgDocumentType',2);
       },
       },
       //点击查看图片
       //点击查看图片
       lookImg(list,index){
       lookImg(list,index){
         this.$set(this,'imgList',list)
         this.$set(this,'imgList',list)
         this.$set(this,'imgIndex',index)
         this.$set(this,'imgIndex',index)
-        this.$set(this,'saveIndex',this.infoDialogCheckIndex);
-        this.$set(this,'infoDialogCheckIndex','img');
+        this.$set(this,'imgDocumentType',1);
       },
       },
       outLook(){
       outLook(){
-        this.$set(this,'infoDialogCheckIndex',this.saveIndex);
+        this.$set(this,'imgDocumentType',0);
       },
       },
       //图片左右按键
       //图片左右按键
       infoLeftButton(){
       infoLeftButton(){
@@ -467,15 +474,16 @@
       delImg(imgIndex){
       delImg(imgIndex){
         this.addForm.upImgList.splice(imgIndex,1);
         this.addForm.upImgList.splice(imgIndex,1);
       },
       },
+      //退出
       outDialog(){
       outDialog(){
-        this.$set(this,'infoDialogType',false);
+        this.$parent.addDialogOpen(false);
       },
       },
     },
     },
   }
   }
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
-  .selfInspectionManagement-info-dialog-box{
+  .safetyHazard-info-dialog-box{
     ::v-deep .el-dialog__body{
     ::v-deep .el-dialog__body{
       padding:0 0 30px 0;
       padding:0 0 30px 0;
     }
     }
@@ -715,6 +723,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               text-align: center;
               text-align: center;
@@ -735,6 +745,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               font-size:14px;
               font-size:14px;
@@ -755,6 +767,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             img{
             img{
               cursor: pointer;
               cursor: pointer;
@@ -776,9 +790,11 @@
                 width:80px;
                 width:80px;
                 font-size:16px;
                 font-size:16px;
                 color:#333;
                 color:#333;
+                text-align: right;
+                margin-right:15px;
               }
               }
               p:nth-child(2){
               p:nth-child(2){
-                width:430px;
+                width:412px;
                 height:40px;
                 height:40px;
                 font-size:14px;
                 font-size:14px;
                 line-height:40px;
                 line-height:40px;
@@ -799,6 +815,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             img{
             img{
               width:60px;
               width:60px;
@@ -814,6 +832,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               font-size:14px;
               font-size:14px;
@@ -836,9 +856,11 @@
                 width:80px;
                 width:80px;
                 font-size:16px;
                 font-size:16px;
                 color:#333;
                 color:#333;
+                text-align: right;
+                margin-right:15px;
               }
               }
               p:nth-child(2){
               p:nth-child(2){
-                width:430px;
+                width:412px;
                 height:40px;
                 height:40px;
                 font-size:14px;
                 font-size:14px;
                 line-height:40px;
                 line-height:40px;
@@ -849,6 +871,31 @@
             }
             }
 
 
           }
           }
+          .button-box{
+            margin-top:20px;
+            display: flex;
+            p:nth-child(1){
+              height:40px;
+              line-height:40px;
+              width:80px;
+              font-size:16px;
+              color:#333;
+              text-align: right;
+              margin-right:15px;
+            }
+            p:nth-child(2){
+              width:70px;
+              height:30px;
+              line-height:30px;
+              margin-top:5px;
+            }
+            p:nth-child(3){
+              width:70px;
+              height:30px;
+              line-height:30px;
+              margin-top:5px;
+            }
+          }
         }
         }
       }
       }
       .info-dialog-content-add{
       .info-dialog-content-add{

File diff suppressed because it is too large
+ 9 - 2
src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/infoPage.vue


+ 0 - 33
src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/index.vue

@@ -183,39 +183,6 @@
         });
         });
         this.handleQuery();
         this.handleQuery();
       },
       },
-      /*==========上传相关==========*/
-
-      handleAvatarSuccess(res) {
-        if(this.dialogUpList.length>9){
-          this.msgError('已到达上传数量上限')
-          return
-        }
-        let suffixName= this.upDataName.split('.')[this.upDataName.split('.').length - 2]
-        //判断文件名中是否有逗号和分号
-        if(suffixName.indexOf(',')==-1 && suffixName.indexOf(';')==-1){
-        }else{
-          this.$message.info('文件名里包含逗号或分号,请修改后重新上传!')
-          return
-        }
-        let obj ={
-          name:this.upDataName,
-          url:res.data.url,
-        };
-        this.dialogUpList.push(obj);
-        this.$forceUpdate()
-      },
-      beforeAvatarUpload(file) {
-        console.log('file',file)
-        let type = false;
-        if (file.type == 'application/pdf' || file.type == 'application/msword' || file.type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'|| file.type == 'application/vnd.ms-excel' || file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
-          this.upDataName = file.name;
-          type = true;
-        }else{
-          this.$message.error('只能上传png/jpeg/gif/doc/docx格式');
-          type = false;
-        }
-        return type;
-      },
     }
     }
   }
   }
 </script>
 </script>

+ 63 - 16
src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/infoDialog.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <el-dialog class="selfInspectionManagement-info-dialog-box"
+  <el-dialog class="safetyHazard-info-dialog-box" @close="outDialog"
              :title="infoDialogTitle" :visible.sync="infoDialogType" v-if="infoDialogType"
              :title="infoDialogTitle" :visible.sync="infoDialogType" v-if="infoDialogType"
              width="1184px" append-to-body>
              width="1184px" append-to-body>
     <div class="info-dialog-title-box">
     <div class="info-dialog-title-box">
@@ -18,7 +18,7 @@
       </div>
       </div>
     </div>
     </div>
     <div class="info-dialog-content-box scrollbar-box">
     <div class="info-dialog-content-box scrollbar-box">
-      <div class="info-dialog-content-info" v-if="infoDialogCheckIndex == 'info'">
+      <div class="info-dialog-content-info" v-if="infoDialogCheckIndex == 'info' && imgDocumentType == 0">
         <div class="text-box-box">
         <div class="text-box-box">
           <p>计划标题</p>
           <p>计划标题</p>
           <p>{{infoDialogData.data1}}</p>
           <p>{{infoDialogData.data1}}</p>
@@ -64,7 +64,7 @@
           </div>
           </div>
         </div>
         </div>
         <div class="button-box">
         <div class="button-box">
-          <p>整改通知书</p>
+          <p>整改通知书?整改告知书</p>
           <p class="inquire-button-one" @click="lookDocument">查看</p>
           <p class="inquire-button-one" @click="lookDocument">查看</p>
           <p class="add-button-one-90">下载</p>
           <p class="add-button-one-90">下载</p>
         </div>
         </div>
@@ -142,7 +142,8 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <div class="info-dialog-content-type" v-for="(item,index) in infoDialogList" :key="index" v-if="infoDialogCheckIndex == index">
+      <div class="info-dialog-content-type" v-if="infoDialogCheckIndex == index && imgDocumentType == 0"
+           v-for="(item,index) in infoDialogList" :key="index">
         <!--已整改-->
         <!--已整改-->
         <div class="has-rectification" v-if="item.rectificationType == 1">
         <div class="has-rectification" v-if="item.rectificationType == 1">
           <div class="button-box">
           <div class="button-box">
@@ -192,9 +193,14 @@
               <p>{{item.dataH}}</p>
               <p>{{item.dataH}}</p>
             </div>
             </div>
           </div>
           </div>
+          <div class="button-box">
+            <p>整改报告书</p>
+            <p class="inquire-button-one" @click="lookDocument">查看</p>
+            <p class="add-button-one-90">下载</p>
+          </div>
         </div>
         </div>
       </div>
       </div>
-      <div class="info-dialog-content-add" v-if="infoDialogCheckIndex == 'add'">
+      <div class="info-dialog-content-add" v-if="infoDialogCheckIndex == 'add' && imgDocumentType == 0">
         <el-form  :model="addForm" :rules="rules" label-width="90px">
         <el-form  :model="addForm" :rules="rules" label-width="90px">
           <!--待整改-->
           <!--待整改-->
           <div class="stay-rectification" v-if="addFormType == 1">
           <div class="stay-rectification" v-if="addFormType == 1">
@@ -254,14 +260,14 @@
           </div>
           </div>
         </el-form>
         </el-form>
       </div>
       </div>
-      <div class="info-dialog-content-img" v-if="infoDialogCheckIndex == 'img'">
+      <div class="info-dialog-content-img" v-if="imgDocumentType == 1">
         <img :src="imgList[imgIndex].url">
         <img :src="imgList[imgIndex].url">
         <p class="el-icon-arrow-left left-button-p" @click="infoLeftButton"></p>
         <p class="el-icon-arrow-left left-button-p" @click="infoLeftButton"></p>
         <p class="el-icon-arrow-right right-button-p" @click="infoRightButton"></p>
         <p class="el-icon-arrow-right right-button-p" @click="infoRightButton"></p>
         <p class="bottom-num-text">{{imgIndex+1}} / {{imgList.length}}</p>
         <p class="bottom-num-text">{{imgIndex+1}} / {{imgList.length}}</p>
         <p class="out-button" @click="outLook">返回</p>
         <p class="out-button" @click="outLook">返回</p>
       </div>
       </div>
-      <div class="info-dialog-content-document" v-if="infoDialogCheckIndex == 'document'">
+      <div class="info-dialog-content-document" v-if="imgDocumentType == 2">
         <iframe
         <iframe
           class="iframe"
           class="iframe"
           :src="iframeSrc" scrolling="auto" frameborder="0">
           :src="iframeSrc" scrolling="auto" frameborder="0">
@@ -293,6 +299,8 @@
         },
         },
         infoDialogTitle:"编辑",
         infoDialogTitle:"编辑",
         infoDialogType:true,
         infoDialogType:true,
+        //img 与 document 展示状态
+        imgDocumentType:0,
         infoDialogCheckIndex:'info',
         infoDialogCheckIndex:'info',
         infoDialogData:{
         infoDialogData:{
           data1:"2023年3月份校级督导检查",
           data1:"2023年3月份校级督导检查",
@@ -382,10 +390,10 @@
 
 
     },
     },
     methods:{
     methods:{
-
       //标签切换
       //标签切换
       checkTitleButton(index){
       checkTitleButton(index){
         if(this.infoDialogCheckIndex != index){
         if(this.infoDialogCheckIndex != index){
+          this.$set(this,'imgDocumentType',0);
           this.$set(this,'infoDialogCheckIndex',index);
           this.$set(this,'infoDialogCheckIndex',index);
         }
         }
       },
       },
@@ -397,17 +405,16 @@
       lookDocument(url){
       lookDocument(url){
         url = 'http://192.168.1.43/labSystem/statics/bigFile/2023042514/96ca9fcb-bb8e-4e90-a74a-5e94abea3816.pdf'
         url = 'http://192.168.1.43/labSystem/statics/bigFile/2023042514/96ca9fcb-bb8e-4e90-a74a-5e94abea3816.pdf'
         this.iframeSrc = this.urlJudge(url)
         this.iframeSrc = this.urlJudge(url)
-        this.$set(this,'infoDialogCheckIndex','document');
+        this.$set(this,'imgDocumentType',2);
       },
       },
       //点击查看图片
       //点击查看图片
       lookImg(list,index){
       lookImg(list,index){
         this.$set(this,'imgList',list)
         this.$set(this,'imgList',list)
         this.$set(this,'imgIndex',index)
         this.$set(this,'imgIndex',index)
-        this.$set(this,'saveIndex',this.infoDialogCheckIndex);
-        this.$set(this,'infoDialogCheckIndex','img');
+        this.$set(this,'imgDocumentType',1);
       },
       },
       outLook(){
       outLook(){
-        this.$set(this,'infoDialogCheckIndex',this.saveIndex);
+        this.$set(this,'imgDocumentType',0);
       },
       },
       //图片左右按键
       //图片左右按键
       infoLeftButton(){
       infoLeftButton(){
@@ -467,15 +474,16 @@
       delImg(imgIndex){
       delImg(imgIndex){
         this.addForm.upImgList.splice(imgIndex,1);
         this.addForm.upImgList.splice(imgIndex,1);
       },
       },
+      //退出
       outDialog(){
       outDialog(){
-        this.$set(this,'infoDialogType',false);
+        this.$parent.addDialogOpen(false);
       },
       },
     },
     },
   }
   }
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
-  .selfInspectionManagement-info-dialog-box{
+  .safetyHazard-info-dialog-box{
     ::v-deep .el-dialog__body{
     ::v-deep .el-dialog__body{
       padding:0 0 30px 0;
       padding:0 0 30px 0;
     }
     }
@@ -715,6 +723,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               text-align: center;
               text-align: center;
@@ -735,6 +745,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               font-size:14px;
               font-size:14px;
@@ -755,6 +767,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             img{
             img{
               cursor: pointer;
               cursor: pointer;
@@ -776,9 +790,11 @@
                 width:80px;
                 width:80px;
                 font-size:16px;
                 font-size:16px;
                 color:#333;
                 color:#333;
+                text-align: right;
+                margin-right:15px;
               }
               }
               p:nth-child(2){
               p:nth-child(2){
-                width:430px;
+                width:412px;
                 height:40px;
                 height:40px;
                 font-size:14px;
                 font-size:14px;
                 line-height:40px;
                 line-height:40px;
@@ -799,6 +815,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             img{
             img{
               width:60px;
               width:60px;
@@ -814,6 +832,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               font-size:14px;
               font-size:14px;
@@ -836,9 +856,11 @@
                 width:80px;
                 width:80px;
                 font-size:16px;
                 font-size:16px;
                 color:#333;
                 color:#333;
+                text-align: right;
+                margin-right:15px;
               }
               }
               p:nth-child(2){
               p:nth-child(2){
-                width:430px;
+                width:412px;
                 height:40px;
                 height:40px;
                 font-size:14px;
                 font-size:14px;
                 line-height:40px;
                 line-height:40px;
@@ -849,6 +871,31 @@
             }
             }
 
 
           }
           }
+          .button-box{
+            margin-top:20px;
+            display: flex;
+            p:nth-child(1){
+              height:40px;
+              line-height:40px;
+              width:80px;
+              font-size:16px;
+              color:#333;
+              text-align: right;
+              margin-right:15px;
+            }
+            p:nth-child(2){
+              width:70px;
+              height:30px;
+              line-height:30px;
+              margin-top:5px;
+            }
+            p:nth-child(3){
+              width:70px;
+              height:30px;
+              line-height:30px;
+              margin-top:5px;
+            }
+          }
         }
         }
       }
       }
       .info-dialog-content-add{
       .info-dialog-content-add{

File diff suppressed because it is too large
+ 9 - 2
src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/infoPage.vue


+ 232 - 0
src/views/safetyCheck/safetyHazard/batchAudit.vue

@@ -0,0 +1,232 @@
+<!--批量审核-->
+<template>
+  <div class="batchAudit">
+    <div class="batchAudit-page">
+      <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="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>
+      </div>
+      <div class="content-box">
+        <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange"
+                   @selection-change="tableChange" :row-key="getRowKeys">
+          <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
+          <el-table-column label="序号" align="center"  type="index" width="60" />
+          <el-table-column label="计划标题" align="center" prop="deptName" show-overflow-tooltip/>
+          <el-table-column label="隐患描述" align="center" prop="deptName" show-overflow-tooltip width="220"/>
+          <el-table-column label="实验室" align="center" prop="deptName" show-overflow-tooltip width="220"/>
+          <el-table-column label="安全负责人" align="center" prop="deptName" show-overflow-tooltip width="100"/>
+          <el-table-column label="检查时间" sortable align="center" prop="deptName" show-overflow-tooltip width="160"/>
+          <el-table-column label="整改人" align="center" prop="deptName" show-overflow-tooltip width="90"/>
+          <el-table-column label="整改期限" sortable align="center" prop="deptName" show-overflow-tooltip width="110"/>
+          <el-table-column label="整改状态" align="center" prop="deptName" show-overflow-tooltip width="90"/>
+          <el-table-column label="整改时间" sortable align="center" prop="deptName" show-overflow-tooltip width="160"/>
+          <el-table-column label="操作" align="center" prop="deptName" width="80">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-p" @click="addDialogOpen(true,scope.row)">详情</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 class="dialog-footer-box">
+        <p class="dialog-footer-button-null"></p>
+        <p class="dialog-footer-button-info" @click="outButton">返回</p>
+        <p class="dialog-footer-button-primary">确认</p>
+        <p class="dialog-footer-button-null"></p>
+      </div>
+    </div>
+    <infoDialog v-if="infoDialogType"></infoDialog>
+  </div>
+</template>
+
+<script>
+  import infoDialog from './infoDialog.vue'
+  export default {
+    name: 'batchAudit',
+    components: {
+      infoDialog
+    },
+    data(){
+      return{
+        infoDialogType:false,
+        queryParams:{
+          pageNum:1,
+          pageSize:20,
+          buttonType:1,
+          safetyType:"",
+          timeType:0,
+          searchValue:"",
+          data1:""
+        },
+        dateRange:[],
+        tableList:[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},],
+        total:0,
+        tableNum:0,
+        tableIds:[],
+      }
+    },
+    created(){
+
+    },
+    mounted(){
+
+    },
+    methods:{
+      //开关详情页面
+      addDialogOpen(type,data){
+        if(this.infoDialogType != type){
+          this.$set(this,'infoDialogType',type);
+        }
+      },
+      //返回
+      outButton(){
+        this.$parent.goPage(1);
+      },
+      //时间排序方法
+      sortChange(val){
+        //ascending 上    descending 下    null  无
+        console.log('val',val.order)
+        this.$set(this.queryParams,'timeType',val.order=='ascending'?1:(val.order=='descending'?2:''));
+      },
+      //获取数据列表
+      getList(){
+        // this.queryParamsData = JSON.parse(JSON.stringify(this.queryParams));
+        // this.queryParamsData.type = 'RFID_RECOGNIZER';
+        // listHardware(this.queryParamsData).then(response => {
+        //   this.total = response.total;
+        //   this.tableList = response.rows;
+        // });
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.$set(this.queryParams,'pageNum',1);
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.$set(this,'dateRange',[]);
+        this.$set(this,'queryParams',{
+          pageNum:1,
+          pageSize:20,
+          buttonType:1,
+          timeType:0,
+          searchValue:"",
+          data1:""
+        });
+        this.handleQuery();
+      },
+      /*===记录勾选数据===
+        需要再el-table 添加  :row-key="getRowKeys"
+        需要在selection 添加 :reserve-selection="true"
+      */
+      getRowKeys(row) {
+        return row.userId
+      },
+      tableChange(selection){
+        this.tableNum = selection.length;
+        this.tableIds = selection.map(item => item.userId);
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .batchAudit{
+    flex: 1;
+    display: flex !important;
+    flex-direction: column;
+    overflow: hidden;
+    .batchAudit-page{
+      flex: 1;
+      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:80px;
+              line-height: 40px;
+              text-align: center;
+              color:#999;
+              font-size:14px;
+              border:1px solid #999;
+              border-radius:4px;
+              margin-left:10px;
+              font-weight:500;
+              cursor: pointer;
+              .icon-p{
+                width:15px;
+                height:15px;
+                line-height:15px;
+                text-align: center;
+                position: absolute;
+                right:0;
+                bottom:0;
+                color:#fff;
+                background: #0183fa;
+                border-top-left-radius:4px;
+              }
+            }
+            .checkDiv{
+              color:#0183FA;
+              border:1px solid #0183FA;
+            }
+          }
+        }
+      }
+      .content-box{
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding:0 20px 20px;
+        overflow: hidden;
+      }
+      .dialog-footer-box{
+        padding:20px 0;
+        height:70px;
+        border-top:1px solid #D8D8D8;
+        display: flex;
+      }
+    }
+  }
+</style>

+ 192 - 0
src/views/safetyCheck/safetyHazard/cannotListPage.vue

@@ -0,0 +1,192 @@
+<!--暂无法整改隐患-->
+<template>
+  <div class="cannotListPage">
+    <div class="title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
+        <div class="form-button-max-big-box">
+          <div class="form-button-big-box" style="margin-left:10px;">
+            <div :class="queryParams.buttonType==1?'checkDiv':''" @click="topLeftClickType(1)">
+              <p class="text-p">校院巡查</p>
+            </div>
+            <div :class="queryParams.buttonType==2?'checkDiv':''" @click="topLeftClickType(2)">
+              <p class="text-p">实验室自查</p>
+            </div>
+          </div>
+        </div>
+        <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="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>
+    </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="deptName" show-overflow-tooltip/>
+        <el-table-column label="检查类型" align="center" prop="deptName" show-overflow-tooltip width="180"/>
+        <el-table-column label="实验室" align="center" prop="deptName" show-overflow-tooltip width="240"/>
+        <el-table-column label="检查时间" sortable align="center" prop="deptName" show-overflow-tooltip width="160"/>
+        <el-table-column label="处理人" align="center" prop="deptName" show-overflow-tooltip width="90"/>
+        <el-table-column label="原因描述" align="center" prop="deptName" show-overflow-tooltip width="435"/>
+        <el-table-column label="操作" align="center" prop="deptName" width="80">
+          <template slot-scope="scope">
+            <div class="table-button-box">
+              <p class="table-button-p" @click="addDialogOpen(true,scope.row)">详情</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"></infoDialog>
+  </div>
+</template>
+
+<script>
+  import infoDialog from './infoDialog.vue'
+  export default {
+    name: 'cannotListPage',
+    components: {
+      infoDialog
+    },
+    data(){
+      return{
+        infoDialogType:false,
+        queryParams:{
+          pageNum:1,
+          pageSize:20,
+          buttonType:1,
+          safetyType:"",
+          timeType:0,
+          searchValue:"",
+          data1:""
+        },
+        dateRange:[],
+        tableList:[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},],
+        total:0,
+      }
+    },
+    created(){},
+    mounted(){},
+    methods:{
+      //开关详情页面
+      addDialogOpen(type,data){
+        if(this.infoDialogType != type){
+          this.$set(this,'infoDialogType',type);
+        }
+      },
+      //范围选择
+      topLeftClickType(type){
+        if(this.queryParams.buttonType != type){
+          this.$set(this.queryParams,'buttonType',type);
+          this.getList();
+        }
+      },
+      //时间排序方法
+      sortChange(val){
+        //ascending 上    descending 下    null  无
+        console.log('val',val.order)
+        this.$set(this.queryParams,'timeType',val.order=='ascending'?1:(val.order=='descending'?2:''));
+      },
+      //获取数据列表
+      getList(){
+        // this.queryParamsData = JSON.parse(JSON.stringify(this.queryParams));
+        // this.queryParamsData.type = 'RFID_RECOGNIZER';
+        // listHardware(this.queryParamsData).then(response => {
+        //   this.total = response.total;
+        //   this.tableList = response.rows;
+        // });
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.$set(this.queryParams,'pageNum',1);
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.$set(this,'dateRange',[]);
+        this.$set(this,'queryParams',{
+          pageNum:1,
+          pageSize:20,
+          buttonType:1,
+          timeType:0,
+          searchValue:"",
+          data1:""
+        });
+        this.handleQuery();
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .cannotListPage{
+    flex: 1;
+    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{
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      padding:0 20px 20px;
+      overflow: hidden;
+    }
+  }
+</style>

+ 256 - 0
src/views/safetyCheck/safetyHazard/departmentListPage.vue

@@ -0,0 +1,256 @@
+<!--实验室自查隐患-->
+<template>
+  <div class="departmentListPage">
+    <div class="departmentListPage-page" v-if="minPageType == 1">
+      <div class="title-box">
+        <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
+          <div class="form-button-max-big-box">
+            <div class="form-button-big-box" style="margin-left:10px;">
+              <div :class="queryParams.buttonType==1?'checkDiv':''" @click="topLeftClickType(1)">
+                <p class="text-p">全部</p>
+                <p class="el-icon-check icon-p" v-if="queryParams.buttonType==1"></p>
+              </div>
+              <div :class="queryParams.buttonType==2?'checkDiv':''" @click="topLeftClickType(2)">
+                <p class="text-p">待检查</p>
+                <p class="el-icon-check icon-p" v-if="queryParams.buttonType==2"></p>
+              </div>
+              <div :class="queryParams.buttonType==3?'checkDiv':''" @click="topLeftClickType(3)">
+                <p class="text-p">检查中</p>
+                <p class="el-icon-check icon-p" v-if="queryParams.buttonType==3"></p>
+              </div>
+              <div :class="queryParams.buttonType==4?'checkDiv':''" @click="topLeftClickType(4)">
+                <p class="text-p">已检查</p>
+                <p class="el-icon-check icon-p" v-if="queryParams.buttonType==4"></p>
+              </div>
+            </div>
+          </div>
+          <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="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 label="审核状态" prop="safetyType">
+            <el-select v-model="queryParams.safetyType" placeholder="请选择" style="width: 160px">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </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:90px;"
+                 @click="goPage(2)"
+              >批量审核</p>
+            </el-col>
+          </el-form-item>
+        </el-form>
+      </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="deptName" show-overflow-tooltip/>
+          <el-table-column label="隐患描述" align="center" prop="deptName" show-overflow-tooltip width="250"/>
+          <el-table-column label="实验室" align="center" prop="deptName" show-overflow-tooltip width="200"/>
+          <el-table-column label="检查时间" sortable align="center" prop="deptName" show-overflow-tooltip width="160"/>
+          <el-table-column label="整改人" align="center" prop="deptName" show-overflow-tooltip width="90"/>
+          <el-table-column label="整改期限" sortable align="center" prop="deptName" show-overflow-tooltip width="130"/>
+          <el-table-column label="整改状态" align="center" prop="deptName" show-overflow-tooltip width="110"/>
+          <el-table-column label="整改时间" sortable align="center" prop="deptName" show-overflow-tooltip width="160"/>
+          <el-table-column label="审核状态" align="center" prop="deptName" show-overflow-tooltip width="80"/>
+          <el-table-column label="操作" align="center" prop="deptName" width="80">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-p" @click="addDialogOpen(true,scope.row)">详情</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>
+    <batchAudit v-if="minPageType == 2"></batchAudit>
+    <infoDialog v-if="infoDialogType"></infoDialog>
+  </div>
+</template>
+
+<script>
+  import batchAudit from './batchAudit.vue'
+  import infoDialog from './infoDialog.vue'
+  export default {
+    name: 'departmentListPage',
+    components: {
+      batchAudit,
+      infoDialog
+    },
+    data(){
+      return{
+        minPageType:1,
+        infoDialogType:false,
+        options:[
+          {value:"待审核",label:"0"},
+          {value:"已通过",label:"1"},
+          {value:"已驳回",label:"2"},
+        ],
+        queryParams:{
+          pageNum:1,
+          pageSize:20,
+          buttonType:1,
+          safetyType:"",
+          timeType:0,
+          searchValue:"",
+          data1:""
+        },
+        dateRange:[],
+        tableList:[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},],
+        total:0,
+      }
+    },
+    created(){},
+    mounted(){},
+    methods:{
+      //开关详情页面
+      addDialogOpen(type,data){
+        if(this.infoDialogType != type){
+          this.$set(this,'infoDialogType',type);
+        }
+      },
+      goPage(type){
+        if(this.minPageType != type){
+          this.$set(this,'minPageType',type);
+        }
+      },
+      //范围选择
+      topLeftClickType(type){
+        if(this.queryParams.buttonType != type){
+          this.$set(this.queryParams,'buttonType',type);
+          this.getList();
+        }
+      },
+      //时间排序方法
+      sortChange(val){
+        //ascending 上    descending 下    null  无
+        console.log('val',val.order)
+        this.$set(this.queryParams,'timeType',val.order=='ascending'?1:(val.order=='descending'?2:''));
+      },
+      //获取数据列表
+      getList(){
+        // this.queryParamsData = JSON.parse(JSON.stringify(this.queryParams));
+        // this.queryParamsData.type = 'RFID_RECOGNIZER';
+        // listHardware(this.queryParamsData).then(response => {
+        //   this.total = response.total;
+        //   this.tableList = response.rows;
+        // });
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.$set(this.queryParams,'pageNum',1);
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.$set(this,'dateRange',[]);
+        this.$set(this,'queryParams',{
+          pageNum:1,
+          pageSize:20,
+          buttonType:1,
+          timeType:0,
+          searchValue:"",
+          data1:""
+        });
+        this.handleQuery();
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .departmentListPage{
+    flex: 1;
+    display: flex !important;
+    flex-direction: column;
+    overflow: hidden;
+    .departmentListPage-page{
+      flex: 1;
+      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:80px;
+              line-height: 40px;
+              text-align: center;
+              color:#999;
+              font-size:14px;
+              border:1px solid #999;
+              border-radius:4px;
+              margin-left:10px;
+              font-weight:500;
+              cursor: pointer;
+              .icon-p{
+                width:15px;
+                height:15px;
+                line-height:15px;
+                text-align: center;
+                position: absolute;
+                right:0;
+                bottom:0;
+                color:#fff;
+                background: #0183fa;
+                border-top-left-radius:4px;
+              }
+            }
+            .checkDiv{
+              color:#0183FA;
+              border:1px solid #0183FA;
+            }
+          }
+        }
+      }
+      .content-box{
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding:0 20px 20px;
+        overflow: hidden;
+      }
+    }
+  }
+</style>

+ 105 - 0
src/views/safetyCheck/safetyHazard/index.vue

@@ -0,0 +1,105 @@
+<!--安全隐患-->
+<template>
+  <div class="app-container safetyHazard">
+    <div class="safetyHazard-page">
+      <div class="title-button-box">
+        <div :class="pageType == 1?'check-div':''" @click="goPage(1)">
+          <p>校院巡查隐患</p>
+          <p></p>
+        </div>
+        <div :class="pageType == 2?'check-div':''" @click="goPage(2)">
+          <p>实验室自查隐患</p>
+          <p></p>
+        </div>
+        <div :class="pageType == 3?'check-div':''" @click="goPage(3)">
+          <p>暂无法整改隐患</p>
+          <p></p>
+        </div>
+      </div>
+      <schoolListPage v-if="pageType == 1"></schoolListPage>
+      <departmentListPage v-if="pageType == 2"></departmentListPage>
+      <cannotListPage v-if="pageType == 3"></cannotListPage>
+    </div>
+  </div>
+</template>
+
+<script>
+  import schoolListPage from './schoolListPage.vue'
+  import departmentListPage from './departmentListPage.vue'
+  import cannotListPage from './cannotListPage.vue'
+  export default {
+    name: 'index',
+    components: {
+      schoolListPage,
+      departmentListPage,
+      cannotListPage
+    },
+    data(){
+      return{
+        pageType:1,
+
+      }
+    },
+    created(){
+
+    },
+    mounted(){
+
+    },
+    methods:{
+      goPage(type){
+        if(this.pageType != type){
+          this.$set(this,'pageType',type);
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .safetyHazard{
+    flex: 1;
+    display: flex !important;
+    flex-direction: column;
+    overflow: hidden;
+    .safetyHazard-page{
+      flex: 1;
+      display: flex !important;
+      flex-direction: column;
+      overflow: hidden;
+      .title-button-box{
+        display: flex;
+        height:80px;
+        border-bottom:1px solid #E0E0E0;
+        div{
+          width:120px;
+          margin-left:47px;
+          overflow: hidden;
+          cursor: pointer;
+          p:nth-child(1){
+            font-size:16px;
+            color:#333;
+            text-align: center;
+            line-height:40px;
+            margin-top:20px;
+            font-weight: 500;
+          }
+          p:nth-child(2){
+            width:60px;
+            height:4px;
+            border-radius:4px;
+            margin:0 30px;
+          }
+        }
+        .check-div{
+          p:nth-child(1){
+            color:#0045AF;
+          }
+          p:nth-child(2){
+            background-color: #0045AF;
+          }
+        }
+      }
+    }
+  }
+</style>

File diff suppressed because it is too large
+ 1064 - 0
src/views/safetyCheck/safetyHazard/infoDialog.vue


+ 257 - 0
src/views/safetyCheck/safetyHazard/schoolListPage.vue

@@ -0,0 +1,257 @@
+<!--校院巡查隐患-->
+<template>
+  <div class="schoolListPage">
+    <div class="schoolListPage-page" v-if="minPageType == 1">
+      <div class="title-box">
+        <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
+          <div class="form-button-max-big-box">
+            <div class="form-button-big-box" style="margin-left:10px;">
+              <div :class="queryParams.buttonType==1?'checkDiv':''" @click="topLeftClickType(1)">
+                <p class="text-p">全部</p>
+                <p class="el-icon-check icon-p" v-if="queryParams.buttonType==1"></p>
+              </div>
+              <div :class="queryParams.buttonType==2?'checkDiv':''" @click="topLeftClickType(2)">
+                <p class="text-p">待检查</p>
+                <p class="el-icon-check icon-p" v-if="queryParams.buttonType==2"></p>
+              </div>
+              <div :class="queryParams.buttonType==3?'checkDiv':''" @click="topLeftClickType(3)">
+                <p class="text-p">检查中</p>
+                <p class="el-icon-check icon-p" v-if="queryParams.buttonType==3"></p>
+              </div>
+              <div :class="queryParams.buttonType==4?'checkDiv':''" @click="topLeftClickType(4)">
+                <p class="text-p">已检查</p>
+                <p class="el-icon-check icon-p" v-if="queryParams.buttonType==4"></p>
+              </div>
+            </div>
+          </div>
+          <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="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 label="审核状态" prop="safetyType">
+            <el-select v-model="queryParams.safetyType" placeholder="请选择" style="width: 160px">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </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:90px;"
+                 @click="goPage(2)"
+              >批量审核</p>
+            </el-col>
+          </el-form-item>
+        </el-form>
+      </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="deptName" show-overflow-tooltip/>
+          <el-table-column label="隐患描述" align="center" prop="deptName" show-overflow-tooltip width="250"/>
+          <el-table-column label="实验室" align="center" prop="deptName" show-overflow-tooltip width="200"/>
+          <el-table-column label="检查时间" sortable align="center" prop="deptName" show-overflow-tooltip width="160"/>
+          <el-table-column label="整改人" align="center" prop="deptName" show-overflow-tooltip width="90"/>
+          <el-table-column label="整改期限" sortable align="center" prop="deptName" show-overflow-tooltip width="130"/>
+          <el-table-column label="整改状态" align="center" prop="deptName" show-overflow-tooltip width="110"/>
+          <el-table-column label="整改时间" sortable align="center" prop="deptName" show-overflow-tooltip width="160"/>
+          <el-table-column label="审核状态" align="center" prop="deptName" show-overflow-tooltip width="80"/>
+          <el-table-column label="操作" align="center" prop="deptName" width="80">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-p" @click="addDialogOpen(true,scope.row)">详情</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>
+    <batchAudit v-if="minPageType == 2"></batchAudit>
+    <infoDialog v-if="infoDialogType"></infoDialog>
+  </div>
+</template>
+
+<script>
+  import batchAudit from './batchAudit.vue'
+  import infoDialog from './infoDialog.vue'
+  export default {
+    name: 'schoolListPage',
+    components: {
+      batchAudit,
+      infoDialog
+    },
+    data(){
+      return{
+        minPageType:1,
+        infoDialogType:false,
+        options:[
+          {value:"待审核",label:"0"},
+          {value:"已通过",label:"1"},
+          {value:"已驳回",label:"2"},
+        ],
+        queryParams:{
+          pageNum:1,
+          pageSize:20,
+          buttonType:1,
+          safetyType:"",
+          timeType:0,
+          searchValue:"",
+          data1:""
+        },
+        dateRange:[],
+        tableList:[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},],
+        total:0,
+      }
+    },
+    created(){},
+    mounted(){},
+    methods:{
+      //开关详情页面
+      addDialogOpen(type,data){
+        if(this.infoDialogType != type){
+          this.$set(this,'infoDialogType',type);
+        }
+      },
+      //页面切换
+      goPage(type){
+        if(this.minPageType != type){
+          this.$set(this,'minPageType',type);
+        }
+      },
+      //范围选择
+      topLeftClickType(type){
+        if(this.queryParams.buttonType != type){
+          this.$set(this.queryParams,'buttonType',type);
+          this.getList();
+        }
+      },
+      //时间排序方法
+      sortChange(val){
+        //ascending 上    descending 下    null  无
+        console.log('val',val.order)
+        this.$set(this.queryParams,'timeType',val.order=='ascending'?1:(val.order=='descending'?2:''));
+      },
+      //获取数据列表
+      getList(){
+        // this.queryParamsData = JSON.parse(JSON.stringify(this.queryParams));
+        // this.queryParamsData.type = 'RFID_RECOGNIZER';
+        // listHardware(this.queryParamsData).then(response => {
+        //   this.total = response.total;
+        //   this.tableList = response.rows;
+        // });
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.$set(this.queryParams,'pageNum',1);
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.$set(this,'dateRange',[]);
+        this.$set(this,'queryParams',{
+          pageNum:1,
+          pageSize:20,
+          buttonType:1,
+          timeType:0,
+          searchValue:"",
+          data1:""
+        });
+        this.handleQuery();
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .schoolListPage{
+    flex: 1;
+    display: flex !important;
+    flex-direction: column;
+    overflow: hidden;
+    .schoolListPage-page{
+      flex: 1;
+      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:80px;
+              line-height: 40px;
+              text-align: center;
+              color:#999;
+              font-size:14px;
+              border:1px solid #999;
+              border-radius:4px;
+              margin-left:10px;
+              font-weight:500;
+              cursor: pointer;
+              .icon-p{
+                width:15px;
+                height:15px;
+                line-height:15px;
+                text-align: center;
+                position: absolute;
+                right:0;
+                bottom:0;
+                color:#fff;
+                background: #0183fa;
+                border-top-left-radius:4px;
+              }
+            }
+            .checkDiv{
+              color:#0183FA;
+              border:1px solid #0183FA;
+            }
+          }
+        }
+      }
+      .content-box{
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding:0 20px 20px;
+        overflow: hidden;
+      }
+    }
+  }
+</style>

+ 63 - 16
src/views/safetyCheck/schoolInspection/inspectionManagement/infoDialog.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <el-dialog class="selfInspectionManagement-info-dialog-box"
+  <el-dialog class="safetyHazard-info-dialog-box" @close="outDialog"
              :title="infoDialogTitle" :visible.sync="infoDialogType" v-if="infoDialogType"
              :title="infoDialogTitle" :visible.sync="infoDialogType" v-if="infoDialogType"
              width="1184px" append-to-body>
              width="1184px" append-to-body>
     <div class="info-dialog-title-box">
     <div class="info-dialog-title-box">
@@ -18,7 +18,7 @@
       </div>
       </div>
     </div>
     </div>
     <div class="info-dialog-content-box scrollbar-box">
     <div class="info-dialog-content-box scrollbar-box">
-      <div class="info-dialog-content-info" v-if="infoDialogCheckIndex == 'info'">
+      <div class="info-dialog-content-info" v-if="infoDialogCheckIndex == 'info' && imgDocumentType == 0">
         <div class="text-box-box">
         <div class="text-box-box">
           <p>计划标题</p>
           <p>计划标题</p>
           <p>{{infoDialogData.data1}}</p>
           <p>{{infoDialogData.data1}}</p>
@@ -64,7 +64,7 @@
           </div>
           </div>
         </div>
         </div>
         <div class="button-box">
         <div class="button-box">
-          <p>整改通知书</p>
+          <p>整改通知书?整改告知书</p>
           <p class="inquire-button-one" @click="lookDocument">查看</p>
           <p class="inquire-button-one" @click="lookDocument">查看</p>
           <p class="add-button-one-90">下载</p>
           <p class="add-button-one-90">下载</p>
         </div>
         </div>
@@ -142,7 +142,8 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <div class="info-dialog-content-type" v-for="(item,index) in infoDialogList" :key="index" v-if="infoDialogCheckIndex == index">
+      <div class="info-dialog-content-type" v-if="infoDialogCheckIndex == index && imgDocumentType == 0"
+           v-for="(item,index) in infoDialogList" :key="index">
         <!--已整改-->
         <!--已整改-->
         <div class="has-rectification" v-if="item.rectificationType == 1">
         <div class="has-rectification" v-if="item.rectificationType == 1">
           <div class="button-box">
           <div class="button-box">
@@ -192,9 +193,14 @@
               <p>{{item.dataH}}</p>
               <p>{{item.dataH}}</p>
             </div>
             </div>
           </div>
           </div>
+          <div class="button-box">
+            <p>整改报告书</p>
+            <p class="inquire-button-one" @click="lookDocument">查看</p>
+            <p class="add-button-one-90">下载</p>
+          </div>
         </div>
         </div>
       </div>
       </div>
-      <div class="info-dialog-content-add" v-if="infoDialogCheckIndex == 'add'">
+      <div class="info-dialog-content-add" v-if="infoDialogCheckIndex == 'add' && imgDocumentType == 0">
         <el-form  :model="addForm" :rules="rules" label-width="90px">
         <el-form  :model="addForm" :rules="rules" label-width="90px">
           <!--待整改-->
           <!--待整改-->
           <div class="stay-rectification" v-if="addFormType == 1">
           <div class="stay-rectification" v-if="addFormType == 1">
@@ -254,14 +260,14 @@
           </div>
           </div>
         </el-form>
         </el-form>
       </div>
       </div>
-      <div class="info-dialog-content-img" v-if="infoDialogCheckIndex == 'img'">
+      <div class="info-dialog-content-img" v-if="imgDocumentType == 1">
         <img :src="imgList[imgIndex].url">
         <img :src="imgList[imgIndex].url">
         <p class="el-icon-arrow-left left-button-p" @click="infoLeftButton"></p>
         <p class="el-icon-arrow-left left-button-p" @click="infoLeftButton"></p>
         <p class="el-icon-arrow-right right-button-p" @click="infoRightButton"></p>
         <p class="el-icon-arrow-right right-button-p" @click="infoRightButton"></p>
         <p class="bottom-num-text">{{imgIndex+1}} / {{imgList.length}}</p>
         <p class="bottom-num-text">{{imgIndex+1}} / {{imgList.length}}</p>
         <p class="out-button" @click="outLook">返回</p>
         <p class="out-button" @click="outLook">返回</p>
       </div>
       </div>
-      <div class="info-dialog-content-document" v-if="infoDialogCheckIndex == 'document'">
+      <div class="info-dialog-content-document" v-if="imgDocumentType == 2">
         <iframe
         <iframe
           class="iframe"
           class="iframe"
           :src="iframeSrc" scrolling="auto" frameborder="0">
           :src="iframeSrc" scrolling="auto" frameborder="0">
@@ -293,6 +299,8 @@
         },
         },
         infoDialogTitle:"编辑",
         infoDialogTitle:"编辑",
         infoDialogType:true,
         infoDialogType:true,
+        //img 与 document 展示状态
+        imgDocumentType:0,
         infoDialogCheckIndex:'info',
         infoDialogCheckIndex:'info',
         infoDialogData:{
         infoDialogData:{
           data1:"2023年3月份校级督导检查",
           data1:"2023年3月份校级督导检查",
@@ -382,10 +390,10 @@
 
 
     },
     },
     methods:{
     methods:{
-
       //标签切换
       //标签切换
       checkTitleButton(index){
       checkTitleButton(index){
         if(this.infoDialogCheckIndex != index){
         if(this.infoDialogCheckIndex != index){
+          this.$set(this,'imgDocumentType',0);
           this.$set(this,'infoDialogCheckIndex',index);
           this.$set(this,'infoDialogCheckIndex',index);
         }
         }
       },
       },
@@ -397,17 +405,16 @@
       lookDocument(url){
       lookDocument(url){
         url = 'http://192.168.1.43/labSystem/statics/bigFile/2023042514/96ca9fcb-bb8e-4e90-a74a-5e94abea3816.pdf'
         url = 'http://192.168.1.43/labSystem/statics/bigFile/2023042514/96ca9fcb-bb8e-4e90-a74a-5e94abea3816.pdf'
         this.iframeSrc = this.urlJudge(url)
         this.iframeSrc = this.urlJudge(url)
-        this.$set(this,'infoDialogCheckIndex','document');
+        this.$set(this,'imgDocumentType',2);
       },
       },
       //点击查看图片
       //点击查看图片
       lookImg(list,index){
       lookImg(list,index){
         this.$set(this,'imgList',list)
         this.$set(this,'imgList',list)
         this.$set(this,'imgIndex',index)
         this.$set(this,'imgIndex',index)
-        this.$set(this,'saveIndex',this.infoDialogCheckIndex);
-        this.$set(this,'infoDialogCheckIndex','img');
+        this.$set(this,'imgDocumentType',1);
       },
       },
       outLook(){
       outLook(){
-        this.$set(this,'infoDialogCheckIndex',this.saveIndex);
+        this.$set(this,'imgDocumentType',0);
       },
       },
       //图片左右按键
       //图片左右按键
       infoLeftButton(){
       infoLeftButton(){
@@ -467,15 +474,16 @@
       delImg(imgIndex){
       delImg(imgIndex){
         this.addForm.upImgList.splice(imgIndex,1);
         this.addForm.upImgList.splice(imgIndex,1);
       },
       },
+      //退出
       outDialog(){
       outDialog(){
-        this.$set(this,'infoDialogType',false);
+        this.$parent.addDialogOpen(false);
       },
       },
     },
     },
   }
   }
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
-  .selfInspectionManagement-info-dialog-box{
+  .safetyHazard-info-dialog-box{
     ::v-deep .el-dialog__body{
     ::v-deep .el-dialog__body{
       padding:0 0 30px 0;
       padding:0 0 30px 0;
     }
     }
@@ -715,6 +723,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               text-align: center;
               text-align: center;
@@ -735,6 +745,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               font-size:14px;
               font-size:14px;
@@ -755,6 +767,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             img{
             img{
               cursor: pointer;
               cursor: pointer;
@@ -776,9 +790,11 @@
                 width:80px;
                 width:80px;
                 font-size:16px;
                 font-size:16px;
                 color:#333;
                 color:#333;
+                text-align: right;
+                margin-right:15px;
               }
               }
               p:nth-child(2){
               p:nth-child(2){
-                width:430px;
+                width:412px;
                 height:40px;
                 height:40px;
                 font-size:14px;
                 font-size:14px;
                 line-height:40px;
                 line-height:40px;
@@ -799,6 +815,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             img{
             img{
               width:60px;
               width:60px;
@@ -814,6 +832,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               font-size:14px;
               font-size:14px;
@@ -836,9 +856,11 @@
                 width:80px;
                 width:80px;
                 font-size:16px;
                 font-size:16px;
                 color:#333;
                 color:#333;
+                text-align: right;
+                margin-right:15px;
               }
               }
               p:nth-child(2){
               p:nth-child(2){
-                width:430px;
+                width:412px;
                 height:40px;
                 height:40px;
                 font-size:14px;
                 font-size:14px;
                 line-height:40px;
                 line-height:40px;
@@ -849,6 +871,31 @@
             }
             }
 
 
           }
           }
+          .button-box{
+            margin-top:20px;
+            display: flex;
+            p:nth-child(1){
+              height:40px;
+              line-height:40px;
+              width:80px;
+              font-size:16px;
+              color:#333;
+              text-align: right;
+              margin-right:15px;
+            }
+            p:nth-child(2){
+              width:70px;
+              height:30px;
+              line-height:30px;
+              margin-top:5px;
+            }
+            p:nth-child(3){
+              width:70px;
+              height:30px;
+              line-height:30px;
+              margin-top:5px;
+            }
+          }
         }
         }
       }
       }
       .info-dialog-content-add{
       .info-dialog-content-add{

File diff suppressed because it is too large
+ 9 - 2
src/views/safetyCheck/schoolInspection/inspectionManagement/infoPage.vue


+ 63 - 16
src/views/safetyCheck/schoolInspection/inspectionPlan/infoDialog.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <el-dialog class="selfInspectionManagement-info-dialog-box"
+  <el-dialog class="safetyHazard-info-dialog-box" @close="outDialog"
              :title="infoDialogTitle" :visible.sync="infoDialogType" v-if="infoDialogType"
              :title="infoDialogTitle" :visible.sync="infoDialogType" v-if="infoDialogType"
              width="1184px" append-to-body>
              width="1184px" append-to-body>
     <div class="info-dialog-title-box">
     <div class="info-dialog-title-box">
@@ -18,7 +18,7 @@
       </div>
       </div>
     </div>
     </div>
     <div class="info-dialog-content-box scrollbar-box">
     <div class="info-dialog-content-box scrollbar-box">
-      <div class="info-dialog-content-info" v-if="infoDialogCheckIndex == 'info'">
+      <div class="info-dialog-content-info" v-if="infoDialogCheckIndex == 'info' && imgDocumentType == 0">
         <div class="text-box-box">
         <div class="text-box-box">
           <p>计划标题</p>
           <p>计划标题</p>
           <p>{{infoDialogData.data1}}</p>
           <p>{{infoDialogData.data1}}</p>
@@ -64,7 +64,7 @@
           </div>
           </div>
         </div>
         </div>
         <div class="button-box">
         <div class="button-box">
-          <p>整改通知书</p>
+          <p>整改通知书?整改告知书</p>
           <p class="inquire-button-one" @click="lookDocument">查看</p>
           <p class="inquire-button-one" @click="lookDocument">查看</p>
           <p class="add-button-one-90">下载</p>
           <p class="add-button-one-90">下载</p>
         </div>
         </div>
@@ -142,7 +142,8 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <div class="info-dialog-content-type" v-for="(item,index) in infoDialogList" :key="index" v-if="infoDialogCheckIndex == index">
+      <div class="info-dialog-content-type" v-if="infoDialogCheckIndex == index && imgDocumentType == 0"
+           v-for="(item,index) in infoDialogList" :key="index">
         <!--已整改-->
         <!--已整改-->
         <div class="has-rectification" v-if="item.rectificationType == 1">
         <div class="has-rectification" v-if="item.rectificationType == 1">
           <div class="button-box">
           <div class="button-box">
@@ -192,9 +193,14 @@
               <p>{{item.dataH}}</p>
               <p>{{item.dataH}}</p>
             </div>
             </div>
           </div>
           </div>
+          <div class="button-box">
+            <p>整改报告书</p>
+            <p class="inquire-button-one" @click="lookDocument">查看</p>
+            <p class="add-button-one-90">下载</p>
+          </div>
         </div>
         </div>
       </div>
       </div>
-      <div class="info-dialog-content-add" v-if="infoDialogCheckIndex == 'add'">
+      <div class="info-dialog-content-add" v-if="infoDialogCheckIndex == 'add' && imgDocumentType == 0">
         <el-form  :model="addForm" :rules="rules" label-width="90px">
         <el-form  :model="addForm" :rules="rules" label-width="90px">
           <!--待整改-->
           <!--待整改-->
           <div class="stay-rectification" v-if="addFormType == 1">
           <div class="stay-rectification" v-if="addFormType == 1">
@@ -254,14 +260,14 @@
           </div>
           </div>
         </el-form>
         </el-form>
       </div>
       </div>
-      <div class="info-dialog-content-img" v-if="infoDialogCheckIndex == 'img'">
+      <div class="info-dialog-content-img" v-if="imgDocumentType == 1">
         <img :src="imgList[imgIndex].url">
         <img :src="imgList[imgIndex].url">
         <p class="el-icon-arrow-left left-button-p" @click="infoLeftButton"></p>
         <p class="el-icon-arrow-left left-button-p" @click="infoLeftButton"></p>
         <p class="el-icon-arrow-right right-button-p" @click="infoRightButton"></p>
         <p class="el-icon-arrow-right right-button-p" @click="infoRightButton"></p>
         <p class="bottom-num-text">{{imgIndex+1}} / {{imgList.length}}</p>
         <p class="bottom-num-text">{{imgIndex+1}} / {{imgList.length}}</p>
         <p class="out-button" @click="outLook">返回</p>
         <p class="out-button" @click="outLook">返回</p>
       </div>
       </div>
-      <div class="info-dialog-content-document" v-if="infoDialogCheckIndex == 'document'">
+      <div class="info-dialog-content-document" v-if="imgDocumentType == 2">
         <iframe
         <iframe
           class="iframe"
           class="iframe"
           :src="iframeSrc" scrolling="auto" frameborder="0">
           :src="iframeSrc" scrolling="auto" frameborder="0">
@@ -293,6 +299,8 @@
         },
         },
         infoDialogTitle:"编辑",
         infoDialogTitle:"编辑",
         infoDialogType:true,
         infoDialogType:true,
+        //img 与 document 展示状态
+        imgDocumentType:0,
         infoDialogCheckIndex:'info',
         infoDialogCheckIndex:'info',
         infoDialogData:{
         infoDialogData:{
           data1:"2023年3月份校级督导检查",
           data1:"2023年3月份校级督导检查",
@@ -382,10 +390,10 @@
 
 
     },
     },
     methods:{
     methods:{
-
       //标签切换
       //标签切换
       checkTitleButton(index){
       checkTitleButton(index){
         if(this.infoDialogCheckIndex != index){
         if(this.infoDialogCheckIndex != index){
+          this.$set(this,'imgDocumentType',0);
           this.$set(this,'infoDialogCheckIndex',index);
           this.$set(this,'infoDialogCheckIndex',index);
         }
         }
       },
       },
@@ -397,17 +405,16 @@
       lookDocument(url){
       lookDocument(url){
         url = 'http://192.168.1.43/labSystem/statics/bigFile/2023042514/96ca9fcb-bb8e-4e90-a74a-5e94abea3816.pdf'
         url = 'http://192.168.1.43/labSystem/statics/bigFile/2023042514/96ca9fcb-bb8e-4e90-a74a-5e94abea3816.pdf'
         this.iframeSrc = this.urlJudge(url)
         this.iframeSrc = this.urlJudge(url)
-        this.$set(this,'infoDialogCheckIndex','document');
+        this.$set(this,'imgDocumentType',2);
       },
       },
       //点击查看图片
       //点击查看图片
       lookImg(list,index){
       lookImg(list,index){
         this.$set(this,'imgList',list)
         this.$set(this,'imgList',list)
         this.$set(this,'imgIndex',index)
         this.$set(this,'imgIndex',index)
-        this.$set(this,'saveIndex',this.infoDialogCheckIndex);
-        this.$set(this,'infoDialogCheckIndex','img');
+        this.$set(this,'imgDocumentType',1);
       },
       },
       outLook(){
       outLook(){
-        this.$set(this,'infoDialogCheckIndex',this.saveIndex);
+        this.$set(this,'imgDocumentType',0);
       },
       },
       //图片左右按键
       //图片左右按键
       infoLeftButton(){
       infoLeftButton(){
@@ -467,15 +474,16 @@
       delImg(imgIndex){
       delImg(imgIndex){
         this.addForm.upImgList.splice(imgIndex,1);
         this.addForm.upImgList.splice(imgIndex,1);
       },
       },
+      //退出
       outDialog(){
       outDialog(){
-        this.$set(this,'infoDialogType',false);
+        this.$parent.addDialogOpen(false);
       },
       },
     },
     },
   }
   }
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
-  .selfInspectionManagement-info-dialog-box{
+  .safetyHazard-info-dialog-box{
     ::v-deep .el-dialog__body{
     ::v-deep .el-dialog__body{
       padding:0 0 30px 0;
       padding:0 0 30px 0;
     }
     }
@@ -715,6 +723,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               text-align: center;
               text-align: center;
@@ -735,6 +745,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               font-size:14px;
               font-size:14px;
@@ -755,6 +767,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             img{
             img{
               cursor: pointer;
               cursor: pointer;
@@ -776,9 +790,11 @@
                 width:80px;
                 width:80px;
                 font-size:16px;
                 font-size:16px;
                 color:#333;
                 color:#333;
+                text-align: right;
+                margin-right:15px;
               }
               }
               p:nth-child(2){
               p:nth-child(2){
-                width:430px;
+                width:412px;
                 height:40px;
                 height:40px;
                 font-size:14px;
                 font-size:14px;
                 line-height:40px;
                 line-height:40px;
@@ -799,6 +815,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             img{
             img{
               width:60px;
               width:60px;
@@ -814,6 +832,8 @@
               width:80px;
               width:80px;
               font-size:16px;
               font-size:16px;
               color:#333;
               color:#333;
+              text-align: right;
+              margin-right:15px;
             }
             }
             p:nth-child(2){
             p:nth-child(2){
               font-size:14px;
               font-size:14px;
@@ -836,9 +856,11 @@
                 width:80px;
                 width:80px;
                 font-size:16px;
                 font-size:16px;
                 color:#333;
                 color:#333;
+                text-align: right;
+                margin-right:15px;
               }
               }
               p:nth-child(2){
               p:nth-child(2){
-                width:430px;
+                width:412px;
                 height:40px;
                 height:40px;
                 font-size:14px;
                 font-size:14px;
                 line-height:40px;
                 line-height:40px;
@@ -849,6 +871,31 @@
             }
             }
 
 
           }
           }
+          .button-box{
+            margin-top:20px;
+            display: flex;
+            p:nth-child(1){
+              height:40px;
+              line-height:40px;
+              width:80px;
+              font-size:16px;
+              color:#333;
+              text-align: right;
+              margin-right:15px;
+            }
+            p:nth-child(2){
+              width:70px;
+              height:30px;
+              line-height:30px;
+              margin-top:5px;
+            }
+            p:nth-child(3){
+              width:70px;
+              height:30px;
+              line-height:30px;
+              margin-top:5px;
+            }
+          }
         }
         }
       }
       }
       .info-dialog-content-add{
       .info-dialog-content-add{

File diff suppressed because it is too large
+ 9 - 2
src/views/safetyCheck/schoolInspection/inspectionPlan/infoPage.vue