diff --git a/api/driverapi.js b/api/driverapi.js
index 40303e9..56a7926 100644
--- a/api/driverapi.js
+++ b/api/driverapi.js
@@ -46,6 +46,7 @@ let api = {
readControl_readfilllight: '/readControl/readfilllight', //读取（补光灯）控制器
readControl_readcirculationfan: '/readControl/readcirculationfan', //读取（环流风扇）控制器
readControl_fanwetcurtain: '/readControl/fanwetcurtain', //读取（风机湿帘）控制器
+ readControl_co2replenishment: '/readControl/co2replenishment', //读取CO2控制器
readControl_innercurtain: '/readControl/innercurtain', //内遮阳
readControl_externalsunshade: '/readControl/externalsunshade', //外遮阳
diff --git a/pages/controller/controller.vue b/pages/controller/controller.vue
index 884ccf3..69e9e8d 100644
--- a/pages/controller/controller.vue
+++ b/pages/controller/controller.vue
@@ -346,7 +346,48 @@
-
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ 设置
+
+
+
+
+
+
+
+
+ 自动控制
+
+
+
+
+ 手机控制
+
+
+
+
+
+
+
+ {{item.open == 1 ? '打开' : '关闭'}}
+
+
+
+
+
+ 当前设备无效
+
+
+
+
@@ -1144,6 +1185,41 @@
+
+
+
+
+
+ {{ CO2List[popCO2Name].name}}
+
+
+
+
+ 控制模式:
+
+
+
+ 自动运行
+
+
+ 手动打开
+
+
+ 手动关闭
+
+
+
+
+
+ 修改更多参数
+
+
+
+
@@ -1827,6 +1903,15 @@
],
popfanwetcurtainName:'',
+ CO2Show:false,//CO2补气
+ CO2Index:0,
+ CO2List:[
+ {name:'CO2补气1',CO2State:0,open:0},
+ {name:'CO2补气2',CO2State:0,open:0},
+ ],
+ popCO2Name:'',
+
+
highpressuremistShow:false,//高压微雾
highpressuremistControlIndex:0,
highpressuremistList:[
@@ -2139,6 +2224,20 @@
this.changeBtn(22040, dataNum);
},
+ // CO2补气
+ changeCO2Control(index){
+ this.CO2Index = index;
+ let dataNum = {
+ target: {
+ value: this.CO2Index,
+ },
+ };
+ if(this.popCO2Name == 0){
+ this.changeBtn(22360, dataNum);
+ }else if(this.popCO2Name == 1){
+ this.changeBtn(22378, dataNum);
+ }
+ },
// 湿帘泵
changefanwetcurtainControl(index){
this.fanwetcurtainControlIndex = index;
@@ -2343,7 +2442,6 @@
uni.stopPullDownRefresh();
res.data.forEach((el, index) => {
this.purviewList.push(el.id.toString())
-
if(el.id=='19'){
//通风窗
this.airWindowList=this.toNewList(this.airWindowList,el.child)
@@ -2357,6 +2455,9 @@
}else if(el.id=='27'){
//内保温
this.interiorthermalinsulationList=this.toNewList(this.interiorthermalinsulationList,el.child)
+ }else if(el.id=='30'){
+ //立面保温
+ this.CO2List=this.toNewList(this.CO2List,el.child)
}else if(el.id=='29'){
//立面保温
this.upFaceInsulationList=this.toNewList(this.upFaceInsulationList,el.child)
@@ -2574,7 +2675,13 @@
openListNew = standardnum1.split("")
this.standardFanStatus.status = openListNew.reverse()
};
-
+ // CO2补气
+ if(this.purviewList.indexOf('30') != -1){
+ this.CO2List.forEach((el,index)=>{
+ el.CO2State = res.data[1178 + index * 2];
+ el.open = res.data[1179 + index * 2];
+ })
+ };
// 湿帘泵
if(this.purviewList.indexOf('26') != -1){
this.fanwetcurtainList.forEach((el,index)=>{
@@ -2816,7 +2923,23 @@
}
})
},
-
+ // CO2补气弹框
+ CO2Hander(index){
+ this.CO2Index = 0;
+ this.popCO2Name = index;
+ var deviceId = this.deviceId
+ this.CO2Show=true;
+ this.$http({
+ url:this.api.readControl_co2replenishment + '?deviceId=' + deviceId,
+ method: 'GET'
+ }).then(res => {
+ if (res.code == 200) {
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ this.CO2Index = res.data[21970 + index * 2];
+ }
+ })
+ },
// 湿帘泵弹框
fanwetcurtainHander(index){
this.fanwetcurtainControlIndex = 0;