新增通风窗56和立面保温1234

api/driverapi.js

@@ -63,6 +63,8 @@ let api = {
 	
 	readControl_interiorthermalinsulation:'/readControl/interiorthermalinsulation',//读取（内保温）控制器 
 	
+	readControl_facadeinsulation:'/readControl/facadeinsulation',//读取（立面保温）控制器
+	
 	equip_chartdata:'/equip/chartdata',//气象站实时数据折线图
 	
 	camera_start:'/camera/start',//摄像头开始

pages/controller/controller.vue

@@ -681,6 +681,45 @@
 			</template>
 		</view>
 		
+		<!-- 立面保温 -->
+		<view class="content" v-if="purviewList.indexOf('29')!=-1">
+			<template v-for="(item,index) in upFaceInsulationList">
+				<view class="lishui-item" v-show="item.upFaceInsulationState != 0" :key="index">
+					<view class="lishui-title">
+						<view class="title-left">
+							{{ item.name }}
+						</view>
+						<view class="title-right" @click="upFaceInsulationHander(index)">
+							设置
+							<image src="../../static/set-arrow.png" mode=""></image>
+						</view>
+					</view>
+					<view class="lishui-content" v-if="item.upFaceInsulationState != 0">
+						<view class="lishui-set">
+							<view class="set-1">
+								<image v-if="item.upFaceInsulationState == 1" class="sel" src="../../static/sel.png" mode=""></image>
+								<view v-else class="sel-no"></view>
+								<span>自动控制</span>
+							</view>
+							<view class="set-2">
+								<image v-if="item.upFaceInsulationState != 1" class="sel" src="../../static/sel.png" mode=""></image>
+								<view v-else class="sel-no"></view>
+								<span>手机控制</span>
+							</view>
+						</view>
+						<view class="lishui-status">
+							{{ getNumberStatus(item.statusProgress) }}:
+							<span :style="item.statusProgress != 1 ? 'color:#FF6C6C' : '#24B383'">{{ item.progress }}%</span>
+						</view>
+					</view>
+					<view v-else class="status-noTrue">
+						<image src="../../static/noTrue.png" mode=""></image>
+						<span>当前设备无效</span>
+					</view>
+				</view>
+			</template>
+		</view>
+		
 		<!-- *#电磁阀 -->
 		<view class="content">
 			<template v-for="(item,index) in electronMagneticStatus">
@@ -1299,6 +1338,45 @@
 			</view>
 		</u-popup>
 		
+		<!-- 立面保温 -->
+		<u-popup v-model="upFaceInsulationShow" mode="center" :mask-close-able='true' width="640rpx" height="454rpx"
+			:closeable='false'>
+			<view class="contentPop lishui-item">
+				<view class="contentPop_box">
+					<view class="title">
+						{{ (upFaceInsulationName + 1)+"#立面保温" }}
+					</view>
+				</view>
+				<view class="lishui-content">
+					<view class="model-title">
+						控制模式:
+					</view>
+					<view class="lishui-flex">
+						<view class="btn btn-140 " @click="changeUpFaceInsulationControl(1)"
+							:class="upFaceInsulationIndex==1?'btn-on':'btn-off'">
+							<span style="font-size: 28rpx;">自动运行</span>
+						</view>
+						<view class="btn btn-140 " @click="changeUpFaceInsulationControl(2)"
+							:class="upFaceInsulationIndex==2?'btn-on':'btn-off'">
+							<span style="font-size: 28rpx;">手动打开</span>
+						</view>
+						<view class="btn btn-140 " @click="changeUpFaceInsulationControl(3)"
+							:class="upFaceInsulationIndex==3?'btn-on':'btn-off'">
+							<span style="font-size: 28rpx;">手动关闭</span>
+						</view>
+						<view class="btn btn-110 " @click="changeUpFaceInsulationControl(4)"
+							:class="upFaceInsulationIndex==4?'btn-on':'btn-off'">
+							<span style="font-size: 28rpx;">停止</span>
+						</view>
+					</view>
+				</view>
+				<view class="changeMoreBtn" @click="toWebView('facadeInsulation')">
+					<image src="../../static/changeMore.png" mode=""></image>
+					<text>修改更多参数</text>
+				</view>
+				<image src="../../static/closed.png" mode="" @click="upFaceInsulationShow=false"></image>
+			</view>
+		</u-popup>
 		
 
 		<view class="content" v-if="!purviewList.length" style="text-align: center;">
@@ -1710,6 +1788,8 @@
 					{name:'2#通风窗',airWindowState:0,progress:0,statusProgress:0,pid:0},
 					{name:'3#通风窗',airWindowState:0,progress:0,statusProgress:0,pid:0},
 					{name:'4#通风窗',airWindowState:0,progress:0,statusProgress:0,pid:0},
+					{name:'5#通风窗',airWindowState:0,progress:0,statusProgress:0,pid:0},
+					{name:'6#通风窗',airWindowState:0,progress:0,statusProgress:0,pid:0},
 				],
 				popairWindowName:'',
 				
