dedsudiyu 2 роки тому
батько
коміт
86f920fdbf

+ 1 - 1
src/views/safetyCheck/components/addPage/addPage.vue

@@ -112,7 +112,7 @@
                   :autosize="{ minRows: 6, maxRows: 6}"
                   placeholder="未查到此项检查要点,可在此输入添加"
                   resize="none"
-                  maxlength="100"
+                  maxlength="300"
                   show-word-limit
                   v-model="item.hazardCheckPoint">
                 </el-input>

+ 274 - 248
src/views/safetyCheck/components/infoDialog/infoDialog.vue

@@ -55,126 +55,131 @@
     </div>
     <div class="info-dialog-content-box scrollbar-box">
       <div class="info-dialog-content-info" v-if="infoDialogCheckIndex == 'info' && imgDocumentType == 0">
-        <div class="text-box-box">
-          <p>计划标题</p>
-          <p>{{infoDialogData.title}}</p>
-        </div>
-        <div class="text-box-two-box">
-          <div>
-            <p>检查类型</p>
-            <p>{{infoDialogData.checkType==1?'校院巡查':(infoDialogData.checkType==2?'实验室自查':'')}}</p>
-          </div>
-          <div>
-            <p>{{infoDialogData.checkType==1?'计划周期':(infoDialogData.checkType==2?'任务周期':'')}}</p>
-            <p>{{infoDialogData.cycleStartTime}} 至 {{infoDialogData.cycleEndTime}}</p>
-          </div>
-        </div>
-        <div class="text-box-two-box">
-          <div>
-            <p>学院</p>
-            <p>{{infoDialogData.collegeName}}</p>
-          </div>
-          <div>
-            <p>实验室</p>
-            <p>{{infoDialogData.subjectName}} - {{infoDialogData.roomNumber}}</p>
+        <div class="info-dialog-content-info-top">
+          <div class="text-box-box">
+            <p>计划标题</p>
+            <p>{{infoDialogData.title}}</p>
           </div>
-        </div>
-        <div class="text-box-two-box">
-          <div>
-            <p>楼栋</p>
-            <p>{{infoDialogData.buildName}}</p>
-          </div>
-        </div>
-        <div class="text-box-box">
-          <p>检查要求</p>
-          <p>{{infoDialogData.checkDemand}}<span v-if="!infoDialogData.checkDemand" style="color:#999;">未输入</span></p>
-        </div>
-        <div class="text-box-two-box">
-          <div>
-            <p>检查结果</p>
-            <p>{{infoDialogData.checkResult==0?'不符合':(infoDialogData.checkResult==1?'符合':'')}}</p>
+          <div class="text-box-two-box">
+            <div>
+              <p>检查类型</p>
+              <p>{{infoDialogData.checkType==1?'校院巡查':(infoDialogData.checkType==2?'实验室自查':'')}}</p>
+            </div>
+            <div>
+              <p>{{infoDialogData.checkType==1?'计划周期':(infoDialogData.checkType==2?'任务周期':'')}}</p>
+              <p>{{infoDialogData.cycleStartTime}} 至 {{infoDialogData.cycleEndTime}}</p>
+            </div>
           </div>
-          <div>
-            <p>整改期限</p>
-            <p>{{infoDialogData.rectifyDeadline}}</p>
+          <div class="text-box-two-box">
+            <div>
+              <p>学院</p>
+              <p>{{infoDialogData.collegeName}}</p>
+            </div>
+            <div>
+              <p>实验室</p>
+              <p>{{infoDialogData.subjectName}} - {{infoDialogData.roomNumber}}</p>
+            </div>
           </div>
-        </div>
-        <div class="button-box">
-          <p>{{infoDialogData.rectifyNotice == 1?'整改告知书':(infoDialogData.rectifyNotice == 2?'整改通知书':'')}}</p>
-          <p class="inquire-button-one" @click="lookDocument(1)">查看</p>
-          <p class="add-button-one-90" @click="downloadButton">下载</p>
-        </div>
-        <div class="text-box-two-box">
-          <div>
-            <p>检查者</p>
-            <p>{{infoDialogData.checkUser}}</p>
+          <div class="text-box-two-box">
+            <div>
+              <p>楼栋</p>
+              <p>{{infoDialogData.buildName}}</p>
+            </div>
           </div>
