dedsudiyu 1 éve
szülő
commit
18fc6446b0

+ 2 - 0
src/views/comprehensive/laboratoryManagement/subject/addSubject.vue

@@ -462,6 +462,8 @@
               // });
             });
           });
+        }else{
+          this.getClassifyBySubId();
         }
       },
       methods:{

+ 45 - 1
src/views/comprehensive/laboratoryManagement/subject/infoPage.vue

@@ -4,7 +4,7 @@
         <div class="top-max-box" style="position: relative">
           <div class="all-title-box">
             <p></p>
-            <p>实验室安全信息</p>
+            <p>实验室信息</p>
           </div>
           <div class="left-top-title-box">
             <div class="left-box">
@@ -33,6 +33,41 @@
               </div>
             </div>
           </div>
+          <p class="info-max-title-p">管控一体机信息</p>
+          <div class="info-max-box">
+            <div class="left-box">
+              <div class="for-text-box">
+                <p class="info-title">主要危险类别:</p>
+                <div class="for-box" v-for="(item,index1) in newData.hazardCategory" :key="index1">
+                  <p class="for-info-p" v-for="(minItem,index2) in hazardCategory" :key="index2" v-if="minItem.dictValue == item">● {{minItem.dictLabel}}</p>
+                </div>
+              </div>
+              <div class="for-text-box">
+                <p class="info-title">灭火要点:</p>
+                <div class="for-box" v-for="(item,index1) in newData.outfire" :key="index1">
+                  <p class="for-info-p" v-for="(minItem,index2) in extinguishingKeyPoints" :key="index2" v-if="minItem.dictValue == item">● {{minItem.dictLabel}}</p>
+                </div>
+              </div>
+            </div>
+            <div class="right-box">
+              <div class="for-text-box">
+                <p class="info-title">风险防控措施:</p>
+                <div class="for-box" v-for="(item,index1) in newData.riskMeasure" :key="index1">
+                  <p class="for-info-p" v-for="(minItem,index2) in riskMeasure" :key="index2" v-if="minItem.dictValue == item">● {{minItem.dictLabel}}</p>
+                </div>
+              </div>
+              <div class="for-img-box">
+                <p class="info-title" style="margin-bottom:7px;">安全警示标识:</p>
+                <img src="@/assets/newImages/icon_aqxxp_jzxy.png" v-if="item == 'xiyan'" v-for="(item,index) in newData.safeSigns" :key="index">
+                <img src="@/assets/newImages/icon_aqxxp_jzys.png" v-if="item == 'yinshi'" v-for="(item,index) in newData.safeSigns" :key="index">
+                <img src="@/assets/newImages/icon_aqxxp_dxaq.png" v-if="item == 'anquan'" v-for="(item,index) in newData.safeSigns" :key="index">
+                <img src="@/assets/newImages/icon_aqxxp_gzf.png" v-if="item == 'gongzuofu'" v-for="(item,index) in newData.safeSigns" :key="index">
+                <img src="@/assets/newImages/icon_aqxxp_gbmc.png" v-if="item == 'menchuang'" v-for="(item,index) in newData.safeSigns" :key="index">
+                <img src="@/assets/newImages/icon_aqxxp_gbsd.png" v-if="item == 'shuidian'" v-for="(item,index) in newData.safeSigns" :key="index">
+              </div>
+            </div>
+          </div>
+          <p class="info-max-title-p">电子信息牌信息</p>
           <div class="info-max-box">
             <div class="for-text-box" v-if="item.privateList.length>0 && item.classifyType==1" v-for="(item,index) in  newData.classifyList">
               <p class="info-title">{{item.classifyName}}:</p>
@@ -523,6 +558,15 @@
             }
           }
         }
+        .info-max-title-p{
+          line-height:20px;
+          font-size:16px;
+          color:#333;
+          font-weight:700;
+          border-top:1px dashed #999999;
+          padding-top:20px;
+          margin-top:10px;
+        }
         .info-max-box{
           margin-top:7px;
           display: flex;