diff --git a/api/driverapi.js b/api/driverapi.js
index 01df2de..40303e9 100644
--- a/api/driverapi.js
+++ b/api/driverapi.js
@@ -50,6 +50,7 @@ let api = {
readControl_innercurtain: '/readControl/innercurtain', //内遮阳
readControl_externalsunshade: '/readControl/externalsunshade', //外遮阳
readControl_readskylight: '/readControl/readskylight', //通风窗
+ readControl_airconditioner: '/readControl/airconditioner', //通风窗
readControl_highpressuremist: '/readControl/highpressuremist', //读取（高压微雾）控制器
camera_gethls: '/camera/gethls', //获取摄像头得地址
diff --git a/pages/controller/controller.vue b/pages/controller/controller.vue
index f189910..884ccf3 100644
--- a/pages/controller/controller.vue
+++ b/pages/controller/controller.vue
@@ -262,7 +262,48 @@
-
+
+
+
+
+
+
+ {{ airconditioning.name }}
+
+
+ 设置
+
+
+
+
+
+
+
+
+ 自动控制
+
+
+
+
+ 手机控制
+
+
+
+
+
+
+
+ {{airconditioning.open == 1 ? '打开' : '关闭'}}
+
+
+
+
+
+ 当前设备无效
+
+
+
+
@@ -1067,7 +1108,42 @@
-
+
+
+
+
+
+
+ {{ airconditioning.name}}
+
+
+
+
+ 控制模式:
+
+
+
+ 自动运行
+
+
+ 手动打开
+
+
+ 手动关闭
+
+
+
+
+
+ 修改更多参数
+
+
+
+
@@ -1811,7 +1887,11 @@
{name:'3#立面保温',upFaceInsulationState:0,progress:0,statusProgress:0},
{name:'4#立面保温',upFaceInsulationState:0,progress:0,statusProgress:0},
],
- upFaceInsulationName:''
+ upFaceInsulationName:'',
+
+ airconditioningShow:false,//湿空调
+ airconditioningControlIndex:0,
+ airconditioning:{name:'空调',airconditioningState:0,open:0},
};
},
onReady(){
@@ -2048,6 +2128,16 @@
this.changeBtn(21470, dataNum);
}
},
+ // 空调
+ changeairconditioningControl(index){
+ this.airconditioningControlIndex = index;
+ let dataNum = {
+ target: {
+ value: this.airconditioningControlIndex,
+ },
+ };
+ this.changeBtn(22040, dataNum);
+ },
// 湿帘泵
changefanwetcurtainControl(index){
@@ -2290,6 +2380,9 @@
})
}
})
+ }else if(el.id=='28'){
+ //空调
+ this.airconditioning.name=el.nickName
}else if(el.id=='21'){
//环流风扇
this.circulationFengshanList=this.toNewList(this.circulationFengshanList,el.child)
@@ -2489,7 +2582,12 @@
el.open = res.data[1081 + index * 2];
})
};
-
+ // 空调
+ if(this.purviewList.indexOf('28') != -1){
+ this.airconditioning.airconditioningState=res.data['1160']
+ this.airconditioning.open=res.data['1161']
+
+ };
// 高压微雾
if(this.purviewList.indexOf('23') != -1){
this.highpressuremistList.forEach((el,index)=>{
@@ -2736,7 +2834,23 @@
}
})
},
-
+ // 空调弹框
+ airconditioningHander(index){
+ this.airconditioningControlIndex = 0;
+ this.popfanwetcurtainName = index;
+ var deviceId = this.deviceId
+ this.airconditioningShow=true;
+ this.$http({
+ url:this.api.readControl_airconditioner + '?deviceId=' + deviceId,
+ method: 'GET'
+ }).then(res => {
+ if (res.code == 200) {
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ this.airconditioningControlIndex = res.data[22040];
+ }
+ })
+ },
// 高压微雾
highpressuremistHander(index){
this.highpressuremistControlIndex = 0;