Merge branch '3.3.2-dzxxp' into 3.3.4-kdyh

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -634,6 +634,13 @@ export default {
       let self = this;
       let type = 0; //硬件 //0全部
       subjectInfo(row.id,type).then(response => {
+        let classifyList = [];
+        for(let i=0;i<response.data.classifyList.length;i++){
+          if(response.data.classifyList[i].privateList.length>0 && (response.data.classifyList[i].classifyType==1||response.data.classifyList[i].classifyType==2)){
+            classifyList.push(response.data.classifyList[i]);
+          }
+        }
+        response.data.classifyList = classifyList;
         // console.log("获取实验室详情",response.data)
         this.$set(this,'newData',response.data);
         if(response.data.safeUserName){

src/views/comprehensive/laboratoryManagement/subject/infoPage.vue

@@ -37,13 +37,13 @@
           <div class="info-max-box">
             <div class="left-box">
               <div class="for-text-box">
-                <p class="info-title">主要危险类别：</p>
+                <p class="info-title">主要危险类别：{{!newData.hazardCategory?'未配置':''}}</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>
+                <p class="info-title">灭火要点：{{!newData.outfire?'未配置':''}}</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>
@@ -51,13 +51,13 @@
             </div>
             <div class="right-box">
               <div class="for-text-box">
-                <p class="info-title">风险防控措施：</p>
+                <p class="info-title">风险防控措施：{{!newData.riskMeasure?'未配置':''}}</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>
+                <p class="info-title" style="margin-bottom:7px;">安全警示标识：{{!newData.safeSigns?'未配置':''}}</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">
@@ -79,6 +79,9 @@
               <p class="info-title" style="margin-bottom:7px;">{{item.classifyName}}:</p>
               <img :src="item2.infoContent" v-for="(item2,index2) in item.privateList" :key="index2">
             </div>
+            <div class="for-img-box" v-if="!newData.classifyList[0]">
+              <p class="info-title">未配置</p>
+            </div>
           </div>
         </div>
         <div class="bottom-max-box">