@@ -1719,7 +1799,17 @@
 					{name:'1#内保温',interiorthermalinsulationState:0,progress:0,statusProgress:0},
 					{name:'2#内保温',interiorthermalinsulationState:0,progress:0,statusProgress:0},
 				],
-				interiorthermalinsulationName:''
+				interiorthermalinsulationName:'',
+				
+				upFaceInsulationShow:false,//立面保温
+				upFaceInsulationIndex:0,
+				upFaceInsulationList:[
+					{name:'1#立面保温',upFaceInsulationState:0,progress:0,statusProgress:0},
+					{name:'2#立面保温',upFaceInsulationState:0,progress:0,statusProgress:0},
+					{name:'3#立面保温',upFaceInsulationState:0,progress:0,statusProgress:0},
+					{name:'4#立面保温',upFaceInsulationState:0,progress:0,statusProgress:0},
+				],
+				upFaceInsulationName:''
 			};
 		},
 		onReady(){
@@ -2048,6 +2138,10 @@
 					this.changeBtn(21296, dataNum);
 				}else if(this.popairWindowName == 3){
 					this.changeBtn(21319, dataNum);
+				}else if(this.popairWindowName == 4){
+					this.changeBtn(21342, dataNum);
+				}else if(this.popairWindowName == 5){
+					this.changeBtn(21365, dataNum);
 				}
 			},
 			
@@ -2066,6 +2160,25 @@
 				}
 			},
 			
+			// 立面保温
+			changeUpFaceInsulationControl(index){
+				this.upFaceInsulationIndex = index;
+				let dataNum = {
+					target: {
+						value: this.upFaceInsulationIndex,
+					},
+				};
+				if(this.upFaceInsulationName == 0){
+					this.changeBtn(22300, dataNum);
+				}else if(this.upFaceInsulationName == 1){
+					this.changeBtn(22313, dataNum);
+				}else if(this.upFaceInsulationName == 2){
+					this.changeBtn(22326, dataNum);
+				}else if(this.upFaceInsulationName == 3){
+					this.changeBtn(22339, dataNum);
+				}
+			},
+
 
 			changeBtn(code, el) {
 
@@ -2352,10 +2465,22 @@
 						//通风窗
 						if(this.purviewList.indexOf('19') != -1){
 							this.airWindowList.forEach((el,index)=>{
-								el.airWindowState = res.data[1102 + index * 3];
+								if(el.name == '5#通风窗'){
-								el.progress = res.data[1104 + index * 3];
+									el.airWindowState = res.data[1188];
-								el.statusProgress = res.data[1103 + index * 3]
+									el.progress = res.data[1190];
-								el.pid = res.data[1115 + index]
+									el.statusProgress = res.data[1189]
+									el.pid = res.data[1194]
+								}else if(el.name == '6#通风窗'){
+									el.airWindowState = res.data[1191];
+									el.progress = res.data[1193];
+									el.statusProgress = res.data[1192]
+									el.pid = res.data[1195]
+								}else{
+									el.airWindowState = res.data[1102 + index * 3];
+									el.progress = res.data[1104 + index * 3];
+									el.statusProgress = res.data[1103 + index * 3]
+									el.pid = res.data[1115 + index]
+								}
 							})
 						};
 						
@@ -2368,6 +2493,15 @@
 							})
 						};
 						
+						// 立面保温
+						if(this.purviewList.indexOf('29') != -1){
+							this.upFaceInsulationList.forEach((el,index)=>{
+								el.upFaceInsulationState = res.data[1196 + index * 3];
+								el.progress = res.data[1198 + index * 3];
+								el.statusProgress = res.data[1197 + index * 3]
+							})
+						};
+						
 						
 						// 电磁阀
 						for(let t=0;t<this.electronMagneticStatus.length;t++){
@@ -2647,6 +2781,24 @@
 				})
 			},
 			