-          <div>
-            <p>检查时间</p>
-            <p>{{infoDialogData.checkTime}}</p>
+          <div class="text-box-box">
+            <p>检查要求</p>
+            <p>{{infoDialogData.checkDemand}}<span v-if="!infoDialogData.checkDemand" style="color:#999;">未输入</span></p>
           </div>
-        </div>
-        <div class="table-box">
-          <p class="table-title-p">隐患项</p>
-          <div class="table-min">
-            <div class="left-box">
-              <p></p>
-              <p>检查项目</p>
-              <p></p>
+          <div class="text-box-two-box">
+            <div>
+              <p>检查结果</p>
+              <p>{{infoDialogData.checkResult==0?'不符合':(infoDialogData.checkResult==1?'符合':'')}}</p>
             </div>
-            <div class="right-box text-two-box">
-              <p></p>
-              <p>{{infoDialogData.checkHazardApplyDto.hazardCheckProStr}}</p>
-              <p></p>
-              <p v-if="infoDialogData.checkHazardApplyDto.hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{infoDialogData.checkHazardApplyDto.hazardCheckCount}}</span> 次隐患</p>
-              <p></p>
+            <div>
+              <p>整改期限</p>
+              <p>{{infoDialogData.rectifyDeadline}}</p>
             </div>
           </div>
-          <div class="table-min">
-            <div class="left-box">
-              <p></p>
-              <p>隐患描述</p>
-              <p></p>
-            </div>
-            <div class="right-box text-box">
-              <p></p>
-              <p>{{infoDialogData.checkHazardApplyDto.hazardDescribe}}</p>
-              <p></p>
-            </div>
+          <div class="button-box">
+            <p>{{infoDialogData.rectifyNotice == 1?'整改告知书':(infoDialogData.rectifyNotice == 2?'整改通知书':'')}}</p>
+            <p class="inquire-button-one" @click="lookDocument(1)">查看</p>
+            <p class="add-button-one-90" @click="downloadButton">下载</p>
           </div>
-          <div class="table-min">
-            <div class="left-box">
-              <p></p>
-              <p>隐患等级</p>
-              <p></p>
+          <div class="text-box-two-box">
+            <div>
+              <p>检查者</p>
+              <p>{{infoDialogData.checkUser}}</p>
             </div>
-            <div class="right-box text-box">
-              <p></p>
-              <p>{{infoDialogData.checkHazardApplyDto.hazardLevel==2?'一般隐患':(infoDialogData.checkHazardApplyDto.hazardLevel==1?'重大隐患':(infoDialogData.checkHazardApplyDto.hazardLevel==3?'管理问题':''))}}</p>
-              <p></p>
+            <div>
+              <p>检查时间</p>
+              <p>{{infoDialogData.checkTime}}</p>
             </div>
           </div>
-          <div class="table-min">
-            <div class="left-box">
-              <p></p>
-              <p>检查要点</p>
-              <p></p>
+        </div>
+        <p class="table-top-title-p">不符合项</p>
+        <div class="info-dialog-content-info-bottom">
+          <div class="table-box">
+            <p class="table-title-p">隐患项</p>
+            <div class="table-min">
+              <div class="left-box">
+                <p></p>
+                <p>检查项目</p>
+                <p></p>
+              </div>
+              <div class="right-box text-two-box">
+                <p></p>
+                <p>{{infoDialogData.checkHazardApplyDto.hazardCheckProStr}}</p>
+                <p></p>
+                <p v-if="infoDialogData.checkHazardApplyDto.hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{infoDialogData.checkHazardApplyDto.hazardCheckCount}}</span> 次隐患</p>
+                <p></p>
+              </div>
             </div>
-            <div class="right-box text-box">
-              <p></p>
-              <p>{{infoDialogData.checkHazardApplyDto.hazardCheckPoint}}</p>
-              <p></p>
+            <div class="table-min">
+              <div class="left-box">
+                <p></p>
+                <p>隐患描述</p>
+                <p></p>
+              </div>
+              <div class="right-box text-box">
+                <p></p>
+                <p>{{infoDialogData.checkHazardApplyDto.hazardDescribe}}</p>
+                <p></p>
+              </div>
             </div>
