Merge branch '3.3.1-dspf' into 3.3.2-dzxxp

src/views/comprehensive/laboratoryManagement/building/buildingDetails.vue

@@ -208,10 +208,10 @@
           <el-form-item label="状态参数：" prop="configStatus" style="width:398px;" v-if="dialogForm.relayType == 2">
             <el-input v-model="dialogForm.configStatus" placeholder="请输入状态参数" maxlength="20" style="width:300px;"/>
           </el-form-item>
-          <el-form-item label="继电器编号：" prop="relayCode" v-if="dialogForm.relayType == 1">
+          <el-form-item label="继电器编号：" prop="relayCode" v-if="dialogForm.relayType == 1 || dialogForm.relayType == 3">
             <el-input v-model="dialogForm.relayCode" placeholder="请输入继电器参数" maxlength="20" style="width:300px;"/>
           </el-form-item>
-          <el-form-item label="继电器路数：" prop="relayBit" style="width:398px;" v-if="dialogForm.relayType == 1" class="dialog-relay-bit-form-item-box">
+          <el-form-item label="继电器路数：" prop="relayBit" style="width:398px;" v-if="dialogForm.relayType == 1 || dialogForm.relayType == 3" class="dialog-relay-bit-form-item-box">
             <el-input-number v-model="dialogForm.relayBit" :min="1" :max="12" placeholder="请输入状态参数" :controls="false" style="width:300px;"></el-input-number>
           </el-form-item>
           <el-form-item label="指示灯类型：" prop="state">
@@ -506,7 +506,7 @@
                     relayType:obj.mapList[i].lightList[o].relayType,
                     state:obj.mapList[i].lightList[o].state,
                   }
-                  if(obj.mapList[i].lightList[o].relayType == 1){
+                  if(obj.mapList[i].lightList[o].relayType == 1 || obj.mapList[i].lightList[o].relayType == 3){
                     minObj.relayCode = obj.mapList[i].lightList[o].relayCode
                     minObj.relayBit = obj.mapList[i].lightList[o].relayBit
                   }else if(obj.mapList[i].lightList[o].relayType == 2){
@@ -587,7 +587,7 @@
             relayType:item.relayType?item.relayType:2,
             state:item.state?item.state:"",
           }
-          if(obj.relayType == 1){
+          if(obj.relayType == 1 || obj.relayType == 3){
             obj.relayCode = item.relayCode?item.relayCode:"";
             obj.relayBit = item.relayBit?item.relayBit:"";
           }else if(obj.relayType == 2){
@@ -660,7 +660,7 @@
               }else if(this.dialogOpenType == 6){
                 this.$set(this.mapList[this.dialogIndex].lightList[this.dialogMinIndex],'relayType',this.dialogForm.relayType);
                 this.$set(this.mapList[this.dialogIndex].lightList[this.dialogMinIndex],'state',this.dialogForm.state);
-                if(this.dialogForm.relayType == 1){
+                if(this.dialogForm.relayType == 1 || this.dialogForm.relayType == 3){
                   this.$set(this.mapList[this.dialogIndex].lightList[this.dialogMinIndex],'relayCode',this.dialogForm.relayCode);
                   this.$set(this.mapList[this.dialogIndex].lightList[this.dialogMinIndex],'relayBit',this.dialogForm.relayBit);
                 }else if(this.dialogForm.relayType == 2){

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

@@ -905,7 +905,9 @@ export default {
           for(let i=0;i<response.data.labHardwareVOList.length;i++){
             if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH'||
               response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION'){
-              obj.VOlist.push(response.data.labHardwareVOList[i]);
+              if( response.data.labHardwareVOList[i].isPcfire == 0 ){
+                obj.VOlist.push(response.data.labHardwareVOList[i]);
+              }
             }
           }
         }

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

@@ -312,6 +312,19 @@
             list.push(obj);
           }
           self.relayNumList = list;
+        }else if(this.form.hardwareType==3){
+          this.relayNumList =[
+            {name:1},
+            {name:2},
+            {name:3},
+            {name:4},
+            {name:5},
+            {name:6},
+            {name:7},
+            {name:8},
+            {name:9},
+            {name:10},
+          ]
         }
       },
       // 开启关闭验证
@@ -541,8 +554,10 @@
           }
           list.push(obj);
         }
-
-        if(this.form.hardwareType==3){
+        console.log(list)
+        if(list.length>0){
+          this.relayNumList = list;
+        }else{
           this.relayNumList =[
             {name:1},
             {name:2},
@@ -555,9 +570,8 @@
             {name:9},
             {name:10},
           ]
-        }else{
-          this.relayNumList = list;
         }
+
       },
       loadHardware(){
         let self = this;

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

@@ -294,6 +294,19 @@
             list.push(obj);
           }
           self.relayNumList = list;
+        }else if(this.form.hardwareType==3){
+          this.relayNumList =[
+            {name:1},
+            {name:2},
+            {name:3},
+            {name:4},
+            {name:5},
+            {name:6},
+            {name:7},
+            {name:8},
+            {name:9},
+            {name:10},
+          ]
         }
       },
       async tableButton(row){
@@ -523,7 +536,10 @@
           }
           list.push(obj);
         }
-        if(this.form.hardwareType==3){
+        console.log(this.relayNumList)
+        if(list.length>0){
+          this.relayNumList = list;
+        }else{
           this.relayNumList =[
             {name:1},
             {name:2},
@@ -536,8 +552,6 @@
             {name:9},
             {name:10},
           ]
-        }else{
-          this.relayNumList = list;
         }
       },
       loadHardware(){