+			//立面保温
+			upFaceInsulationHander(index){
+				this.upFaceInsulationIndex = 0;
+				this.upFaceInsulationName = index;
+				var deviceId = this.deviceId;
+				this.upFaceInsulationShow = true;
+				this.$http({
+					url:this.api.readControl_facadeinsulation + '?deviceId=' + deviceId,
+					method: 'GET'
+				}).then(res => {
+					if (res.code == 200) {
+						uni.hideLoading();
+						uni.stopPullDownRefresh();
+						this.upFaceInsulationIndex = res.data[22300 + index * 13];
+					}
+				})
+			},
+
 			getNumberStatus(index) {
 				if (index == 0) {
 					return '静止状态'

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.wxml

@@ -1 +1 @@
-<view class="{{['u-form-item','data-v-5e7216f1',(elBorderBottom)?'u-border-bottom':'',($root.m0)?'u-form-item__border-bottom--error':'']}}"><view class="u-form-item__body data-v-5e7216f1" style="{{'flex-direction:'+(elLabelPosition=='left'?'row':'column')+';'}}"><view class="u-form-item--left data-v-5e7216f1" style="{{'width:'+(uLabelWidth)+';'+('flex:'+('0 0 '+uLabelWidth)+';')+('margin-bottom:'+(elLabelPosition=='left'?0:'10rpx')+';')}}"><block wx:if="{{required||leftIcon||label}}"><view class="u-form-item--left__content data-v-5e7216f1"><block wx:if="{{required}}"><text class="u-form-item--left__content--required data-v-5e7216f1">*</text></block><block wx:if="{{leftIcon}}"><view class="u-form-item--left__content__icon data-v-5e7216f1"><u-icon vue-id="18e78603-1" name="{{leftIcon}}" custom-style="{{leftIconStyle}}" class="data-v-5e7216f1" bind:__l="__l"></u-icon></view></block><view class="u-form-item--left__content__label data-v-5e7216f1" style="{{$root.s0}}">{{''+label+''}}</view></view></block></view><view class="u-form-item--right u-flex data-v-5e7216f1"><view class="u-form-item--right__content data-v-5e7216f1"><view class="u-form-item--right__content__slot  data-v-5e7216f1"><slot></slot></view><block wx:if="{{$slots.right||rightIcon}}"><view class="u-form-item--right__content__icon u-flex data-v-5e7216f1"><block wx:if="{{rightIcon}}"><u-icon vue-id="18e78603-2" custom-style="{{rightIconStyle}}" name="{{rightIcon}}" class="data-v-5e7216f1" bind:__l="__l"></u-icon></block><slot name="right"></slot></view></block></view></view></view><block wx:if="{{$root.m1}}"><view class="u-form-item__message data-v-5e7216f1" style="{{'padding-left:'+(elLabelPosition=='left'?$root.g0:'0')+';'}}">{{validateMessage}}</view></block></view>
+<view class="{{['u-form-item','data-v-5e7216f1',(elBorderBottom)?'u-border-bottom':'',($root.m0)?'u-form-item__border-bottom--error':'']}}"><view class="u-form-item__body data-v-5e7216f1" style="{{'flex-direction:'+(elLabelPosition=='left'?'row':'column')+';'}}"><view class="u-form-item--left data-v-5e7216f1" style="{{'width:'+(uLabelWidth)+';'+('flex:'+('0 0 '+uLabelWidth)+';')+('margin-bottom:'+(elLabelPosition=='left'?0:'10rpx')+';')}}"><block wx:if="{{required||leftIcon||label}}"><view class="u-form-item--left__content data-v-5e7216f1"><block wx:if="{{required}}"><text class="u-form-item--left__content--required data-v-5e7216f1">*</text></block><block wx:if="{{leftIcon}}"><view class="u-form-item--left__content__icon data-v-5e7216f1"><u-icon vue-id="18e78603-1" name="{{leftIcon}}" custom-style="{{leftIconStyle}}" class="data-v-5e7216f1" bind:__l="__l"></u-icon></view></block><view class="u-form-item--left__content__label data-v-5e7216f1" style="{{$root.s0}}">{{''+label+''}}</view></view></block></view><view class="u-form-item--right u-flex data-v-5e7216f1"><view class="u-form-item--right__content data-v-5e7216f1"><view class="u-form-item--right__content__slot data-v-5e7216f1"><slot></slot></view><block wx:if="{{$slots.right||rightIcon}}"><view class="u-form-item--right__content__icon u-flex data-v-5e7216f1"><block wx:if="{{rightIcon}}"><u-icon vue-id="18e78603-2" custom-style="{{rightIconStyle}}" name="{{rightIcon}}" class="data-v-5e7216f1" bind:__l="__l"></u-icon></block><slot name="right"></slot></view></block></view></view></view><block wx:if="{{$root.m1}}"><view class="u-form-item__message data-v-5e7216f1" style="{{'padding-left:'+(elLabelPosition=='left'?$root.g0:'0')+';'}}">{{validateMessage}}</view></block></view>

unpackage/dist/dev/mp-weixin/pages/controller/controller.js

@@ -259,15 +259,30 @@ var render = function () {
           }
         })
       : null