-          </div>
-          <div class="table-min">
-            <div class="left-box">
-              <p></p>
-              <p>隐患照片</p>
-              <p></p>
+            <div class="table-min">
+              <div class="left-box">
+                <p></p>
+                <p>隐患等级</p>
+                <p></p>
+              </div>
+              <div class="right-box text-box">
+                <p></p>
+                <p>{{infoDialogData.checkHazardApplyDto.hazardLevel==2?'一般隐患':(infoDialogData.checkHazardApplyDto.hazardLevel==1?'重大隐患':(infoDialogData.checkHazardApplyDto.hazardLevel==3?'管理问题':''))}}</p>
+                <p></p>
+              </div>
+            </div>
+            <div class="table-min">
+              <div class="left-box">
+                <p></p>
+                <p>检查要点</p>
+                <p></p>
+              </div>
+              <div class="right-box text-box">
+                <p></p>
+                <p>{{infoDialogData.checkHazardApplyDto.hazardCheckPoint}}</p>
+                <p></p>
+              </div>
             </div>
-            <div class="right-box img-box">
-              <img :src="imgItem.fileUrl" v-for="(imgItem,index) in infoDialogData.checkHazardApplyDto.uploadDtoList"
-                   :key="index" @click="lookImg(infoDialogData.checkHazardApplyDto.uploadDtoList,index)">
+            <div class="table-min">
+              <div class="left-box">
+                <p></p>
+                <p>隐患照片</p>
+                <p></p>
+              </div>
+              <div class="right-box img-box">
+                <img :src="imgItem.fileUrl" v-for="(imgItem,index) in infoDialogData.checkHazardApplyDto.uploadDtoList"
+                     :key="index" @click="lookImg(infoDialogData.checkHazardApplyDto.uploadDtoList,index)">
+              </div>
             </div>
           </div>
         </div>
