diff --git a/api/driverapi.js b/api/driverapi.js
index 56a7926..a6b20db 100644
--- a/api/driverapi.js
+++ b/api/driverapi.js
@@ -43,6 +43,7 @@ let api = {
readControl_solenoidValve7: '/readControl/solenoidValve7', //7#电磁阀
readControl_solenoidValve8: '/readControl/solenoidValve8', //8#电磁阀
+ readControl_heatfan: '/readControl/heatfan', //读取（补光灯）控制器
readControl_readfilllight: '/readControl/readfilllight', //读取（补光灯）控制器
readControl_readcirculationfan: '/readControl/readcirculationfan', //读取（环流风扇）控制器
readControl_fanwetcurtain: '/readControl/fanwetcurtain', //读取（风机湿帘）控制器
diff --git a/pages/controller/controller.vue b/pages/controller/controller.vue
index 69e9e8d..96c5cde 100644
--- a/pages/controller/controller.vue
+++ b/pages/controller/controller.vue
@@ -676,7 +676,77 @@
-
+
+
+
+
+
+ {{coldWarmFanStatus.name}}
+
+
+ 设置
+
+
+
+
+
+
+
+
+ 自动控制
+
+
+
+
+ 手机控制
+
+
+
+
+
+
+ 加热模式
+
+
+
+
+ 制冷模式
+
+
+
+
+
+
+
+ 1#通道
+
+
+
+
+
+ 2#通道
+
+
+
+
+
+ 3#通道
+
+
+
+
+
+ 4#通道
+
+
+
+
+
+
+ 当前设备无效
+
+
+
@@ -1046,7 +1116,60 @@
-
+
+
+
+
+
+ 冷暖风机
+
+
+
+
+ 控制模式:
+
+
+
+ 自动运行
+
+
+ 手动启动
+
+
+ 手动关闭
+
+
+
+
+ 手动打开时冷暖风机启动
+
+
+
+ 1#通道
+
+
+ 2#通道
+
+
+ 3#通道
+
+
+ 4#通道
+
+
+
+
+
+ 修改更多参数
+
+
+
+
+
@@ -1886,6 +2009,16 @@
},
actListLight:[],
+ coldWarmFanShow:false,//冷暖风机
+ coldWarmFanIndex:0,
+ coldWarmFanStatus: {
+ name: '冷暖风机',
+ open: 0,
+ open1: 0,
+ status: []
+ },
+ coldWarmFanList:[],
+
circulationFengshanShow:false,//环流风扇
circulationControlIndex:0,
@@ -2465,6 +2598,10 @@
//补光灯
this.supplementLightStatus.name=el.nickName
+ }else if(el.id=='31'){
+ //冷暖风机
+ this.coldWarmFanStatus.name=el.nickName
+
}else if(el.id=='26'){
//风机/湿帘泵/湿帘外翻窗
el.child.forEach((el1,index1)=>{
@@ -2645,7 +2782,17 @@
});
console.log(this.fiveControlList,'this.fiveControlList');
}
-
+ // 冷暖风机状态值获取
+ if(this.purviewList.indexOf('31') != -1){
+ this.coldWarmFanStatus.open = res.data[1175];
+ this.coldWarmFanStatus.open1 = res.data[1176];
+ this.coldWarmFanStatus.status = [];
+ let numLight = res.data[1177];
+ let numLight1 = this.padString(numLight.toString(2),4);
+ let openListNew = [];
+ openListNew = numLight1.split('')
+ this.coldWarmFanStatus.status = openListNew.reverse()
+ };
// 补光灯状态值获取
if(this.purviewList.indexOf('20') != -1){
this.supplementLightStatus.open = res.data[1068];
@@ -2882,7 +3029,28 @@
}
})
},
-
+ // 冷暖风机
+ coldWarmFanHander(){
+ var deviceId = this.deviceId;
+ this.coldWarmFanShow = true;
+ this.$http({
+ url:this.api.readControl_heatfan + '?deviceId=' + deviceId,
+ method: 'GET'
+ }).then(res => {
+ if (res.code == 200) {
+ // console.log(res,'补光灯');
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ this.coldWarmFanIndex = res.data[22250];
+ this.coldWarmFanList = []
+ let numLight = res.data[22251];
+ let numLight1 = this.padString(numLight.toString(2),4);
+ let openListNew = [];
+ openListNew = numLight1.split('')
+ this.coldWarmFanList = openListNew.reverse()
+ }
+ })
+ },
// 补光灯
supplementLightHander(){
var deviceId = this.deviceId;
@@ -3292,6 +3460,9 @@