-  var l8 = _vm.__map(_vm.electronMagneticStatus, function (item, index) {
+  var g13 = _vm.purviewList.indexOf("29")
+  var l8 =
+    g13 != -1
+      ? _vm.__map(_vm.upFaceInsulationList, function (item, index) {
+          var $orig = _vm.__get_orig(item)
+          var m11 =
+            item.upFaceInsulationState != 0
+              ? _vm.getNumberStatus(item.statusProgress)
+              : null
+          return {
+            $orig: $orig,
+            m11: m11,
+          }
+        })
+      : null
+  var l9 = _vm.__map(_vm.electronMagneticStatus, function (item, index) {
     var $orig = _vm.__get_orig(item)
-    var g13 = _vm.purviewList.indexOf((index + 11).toString())
+    var g14 = _vm.purviewList.indexOf((index + 11).toString())
     return {
       $orig: $orig,
-      g13: g13,
+      g14: g14,
     }
   })
-  var g14 = _vm.purviewList.length
+  var g15 = _vm.purviewList.length
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
       _vm.fiveControlShow = false
@@ -311,6 +326,9 @@ var render = function () {
     _vm.e13 = function ($event) {
       _vm.interiorthermalinsulationShow = false
     }
+    _vm.e14 = function ($event) {
+      _vm.upFaceInsulationShow = false
+    }
   }
   _vm.$mp.data = Object.assign(
     {},
@@ -337,8 +355,10 @@ var render = function () {
         l6: l6,
         g12: g12,
         l7: l7,
+        g13: g13,
         l8: l8,
-        g14: g14,
+        l9: l9,
+        g15: g15,
       },
     }
   )
@@ -1694,6 +1714,84 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -2139,6 +2237,18 @@ var _default = {
         progress: 0,
         statusProgress: 0,
         pid: 0
+      }, {
+        name: '5#通风窗',
+        airWindowState: 0,
+        progress: 0,
+        statusProgress: 0,
+        pid: 0
+      }, {
+        name: '6#通风窗',
+        airWindowState: 0,
+        progress: 0,
+        statusProgress: 0,
+        pid: 0
       }],
       popairWindowName: '',
       interiorthermalinsulationShow: false,
@@ -2155,7 +2265,32 @@ var _default = {
         progress: 0,
         statusProgress: 0
       }],
-      interiorthermalinsulationName: ''
+      interiorthermalinsulationName: '',
+      upFaceInsulationShow: false,
+      //立面保温
+      upFaceInsulationIndex: 0,
+      upFaceInsulationList: [{
+        name: '1#立面保温',
+        upFaceInsulationState: 0,
+        progress: 0,
+        statusProgress: 0
+      }, {
+        name: '2#立面保温',
+        upFaceInsulationState: 0,
+        progress: 0,
+        statusProgress: 0
+      }, {
+        name: '3#立面保温',
+        upFaceInsulationState: 0,
+        progress: 0,
+        statusProgress: 0
+      }, {
+        name: '4#立面保温',
+        upFaceInsulationState: 0,
+        progress: 0,
+        statusProgress: 0
+      }],
+      upFaceInsulationName: ''
     };
   },
   onReady: function onReady() {
@@ -2470,6 +2605,10 @@ var _default = {
         this.changeBtn(21296, dataNum);
       } else if (this.popairWindowName == 3) {
         this.changeBtn(21319, dataNum);
+      } else if (this.popairWindowName == 4) {
+        this.changeBtn(21342, dataNum);
+      } else if (this.popairWindowName == 5) {
+        this.changeBtn(21365, dataNum);
       }
     },
     // 内保温