@@ -697,195 +702,210 @@
       }
     }
     .info-dialog-content-box{
-      padding:30px 70px 0;
       height:600px;
       .info-dialog-content-info{
-        .text-box-box{
-          display: flex;
-          margin-top:20px;
-          p{
-            font-size:16px;
-            color:#333;
-            line-height:40px;
-          }
-          p:nth-child(1){
-            width:95px;
-            text-align: right;
-            margin-right:16px;
-            font-size:16px;
-          }
-          p:nth-child(2){
-            width:928px;
-            padding:10px 20px;
-            overflow: hidden;
-            background: #F5F5F5;
-            border-radius:4px;
-            font-size:14px;
-            line-height:20px;
-          }
-        }
-        .text-box-two-box{
-          display: flex;
-          margin-top:20px;
-          div{
+        padding:30px 0 0;
+        .info-dialog-content-info-top{
+          padding:0 70px;
+          .text-box-box{
             display: flex;
+            margin-top:20px;
             p{
               font-size:16px;
               color:#333;
               line-height:40px;
             }
             p:nth-child(1){
+              width:95px;
               text-align: right;
               margin-right:16px;
               font-size:16px;
             }
             p:nth-child(2){
-              padding:0 20px;
+              width:928px;
+              padding:10px 20px;
               overflow: hidden;
               background: #F5F5F5;
               border-radius:4px;
               font-size:14px;
+              line-height:20px;
             }
           }
-          div:nth-child(1){
-            p:nth-child(1){
-              width:95px;
-            }
-            p:nth-child(2){
-              width:400px;
-            }
-          }
-          div:nth-child(2){
-            p:nth-child(1){
-              width:117px;
-            }
-            p:nth-child(2){
-              width:400px;
-            }
-          }
-        }
-        .button-box{
-          display: flex;
-          margin-top:20px;
-          p{
-            font-size:16px;
-            line-height:40px;
-          }
-          p:nth-child(1){
-            color:#333;
-            width:95px;
-            text-align: right;
-            margin-right:16px;
-          }
-          p:nth-child(2){
-            width:70px;
-            height:30px;
-            line-height:30px;
-            margin-top:5px;
-            margin-right:12px;
-            font-size:14px;
-          }
-          p:nth-child(3){
-            width:70px;
-            height:30px;
-            line-height:30px;
-            margin-top:5px;
-            font-size:14px;
-          }
-        }
-        .table-box{
-          margin-left:16px;
-          margin-top:20px;
-          border:1px solid #e0e0e0;
-          border-bottom:none;
-          .table-title-p{
-            background-color: #F5F5F5;
-            line-height:50px;
-            padding-left:30px;
-            border-bottom:1px solid #e0e0e0;
-          }
-          .table-min{
+          .text-box-two-box{
             display: flex;
-            overflow: hidden;
-            border-bottom:1px solid #e0e0e0;
-            .left-box{
-              width:120px;
+            margin-top:20px;
+            div{
               display: flex;
-              flex-direction: column;
-              overflow: hidden;
-              background-color: #F5F5F5;
-              border-right:1px solid #e0e0e0;
+              p{
+                font-size:16px;
+                color:#333;
+                line-height:40px;
+              }
               p:nth-child(1){
-                flex:1;
+                text-align: right;
+                margin-right:16px;
+                font-size:16px;
               }
               p:nth-child(2){
-                text-align: center;
-                height:14px;
-                line-height:14px;
-              }
-              p:nth-child(3){
-                flex:1;
+                padding:0 20px;
+                overflow: hidden;
+                background: #F5F5F5;
+                border-radius:4px;
+                font-size:14px;
               }
             }
-            .right-box{
-              flex:1;
-              overflow: hidden;
-              min-height:60px;
-              font-size:14px;
-              padding:0 16px;
-              line-height:20px;
-            }
-            .text-box{
-              display: flex;
-              flex-direction: column;
+            div:nth-child(1){
               p:nth-child(1){
-                flex:1;
-                min-height:12px;
+                width:95px;
               }
               p:nth-child(2){
-
-              }
-              p:nth-child(3){
-                flex:1;
-                min-height:12px;
+                width:400px;
               }
             }
-            .text-two-box{
+            div:nth-child(2){
               p:nth-child(1){
-                flex:1;
-                min-height:12px;
+                width:117px;
               }
               p:nth-child(2){
-
+                width:400px;
+              }
+            }
+          }
+          .button-box{
+            display: flex;
+            margin-top:20px;
+            p{
+              font-size:16px;
+              line-height:40px;
+            }
+            p:nth-child(1){
+              color:#333;
+              width:95px;
+              text-align: right;
+              margin-right:16px;
+            }
+            p:nth-child(2){
+              width:70px;
+              height:30px;
+              line-height:30px;
+              margin-top:5px;
+              margin-right:12px;
+              font-size:14px;
+            }
+            p:nth-child(3){
+              width:70px;
+              height:30px;
+              line-height:30px;
+              margin-top:5px;
+              font-size:14px;
+            }
+          }
+        }
+        .table-top-title-p{
+          margin-top:22px;
+          font-size:16px;
+          line-height: 50px;
+          padding:0 50px;
+          background-color: #F5F5F5;
+          color:#333;
+        }
+        .info-dialog-content-info-bottom{
+          padding:0 70px;
+          .table-box{
+            margin-left:16px;
+            margin-top:20px;
+            border:1px solid #e0e0e0;
+            border-bottom:none;
+            .table-title-p{
+              background-color: #F5F5F5;
+              line-height:50px;
+              padding-left:30px;
+              border-bottom:1px solid #e0e0e0;
+            }
+            .table-min{
+              display: flex;
+              overflow: hidden;
+              border-bottom:1px solid #e0e0e0;
+              .left-box{
+                width:120px;
+                display: flex;
+                flex-direction: column;
+                overflow: hidden;
+                background-color: #F5F5F5;
+                border-right:1px solid #e0e0e0;
+                p:nth-child(1){
+                  flex:1;
+                }
+                p:nth-child(2){
+                  text-align: center;
+                  height:14px;
+                  line-height:14px;
+                }
+                p:nth-child(3){
+                  flex:1;
+                }
               }
-              p:nth-child(3){
+              .right-box{
                 flex:1;
-                min-height:12px;
+                overflow: hidden;
+                min-height:60px;
+                font-size:14px;
+                padding:0 16px;
+                line-height:20px;
               }
-              p:nth-child(4){
-                span{
-                  color:#FF0000;
+              .text-box{
+                display: flex;
+                flex-direction: column;
+                p:nth-child(1){
+                  flex:1;
+                  min-height:12px;
+                }
+                p:nth-child(2){
+
+                }
+                p:nth-child(3){
+                  flex:1;
+                  min-height:12px;
                 }
               }
-              p:nth-child(5){
-                flex:1;
-                min-height:12px;
+              .text-two-box{
+                p:nth-child(1){
+                  flex:1;
+                  min-height:12px;
+                }
+                p:nth-child(2){
+
+                }
+                p:nth-child(3){
+                  flex:1;
+                  min-height:12px;
+                }
+                p:nth-child(4){
+                  span{
+                    color:#FF0000;
+                  }
+                }
+                p:nth-child(5){
+                  flex:1;
+                  min-height:12px;
+                }
               }
-            }
-            .img-box{
-              padding:20px;
-              img{
-                cursor: pointer;
-                height:80px;
-                width:80px;
-                margin-right:10px;
-                border-radius:4px;
+              .img-box{
+                padding:20px;
+                img{
+                  cursor: pointer;
+                  height:80px;
+                  width:80px;
+                  margin-right:10px;
+                  border-radius:4px;
+                }
               }
             }
           }
         }
       }
       .info-dialog-content-type{
+        padding:30px 70px 0;
         .has-rectification{
           .button-box{
             display: flex;
@@ -900,12 +920,14 @@
             }
             p:nth-child(2){
               text-align: center;
-              width:80px;
+              padding:0 15px;
               height:30px;
               margin-top:5px;
               line-height:30px;
               font-size:14px;
               color:#0183FA;
+              border:1px solid #0183FA;
+              border-radius:4px;
             }
           }
           .text-box{
@@ -1072,6 +1094,7 @@
         }
       }
       .info-dialog-content-add{
+        padding:30px 70px 0;
         .stay-rectification{
           .up-img-p{
             height:80px;
@@ -1142,6 +1165,7 @@
         }
       }
       .info-dialog-content-img{
+        padding:30px 70px 0;
         img{
           width:1040px;
         }
@@ -1202,6 +1226,7 @@
         }
       }
       .info-dialog-content-document{
+        padding:30px 70px 0;
         display: flex;
         flex:1;
         height:570px;
@@ -1237,6 +1262,7 @@
         }
       }
       .info-dialog-content-document-list{
+        padding:30px 70px 0;
         display: flex;
         flex:1;
         height:570px;

+ 4 - 3
src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -106,7 +106,7 @@
                   <div class="right-min-content-box" style="height:120px;">
                     <div class="text-box">
                       <p class="null-p"></p>
-                      <p class="text-p">{{item.hazardDescribe}}</p>
+                      <p class="text-p scrollbar-box">{{item.hazardDescribe}}</p>
                       <p class="null-p"></p>
                     </div>
                   </div>
@@ -132,7 +132,7 @@
                   <div class="right-min-content-box" style="height:120px;">
                     <div class="text-box">
                       <p class="null-p"></p>
-                      <p class="text-p">{{item.hazardCheckPoint}}</p>
+                      <p class="text-p scrollbar-box">{{item.hazardCheckPoint}}</p>
                       <p class="null-p"></p>
                     </div>
                   </div>
@@ -450,7 +450,7 @@
               border-right:1px solid #E0E0E0;
               border-bottom:1px solid #E0E0E0;
               .button-p{
-                width:80px;
+                width:200px;
                 color:#0183FA;
                 font-size:16px;
                 min-height:40px;
@@ -491,6 +491,7 @@
                   flex:1;
                 }
                 .text-p{
+                  max-height:100px;
                   font-size:14px;
                   color:#333;
                   line-height:18px;