Merge remote-tracking branch 'origin/web-v2' into web-v2

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

@@ -103,6 +103,7 @@
               <div class="sensor-for-max-box scrollbar-box" v-if="checkedSubject.sensorFunctionStatusList[0]">
                 <div class="sensor-for-big-box"
                      :class="item.type == 1 ? 'sensor-color-a' : (item.type == 2 ? 'sensor-color-b' : 'sensor-color-c')"
+                     v-if="item.funNum != 'huoyan'"
                      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'">

src/views/comprehensive/system/publicConfig/integrationConfig.vue

@@ -230,13 +230,13 @@ export default {
         if(!response.data.logoutTime){
           response.data.logoutTime = 120;
         }
+        this.$set(this,'form',response.data)
         if(response.data.lotControl){
           let list = response.data.lotControl.split(",");
           this.$set(this.form,'lotControl',list);
         }else{
           this.$set(this.form,'lotControl',['1','2','3','4']);
         }
-        this.$set(this,'form',response.data)
       });
     },
     //上传