zc

src/views/newEvacuationBigData.vue

@@ -29,7 +29,7 @@
             <p>智能控制</p>
           </div>
           <div class="control-max-box scrollbar-box" id="control-max-box">
-            <div class="control-for-box" v-for="(item,index) in controlList" :key="index" v-if="item.isPcfire != 1">
+            <div class="control-for-box" v-for="(item,index) in controlList" :key="index">
               <p class="control-for-title-p">{{item.name}}</p>
               <div class="control-for-img-box">
                 <img class="position-img" src="@/assets/ZDimages/bigData3_2/icon_znkz_bg.png">
@@ -1322,8 +1322,8 @@
           let videoList = [];
           if (response.data.labHardwareVOList){
             for(let i=0;i<response.data.labHardwareVOList.length;i++){
-              if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION' ||
-                response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH'){
+              if((response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION' ||
+                response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH') && response.data.labHardwareVOList[i].isPcfire != 1){
                 //AI_VENTILATION 通风   SWITCH 电源开关
                 let obj = {
                   id:response.data.labHardwareVOList[i].id,

src/views/oneKeyOutfire/planExecuteRecord/planExecuteRecordDetail.vue

@@ -18,8 +18,8 @@
             <li v-if="form.riskReason==4"><i>风险级别：</i><i>高风险</i></li>
             <li><i>发生时间：</i><i>{{form.startDate?form.startDate:''}} - {{form.endDate?form.endDate:''}}</i></li>
             <li><i>持续时间：</i><i>{{form.riskDuration?form.riskDuration:''}}秒</i></li>
-            <li><i>风险响应人员：</i><i>{{form.handledPerson?form.handledPerson:''}}</i></li>
-            <li><i>实验室内人员：</i><i>{{form.internalPerson?form.internalPerson:''}}</i></li>
+            <li><i>风险响应人员：</i><i>{{form.handledPerson?form.handledPerson:'-'}}</i></li>
+            <li><i>实验室内人员：</i><i>{{form.internalPerson?form.internalPerson:'-'}}</i></li>
           </div>
         </div>
         <div class="addPage_b_t_c">