Merge branch '3.3.2-dzxxp' into 3.3.4-kdyh

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

@@ -199,6 +199,7 @@
             <el-radio-group v-model="dialogForm.relayType" style="margin-top:4px;">
               <el-radio :label="2">新版继电器</el-radio>
               <el-radio :label="1">老版继电器</el-radio>
+              <el-radio :label="3">泥人继电器</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="继电器参数：" prop="configName" v-if="dialogForm.relayType == 2">

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

@@ -203,6 +203,7 @@
             <el-radio-group v-model="form.hardwareType">
               <el-radio :label="1">老继电器</el-radio>
               <el-radio :label="2">新继电器</el-radio>
+              <el-radio :label="3">泥人继电器</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="设备编号" prop="relayCode">

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

@@ -109,12 +109,21 @@
                 </el-tooltip>
               </el-select>
             </el-form-item>
-            <el-form-item label="继电器类型" label-width="1rem">
-              <el-radio-group v-model="form.hardwareType" @change="radioChange">
-                <el-radio :label="item.value" :key="item.value" v-for="(item,index) in hardwardTypeList">{{item.label}}</el-radio>
-              </el-radio-group>
+<!--            <el-form-item label="继电器类型" label-width="1rem">-->
+<!--              <el-radio-group v-model="form.hardwareType" @change="radioChange">-->
+<!--                <el-radio :label="item.value" :key="item.value" v-for="(item,index) in hardwardTypeList">{{item.label}}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+            <el-form-item label="继电器类型" prop="relayCode">
+              <el-select v-model="form.hardwareType" placeholder="请选择继电器" clearable @change="radioChange" @clear="loadClear">
+                <el-option v-for="relay in hardwardTypeList"
+                           :key="relay.value"
+                           :label="relay.label"
+                           :value="relay.value">
+                </el-option>
+              </el-select>
             </el-form-item>
-            <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1">
+            <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1 || form.hardwareType==3">
               <el-select v-model="form.relayCode" placeholder="请选择继电器" clearable @change="loadRelayNum" @clear="loadClear">
                 <el-option v-for="relay in relayList"
                            :key="relay.code"
@@ -277,7 +286,8 @@
         ],
         hardwardTypeList:[
           {value:1,label:"老继电器"},
-          {value:2,label:"新继电器"}
+          {value:2,label:"新继电器"},
+          {value:3,label:"泥人继电器"}
         ],
         mtopic:"lab/hardware/data",
         //mqtt发送id数组
@@ -531,7 +541,23 @@
           }
           list.push(obj);
         }
-        this.relayNumList = list;
+
+        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},
+          ]
+        }else{
+          this.relayNumList = list;
+        }
       },
       loadHardware(){
         let self = this;

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

@@ -88,17 +88,26 @@
                 </el-tooltip>
               </el-select>
             </el-form-item>
-            <el-form-item label="继电器类型" label-width="1rem" @change="radioChange">
-              <el-radio-group v-model="form.hardwareType">
-                <el-radio :label="item.value" :key="item.value" v-for="item in hardwardTypeList">{{item.label}}</el-radio>
-              </el-radio-group>
+<!--            <el-form-item label="继电器类型" label-width="1rem" @change="radioChange">-->
+<!--              <el-radio-group v-model="form.hardwareType">-->
+<!--                <el-radio :label="item.value" :key="item.value" v-for="item in hardwardTypeList">{{item.label}}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+            <el-form-item label="继电器类型" prop="relayCode">
+              <el-select v-model="form.hardwareType" placeholder="请选择继电器" clearable @change="radioChange" @clear="loadClear">
+                <el-option v-for="relay in hardwardTypeList"
+                           :key="relay.value"
+                           :label="relay.label"
+                           :value="relay.value">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="通风类型" label-width="1rem">
               <el-radio-group v-model="form.pcType">
                 <el-radio :label="item.value" :key="item.value" v-for="item in hardwardTypeListOne">{{item.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1">
+            <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1 || form.hardwareType==3">
               <el-select v-model="form.relayCode" placeholder="请选择继电器" clearable @change="loadRelayNum" @clear="loadClear">
                 <el-option v-for="relay in relayList"
                            :key="relay.code"
@@ -252,7 +261,8 @@
         ],
         hardwardTypeList:[
           {value:1,label:"老继电器"},
-          {value:2,label:"新继电器"}
+          {value:2,label:"新继电器"},
+          {value:3,label:"泥人继电器"}
         ],
         hardwardTypeListOne:[
           {value:0,label:"排风扇"},
@@ -513,7 +523,22 @@
           }
           list.push(obj);
         }
-        this.relayNumList = list;
+        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},
+          ]
+        }else{
+          this.relayNumList = list;
+        }
       },
       loadHardware(){
         let self = this;