Selaa lähdekoodia

Merge remote-tracking branch 'remotes/origin/3.3.3-AnQuanJianCha' into web-v2-temp

dedsudiyu 1 vuosi sitten
vanhempi
commit
411e716c41

+ 6 - 5
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">
@@ -207,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">
@@ -505,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 +588,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 +661,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){

+ 1 - 0
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">

+ 4 - 1
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -153,6 +153,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_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'">
@@ -1009,7 +1010,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]);
+              }
             }
           }
         }

+ 47 - 7
src/views/emergencyManagement/smartLoT/hardware/powerControl.vue

@@ -111,12 +111,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"
@@ -279,7 +288,8 @@
         ],
         hardwardTypeList:[
           {value:1,label:"老继电器"},
-          {value:2,label:"新继电器"}
+          {value:2,label:"新继电器"},
+          {value:3,label:"泥人继电器"}
         ],
         mtopic:"lab/hardware/data",
         //mqtt发送id数组
@@ -304,6 +314,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},
+          ]
         }
       },
       // 开启关闭验证
@@ -533,7 +556,24 @@
           }
           list.push(obj);
         }
-        this.relayNumList = list;
+        console.log(list)
+        if(list.length>0){
+          this.relayNumList = list;
+        }else{
+          this.relayNumList =[
+            {name:1},
+            {name:2},
+            {name:3},
+            {name:4},
+            {name:5},
+            {name:6},
+            {name:7},
+            {name:8},
+            {name:9},
+            {name:10},
+          ]
+        }
+
       },
       loadHardware(){
         let self = this;

+ 46 - 7
src/views/emergencyManagement/smartLoT/hardware/smartVentilation.vue

@@ -90,17 +90,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"
@@ -254,7 +263,8 @@
         ],
         hardwardTypeList:[
           {value:1,label:"老继电器"},
-          {value:2,label:"新继电器"}
+          {value:2,label:"新继电器"},
+          {value:3,label:"泥人继电器"}
         ],
         hardwardTypeListOne:[
           {value:0,label:"排风扇"},
@@ -286,6 +296,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){
@@ -515,7 +538,23 @@
           }
           list.push(obj);
         }
-        this.relayNumList = list;
+        console.log(this.relayNumList)
+        if(list.length>0){
+          this.relayNumList = list;
+        }else{
+          this.relayNumList =[
+            {name:1},
+            {name:2},
+            {name:3},
+            {name:4},
+            {name:5},
+            {name:6},
+            {name:7},
+            {name:8},
+            {name:9},
+            {name:10},
+          ]
+        }
       },
       loadHardware(){
         let self = this;