Merge branch 'web-v2-temp' into web-v2

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

@@ -146,10 +146,14 @@
                      v-for="(item,index) in checkedSubject.sensorFunctionStatusList" :key="index">
                   <div class="sensor-for-min-box">
                     <img src="@/assets/ZDimages/subject/icon_bj_wd.png" v-if="item.funNum == 'wendu'">
+                    <img src="@/assets/ZDimages/subject/icon_bj_wd.png" v-if="item.funNum == 'fbwendu'">
                     <img src="@/assets/ZDimages/subject/icon_bj_sd.png" v-if="item.funNum == 'shidu'">
+                    <img src="@/assets/ZDimages/subject/icon_bj_sd.png" v-if="item.funNum == 'fbshidu'">
                     <img src="@/assets/ZDimages/subject/icon_bj_eyht.png" v-if="item.funNum == 'co'">
+                    <img src="@/assets/ZDimages/subject/icon_bj_eyht.png" v-if="item.funNum == 'fbco'">
                     <img src="@/assets/ZDimages/subject/icon_bj_jwnd.png" v-if="item.funNum == 'jiawan'">
                     <img src="@/assets/ZDimages/subject/icon_sy_yqnd.png" v-if="item.funNum == 'o2'">
+                    <img src="@/assets/ZDimages/subject/icon_sy_yqnd.png" v-if="item.funNum == 'fbo2'">
                     <img src="@/assets/ZDimages/subject/icon_bj_yg.png" v-if="item.funNum == 'yanwu'">
                     <img src="@/assets/ZDimages/subject/icon_sy_dqy.png" v-if="item.funNum == 'daqiya'">
                     <img src="@/assets/ZDimages/subject/icon_syspz_voc.png" v-if="item.funNum == 'voc'">

src/views/emergencyManagement/smartLoT/hardware/powerControl.vue

@@ -146,7 +146,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="offDrawer">取消</el-button>
+        <el-button @click="handleClose">取消</el-button>
         <el-button style="width:100px;" type="primary" @click="submitForm">提交</el-button>
       </div>
     </el-dialog>

src/views/emergencyManagement/smartLoT/hardware/smartVentilation.vue

@@ -138,7 +138,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="offDrawer">取消</el-button>
+        <el-button @click="handleClose">取消</el-button>
         <el-button style="width:100px;" type="primary" @click="submitForm">提交</el-button>
       </div>
     </el-dialog>

src/views/newEvacuationBigData.vue

@@ -2252,14 +2252,26 @@
               obj.zcImg = this.sensorIconData.wendu_zc;
               obj.ycImg = this.sensorIconData.wendu_yc;
               break;
+            case 'fbwendu':
+              obj.zcImg = this.sensorIconData.wendu_zc;
+              obj.ycImg = this.sensorIconData.wendu_yc;
+              break;
             case 'shidu':
               obj.zcImg = this.sensorIconData.shidu_zc;
               obj.ycImg = this.sensorIconData.shidu_yc;
               break;
+            case 'fbshidu':
+              obj.zcImg = this.sensorIconData.shidu_zc;
+              obj.ycImg = this.sensorIconData.shidu_yc;
+              break;
             case 'co':
               obj.zcImg = this.sensorIconData.co_zc;
               obj.ycImg = this.sensorIconData.co_yc;
               break;
+            case 'fbco':
+              obj.zcImg = this.sensorIconData.co_zc;
+              obj.ycImg = this.sensorIconData.co_yc;
+              break;
             case 'jiawan':
               obj.zcImg = this.sensorIconData.jiawan_zc;
               obj.ycImg = this.sensorIconData.jiawan_yc;
@@ -2268,6 +2280,10 @@
               obj.zcImg = this.sensorIconData.o2_zc;
               obj.ycImg = this.sensorIconData.o2_yc;
               break;
+            case 'fbo2':
+              obj.zcImg = this.sensorIconData.o2_zc;
+              obj.ycImg = this.sensorIconData.o2_yc;
+              break;
             case 'yanwu':
               obj.zcImg = this.sensorIconData.yanwu_zc;
               obj.ycImg = this.sensorIconData.yanwu_yc;