@@ -2486,6 +2625,24 @@ var _default = {
         this.changeBtn(22012, dataNum);
       }
     },
+    // 立面保温
+    changeUpFaceInsulationControl: function changeUpFaceInsulationControl(index) {
+      this.upFaceInsulationIndex = index;
+      var dataNum = {
+        target: {
+          value: this.upFaceInsulationIndex
+        }
+      };
+      if (this.upFaceInsulationName == 0) {
+        this.changeBtn(22300, dataNum);
+      } else if (this.upFaceInsulationName == 1) {
+        this.changeBtn(22313, dataNum);
+      } else if (this.upFaceInsulationName == 2) {
+        this.changeBtn(22326, dataNum);
+      } else if (this.upFaceInsulationName == 3) {
+        this.changeBtn(22339, dataNum);
+      }
+    },
     changeBtn: function changeBtn(code, el) {
       var data = {
         equipmentId: this.deviceId,
@@ -2772,10 +2929,22 @@ var _default = {
           //通风窗
           if (_this7.purviewList.indexOf('19') != -1) {
             _this7.airWindowList.forEach(function (el, index) {
-              el.airWindowState = res.data[1102 + index * 3];
+              if (el.name == '5#通风窗') {
-              el.progress = res.data[1104 + index * 3];
+                el.airWindowState = res.data[1188];
-              el.statusProgress = res.data[1103 + index * 3];
+                el.progress = res.data[1190];
-              el.pid = res.data[1115 + index];
+                el.statusProgress = res.data[1189];
+                el.pid = res.data[1194];
+              } else if (el.name == '6#通风窗') {
+                el.airWindowState = res.data[1191];
+                el.progress = res.data[1193];
+                el.statusProgress = res.data[1192];
+                el.pid = res.data[1195];
+              } else {
+                el.airWindowState = res.data[1102 + index * 3];
+                el.progress = res.data[1104 + index * 3];
+                el.statusProgress = res.data[1103 + index * 3];
+                el.pid = res.data[1115 + index];
+              }
             });
           }
           ;
@@ -2790,6 +2959,16 @@ var _default = {
           }
           ;
 
+          // 立面保温
+          if (_this7.purviewList.indexOf('29') != -1) {
+            _this7.upFaceInsulationList.forEach(function (el, index) {
+              el.upFaceInsulationState = res.data[1196 + index * 3];
+              el.progress = res.data[1198 + index * 3];
+              el.statusProgress = res.data[1197 + index * 3];
+            });
+          }
+          ;
+
           // 电磁阀
           for (var t = 0; t < _this7.electronMagneticStatus.length; t++) {
             _this7.electronMagneticStatus[t].status = res.data[1166 + t];
@@ -3063,6 +3242,24 @@ var _default = {
         }
       });
     },
+    //立面保温
+    upFaceInsulationHander: function upFaceInsulationHander(index) {
+      var _this21 = this;
+      this.upFaceInsulationIndex = 0;
+      this.upFaceInsulationName = index;
+      var deviceId = this.deviceId;
+      this.upFaceInsulationShow = true;
+      this.$http({
+        url: this.api.readControl_facadeinsulation + '?deviceId=' + deviceId,
+        method: 'GET'
+      }).then(function (res) {
+        if (res.code == 200) {
+          uni.hideLoading();
+          uni.stopPullDownRefresh();
+          _this21.upFaceInsulationIndex = res.data[22300 + index * 13];
+        }
+      });
+    },
     getNumberStatus: function getNumberStatus(index) {
       if (index == 0) {
         return '静止状态';
@@ -3185,7 +3382,7 @@ var _default = {
       this.delayTimer(0, data);
     },
     delayTimer: function delayTimer(i, data) {
-      var _this21 = this;
+      var _this22 = this;
       var that = this;
       //整体接口
       var j = 5;
@@ -3195,12 +3392,12 @@ var _default = {
         ++i;
         if (i == j) {
           that.changeData(data);
-          clearInterval(_this21.timer);
+          clearInterval(_this22.timer);
         }
       }, 100);
     },
     changeData: function changeData(data) {
-      var _this22 = this;
+      var _this23 = this;
       var that = this;
       this.$http({
         url: this.api.writeJinHuaControl_write,
@@ -3214,7 +3411,7 @@ var _default = {
             duration: 1500
           });
           setTimeout(function () {
-            _this22.dataInit();
+            _this23.dataInit();
           }, 1500);
         } else {
           uni.showToast({