Merge branch '3.3.1-dspf' into 3.3.2-dzxxp

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

@@ -114,7 +114,7 @@
                     <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'">
-                    <img src="@/assets/ZDimages/subject/icon_syspz_voc.png" v-if="item.funNum == 'FB_VOC'">
+                    <img src="@/assets/ZDimages/subject/icon_syspz_voc.png" v-if="item.funNum == 'fbvoc'">
                     <img src="@/assets/ZDimages/subject/icon_syspz_tvoc.png" v-if="item.funNum == 'tvoc'">
                     <img src="@/assets/ZDimages/subject/icon_sy_mcnd.png" v-if="item.funNum == 'so2'">
                     <img src="@/assets/ZDimages/subject/icon_bj_yyhd.png" v-if="item.funNum == 'no1'">

src/views/newEvacuationBigData.vue

@@ -2268,7 +2268,7 @@
               obj.zcImg = this.sensorIconData.voc_zc;
               obj.ycImg = this.sensorIconData.voc_yc;
               break;
-            case 'FB_VOC':
+            case 'fbvoc':
               obj.zcImg = this.sensorIconData.voc_zc;
               obj.ycImg = this.sensorIconData.voc_yc;
               break;