From 102f062f977ecc28d4730afcf48ad89e37e34225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Wed, 21 May 2025 17:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E7=94=B5=E7=A3=81?=
 =?UTF-8?q?=E9=98=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/driverapi.js                |   2 +-
 pages/controller/controller.vue | 253 +++++++++++++++++++-------------
 2 files changed, 152 insertions(+), 103 deletions(-)

diff --git a/api/driverapi.js b/api/driverapi.js
index 0f8706dd..ff0aaec5 100644
--- a/api/driverapi.js
+++ b/api/driverapi.js
@@ -33,7 +33,7 @@ let api = {
 
 	readControl_fiveControl: '/readControl/fiveControl', //读取（五防项目）控制器
 	getcontrol_wxgetpermission: '/getcontrol/wxgetpermission', //小程序手机控制权限数据
-
+		getcontrol_getPermissionStatus: '/getcontrol/getPermissionStatus', //控制器页面显示
 	readControl_solenoidValve1: '/readControl/solenoidValve1', //1#电磁阀
 	readControl_solenoidValve2: '/readControl/solenoidValve2', //2#电磁阀
 	readControl_solenoidValve3: '/readControl/solenoidValve3', //3#电磁阀
diff --git a/pages/controller/controller.vue b/pages/controller/controller.vue
index 1c16e824..e532ee4e 100644
--- a/pages/controller/controller.vue
+++ b/pages/controller/controller.vue
@@ -7,7 +7,7 @@
 		<view class="content" v-if="purviewList.indexOf('19')!=-1">
 			<template v-for="(item,index) in airWindowList">
 				<!--  -->
-				<view class="lishui-item" :key="index" v-show="item.airWindowState != 0">
+				<view class="lishui-item" :key="index" v-show="item.state != 0">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -17,16 +17,16 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="item.airWindowState != 0">
+					<view class="lishui-content" v-if="item.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="item.airWindowState == 1" class="sel" src="../../static/sel.png" mode="">
+								<image v-if="item.state == 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.airWindowState != 1" class="sel" src="../../static/sel.png" mode="">
+								<image v-if="item.state != 1" class="sel" src="../../static/sel.png" mode="">
 								</image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
@@ -51,7 +51,7 @@
 		<!-- 外遮阳 -->
 		<view class="content" v-if="purviewList.indexOf('25')!=-1">
 			<template v-for="(item,index) in externalsunshadeList">
-				<view class="lishui-item" v-show="item.externalsunshadeState != 0" :key="index">
+				<view class="lishui-item" v-show="item.state != 0" :key="index">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -61,16 +61,16 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="item.externalsunshadeState != 0">
+					<view class="lishui-content" v-if="item.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="item.externalsunshadeState == 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state == 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.externalsunshadeState != 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state != 1" class="sel" src="../../static/sel.png"
 									mode=""></image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
@@ -93,7 +93,7 @@
 		<!-- 内遮阳 -->
 		<view class="content" v-if="purviewList.indexOf('24')!=-1">
 			<template v-for="(item,index) in innercurtainList">
-				<view class="lishui-item" v-show="item.innercurtainState != 0" :key="index">
+				<view class="lishui-item" v-show="item.state != 0" :key="index">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -103,16 +103,16 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="item.innercurtainState != 0">
+					<view class="lishui-content" v-if="item.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="item.innercurtainState == 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state == 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.innercurtainState != 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state != 1" class="sel" src="../../static/sel.png"
 									mode=""></image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
@@ -135,7 +135,7 @@
 		<!-- 内保温 -->
 		<view class="content" v-if="purviewList.indexOf('27')!=-1">
 			<template v-for="(item,index) in interiorthermalinsulationList">
-				<view class="lishui-item" v-show="item.interiorthermalinsulationState != 0" :key="index">
+				<view class="lishui-item" v-show="item.state != 0" :key="index">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -145,16 +145,16 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="item.interiorthermalinsulationState != 0">
+					<view class="lishui-content" v-if="item.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="item.interiorthermalinsulationState == 1" class="sel"
+								<image v-if="item.state == 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.interiorthermalinsulationState != 1" class="sel"
+								<image v-if="item.state != 1" class="sel"
 									src="../../static/sel.png" mode=""></image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
@@ -177,7 +177,7 @@
 		<!-- 立面保温 -->
 		<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-item" v-show="item.state != 0" :key="index">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -187,16 +187,16 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="item.upFaceInsulationState != 0">
+					<view class="lishui-content" v-if="item.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="item.upFaceInsulationState == 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state == 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"
+								<image v-if="item.state != 1" class="sel" src="../../static/sel.png"
 									mode=""></image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
@@ -287,7 +287,7 @@
 		<!-- 空调 -->
 		<view class="content" v-if="purviewList.indexOf('28')!=-1">
 			<template>
-				<view class="lishui-item" v-show="airconditioning.airconditioningState != 0">
+				<view class="lishui-item" v-show="airconditioning.state != 0">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ airconditioning.name }}
@@ -297,16 +297,16 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="airconditioning.airconditioningState != 0">
+					<view class="lishui-content" v-if="airconditioning.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="airconditioning.airconditioningState == 1" class="sel"
+								<image v-if="airconditioning.state == 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="airconditioning.airconditioningState != 1" class="sel"
+								<image v-if="airconditioning.state != 1" class="sel"
 									src="../../static/sel.png" mode=""></image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
@@ -358,7 +358,7 @@
 		<!-- 湿帘泵 -->
 		<view class="content" v-if="purviewList.indexOf('26')!=-1">
 			<template v-for="(item,index) in fanwetcurtainList">
-				<view class="lishui-item" v-show="item.fanwetcurtainState != 0" :key="index">
+				<view class="lishui-item" v-show="item.state != 0" :key="index">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -368,16 +368,16 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="item.fanwetcurtainState != 0">
+					<view class="lishui-content" v-if="item.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="item.fanwetcurtainState == 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state == 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.fanwetcurtainState != 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state != 1" class="sel" src="../../static/sel.png"
 									mode=""></image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
@@ -403,7 +403,7 @@
 		<!-- CO2补气 -->
 		<view class="content" v-if="purviewList.indexOf('30')!=-1">
 			<template v-for="(item,index) in CO2List">
-				<view class="lishui-item" v-show="item.CO2State != 0" :key="index">
+				<view class="lishui-item" v-show="item.state != 0" :key="index">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -413,15 +413,15 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="item.CO2State != 0">
+					<view class="lishui-content" v-if="item.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="item.CO2State == 1" class="sel" src="../../static/sel.png" mode=""></image>
+								<image v-if="item.state == 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.CO2State != 1" class="sel" src="../../static/sel.png" mode=""></image>
+								<image v-if="item.state != 1" class="sel" src="../../static/sel.png" mode=""></image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
 							</view>
@@ -446,7 +446,7 @@
 		<!-- #湿窗外翻窗 -->
 		<view class="content" v-if="purviewList.indexOf('26')!=-1">
 			<template v-for="(item,index) in outFlipWindowList">
-				<view class="lishui-item" v-show="item.outFlipWindowState != 0" :key="index">
+				<view class="lishui-item" v-show="item.state != 0" :key="index">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -456,16 +456,16 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="item.outFlipWindowState != 0">
+					<view class="lishui-content" v-if="item.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="item.outFlipWindowState == 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state == 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.outFlipWindowState != 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state != 1" class="sel" src="../../static/sel.png"
 									mode=""></image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
@@ -488,7 +488,7 @@
 		<!-- 环流风扇 -->
 		<view class="content" v-if="purviewList.indexOf('21')!=-1">
 			<template v-for="(item,index) in circulationFengshanList">
-				<view class="lishui-item" v-show="item.circulationFengshanState != 0" :key="index">
+				<view class="lishui-item" v-show="item.state != 0" :key="index">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -498,16 +498,16 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="item.circulationFengshanState != 0">
+					<view class="lishui-content" v-if="item.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="item.circulationFengshanState == 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state == 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.circulationFengshanState != 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state != 1" class="sel" src="../../static/sel.png"
 									mode=""></image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
@@ -953,7 +953,7 @@
 		<!-- 高压微雾 -->
 		<view class="content" v-if="purviewList.indexOf('23')!=-1">
 			<template v-for="(item,index) in highpressuremistList">
-				<view class="lishui-item" v-show="item.highpressuremistState != 0" :key="index">
+				<view class="lishui-item" v-show="item.state != 0" :key="index">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -963,16 +963,16 @@
 							<image src="../../static/set-arrow.png" mode=""></image>
 						</view>
 					</view>
-					<view class="lishui-content" v-if="item.highpressuremistState != 0">
+					<view class="lishui-content" v-if="item.state != 0">
 						<view class="lishui-set">
 							<view class="set-1">
-								<image v-if="item.highpressuremistState == 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state == 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.highpressuremistState != 1" class="sel" src="../../static/sel.png"
+								<image v-if="item.state != 1" class="sel" src="../../static/sel.png"
 									mode=""></image>
 								<view v-else class="sel-no"></view>
 								<span>手机控制</span>
@@ -999,14 +999,45 @@
 		<!-- *#电磁阀 -->
 		<view class="content">
 			<template v-for="(item,index) in electronMagneticStatus">
-				<view :key="index" v-show="item.status != 0">
-					<view class="valve" v-if="purviewList.indexOf((index + 11).toString())!=-1">
-						<image src="../../static/valve.png" mode=""></image>
-						<span>{{item.name}}</span>
-						<view @click="openValveControlShow(index)">
-							设置
-							<image src="../../static/right-arrow.png" mode=""></image>
+			
+				<view class="lishui-item" v-if="item.state != 0" :key="index">
+					<view class="lishui-title">
+						<view class="title-left">
+							{{ item.name }}
 						</view>
+						<view class="title-right" @click="openValveControlShow(index)">
+							设置
+							<image src="../../static/set-arrow.png" mode=""></image>
+						</view>
+					</view>
+					<view class="lishui-content" v-if="item.state != 0">
+						<view class="lishui-set">
+							<view class="set-1">
+								<image v-if="item.state == 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.state != 1" class="sel" src="../../static/sel.png"
+									mode=""></image>
+								<view v-else class="sel-no"></view>
+								<span>手机控制</span>
+							</view>
+						</view>
+						<view class="lishui-status">
+							<view class="btn" :class="item.open == 1 ? 'btn-on' : 'btn-off'">
+								<image class="fan-img" v-if="item.open == 1" src="../../static/fanwetcurtain.png"
+									alt="" style="animation: unset;width: 34rpx;height: 29rpx;">
+								</image>
+								<image v-else src="../../static/fan-off.png" alt=""></image>
+								<span>{{item.open == 1 ? '打开' : '关闭'}}</span>
+							</view>
+						</view>
+					</view>
+					<view v-else class="status-noTrue">
+						<image src="../../static/noTrue.png" mode=""></image>
+						<span>当前设备无效</span>
 					</view>
 				</view>
 			</template>
@@ -2218,45 +2249,53 @@
 				electronMagneticStatus: [{
 						name: '1#电磁阀',
 						code: 1166,
-						status: 0
+						state:0,
+						open:0,
 					},
 					{
 						name: '2#电磁阀',
 						code: 1167,
-						status: 0
+						state:0,
+						open:0,
 					},
 					{
 						name: '3#电磁阀',
 						code: 1168,
-						status: 0
+						state:0,
+						open:0,
 					},
 					{
 						name: '4#电磁阀',
 						code: 1169,
-						status: 0
+						state:0,
+						open:0,
 					},
 					{
 						name: '5#电磁阀',
 						code: 1170,
-						status: 0
+						state:0,
+						open:0,
 					},
 					{
 						name: '6#电磁阀',
 						code: 1171,
-						status: 0
+						state:0,
+						open:0,
 					},
 					{
 						name: '7#电磁阀',
 						code: 1172,
-						status: 0
+						state:0,
+						open:0,
 					},
 					{
 						name: '8#电磁阀',
 						code: 1173,
-						status: 0
+						state:0,
+						open:0,
 					},
 				],
-
+				electronMagneticList:[],
 				supplementLightShow: false, //补光灯
 				lightControlIndex: 0,
 				supplementLightStatus: {
@@ -2281,12 +2320,12 @@
 				circulationControlIndex: 0,
 				circulationFengshanList: [{
 						name: '1#环流风扇',
-						circulationFengshanState: 0,
+						state: 0,
 						open: 0
 					},
 					{
 						name: '2#环流风扇',
-						circulationFengshanState: 0,
+						state: 0,
 						open: 0
 					},
 				],
@@ -2296,12 +2335,12 @@
 				fanwetcurtainControlIndex: 0,
 				fanwetcurtainList: [{
 						name: '1#湿帘泵',
-						fanwetcurtainState: 0,
+						state: 0,
 						open: 0
 					},
 					{
 						name: '2#湿帘泵',
-						fanwetcurtainState: 0,
+						state: 0,
 						open: 0
 					},
 				],
@@ -2311,12 +2350,12 @@
 				CO2Index: 0,
 				CO2List: [{
 						name: 'CO2补气1',
-						CO2State: 0,
+						state: 0,
 						open: 0
 					},
 					{
 						name: 'CO2补气2',
-						CO2State: 0,
+						state: 0,
 						open: 0
 					},
 				],
@@ -2327,12 +2366,12 @@
 				highpressuremistControlIndex: 0,
 				highpressuremistList: [{
 						name: '1#高压微雾',
-						highpressuremistState: 0,
+						state: 0,
 						open: 0
 					},
 					{
 						name: '2#高压微雾',
-						highpressuremistState: 0,
+						state: 0,
 						open: 0
 					},
 				],
@@ -2342,13 +2381,13 @@
 				outFlipWindowControlIndex: 0,
 				outFlipWindowList: [{
 						name: '1#湿帘外翻窗',
-						outFlipWindowState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
 					{
 						name: '2#湿帘外翻窗',
-						outFlipWindowState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
@@ -2359,13 +2398,13 @@
 				innercurtainControlIndex: 0,
 				innercurtainList: [{
 						name: '1#内遮阳',
-						innercurtainState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
 					{
 						name: '2#内遮阳',
-						innercurtainState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
@@ -2376,13 +2415,13 @@
 				externalsunshadeControlIndex: 0,
 				externalsunshadeList: [{
 						name: '1#外遮阳',
-						externalsunshadeState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
 					{
 						name: '2#外遮阳',
-						externalsunshadeState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
@@ -2393,42 +2432,42 @@
 				airWindowControlIndex: 0,
 				airWindowList: [{
 						name: '1#通风窗',
-						airWindowState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0,
 						pid: 0
 					},
 					{
 						name: '2#通风窗',
-						airWindowState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0,
 						pid: 0
 					},
 					{
 						name: '3#通风窗',
-						airWindowState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0,
 						pid: 0
 					},
 					{
 						name: '4#通风窗',
-						airWindowState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0,
 						pid: 0
 					},
 					{
 						name: '5#通风窗',
-						airWindowState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0,
 						pid: 0
 					},
 					{
 						name: '6#通风窗',
-						airWindowState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0,
 						pid: 0
@@ -2440,13 +2479,13 @@
 				interiorthermalinsulationIndex: 0,
 				interiorthermalinsulationList: [{
 						name: '1#内保温',
-						interiorthermalinsulationState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
 					{
 						name: '2#内保温',
-						interiorthermalinsulationState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
@@ -2457,25 +2496,25 @@
 				upFaceInsulationIndex: 0,
 				upFaceInsulationList: [{
 						name: '1#立面保温',
-						upFaceInsulationState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
 					{
 						name: '2#立面保温',
-						upFaceInsulationState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
 					{
 						name: '3#立面保温',
-						upFaceInsulationState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
 					{
 						name: '4#立面保温',
-						upFaceInsulationState: 0,
+						state: 0,
 						progress: 0,
 						statusProgress: 0
 					},
@@ -2486,7 +2525,7 @@
 				airconditioningControlIndex: 0,
 				airconditioning: {
 					name: '空调',
-					airconditioningState: 0,
+					state: 0,
 					open: 0,
 					open1: 0
 				},
@@ -3247,7 +3286,7 @@
 						// 环流风扇状态值获取
 						if (this.purviewList.indexOf('21') != -1) {
 							this.circulationFengshanList.forEach((el, index) => {
-								el.circulationFengshanState = res.data[1074 + index * 2];
+								el.state = res.data[1074 + index * 2];
 								el.open = res.data[1075 + index * 2];
 							})
 						};
@@ -3265,20 +3304,20 @@
 						// CO2补气
 						if (this.purviewList.indexOf('30') != -1) {
 							this.CO2List.forEach((el, index) => {
-								el.CO2State = res.data[1178 + index * 2];
+								el.state = res.data[1178 + index * 2];
 								el.open = res.data[1179 + index * 2];
 							})
 						};
 						// 湿帘泵
 						if (this.purviewList.indexOf('26') != -1) {
 							this.fanwetcurtainList.forEach((el, index) => {
-								el.fanwetcurtainState = res.data[1080 + index * 2];
+								el.state = res.data[1080 + index * 2];
 								el.open = res.data[1081 + index * 2];
 							})
 						};
 						// 空调
 						if (this.purviewList.indexOf('28') != -1) {
-							this.airconditioning.airconditioningState = res.data['1160']
+							this.airconditioning.state = res.data['1160']
 							this.airconditioning.open = res.data['1161']
 							this.airconditioning.open1 = res.data['1162']
 
@@ -3286,7 +3325,7 @@
 						// 高压微雾
 						if (this.purviewList.indexOf('23') != -1) {
 							this.highpressuremistList.forEach((el, index) => {
-								el.highpressuremistState = res.data[1070 + index * 2];
+								el.state = res.data[1070 + index * 2];
 								el.open = res.data[1071 + index * 2];
 							})
 						};
@@ -3294,7 +3333,7 @@
 						// 湿窗外翻窗
 						if (this.purviewList.indexOf('26') != -1) {
 							this.outFlipWindowList.forEach((el, index) => {
-								el.outFlipWindowState = res.data[1084 + index * 3];
+								el.state = res.data[1084 + index * 3];
 								el.progress = res.data[1086 + index * 3];
 								el.statusProgress = res.data[1085 + index * 3]
 							})
@@ -3303,7 +3342,7 @@
 						//内遮阳
 						if (this.purviewList.indexOf('24') != -1) {
 							this.innercurtainList.forEach((el, index) => {
-								el.innercurtainState = res.data[1090 + index * 3];
+								el.state = res.data[1090 + index * 3];
 								el.progress = res.data[1092 + index * 3];
 								el.statusProgress = res.data[1091 + index * 3]
 							})
@@ -3312,7 +3351,7 @@
 						//外遮阳
 						if (this.purviewList.indexOf('25') != -1) {
 							this.externalsunshadeList.forEach((el, index) => {
-								el.externalsunshadeState = res.data[1096 + index * 3];
+								el.state = res.data[1096 + index * 3];
 								el.progress = res.data[1098 + index * 3];
 								el.statusProgress = res.data[1097 + index * 3]
 							})
@@ -3322,17 +3361,17 @@
 						if (this.purviewList.indexOf('19') != -1) {
 							this.airWindowList.forEach((el, index) => {
 								if (el.id == '8') {
-									el.airWindowState = res.data[1188] ? res.data[1188] : 0;
+									el.state = res.data[1188] ? res.data[1188] : 0;
 									el.progress = res.data[1190];
 									el.statusProgress = res.data[1189]
 									el.pid = res.data[1194]
 								} else if (el.id == '9') {
-									el.airWindowState = res.data[1191] ? res.data[1191] : 0;
+									el.state = res.data[1191] ? res.data[1191] : 0;
 									el.progress = res.data[1193];
 									el.statusProgress = res.data[1192]
 									el.pid = res.data[1195]
 								} else {
-									el.airWindowState = res.data[1102 + index * 3] ? res.data[1102 +
+									el.state = res.data[1102 + index * 3] ? res.data[1102 +
 										index * 3] : 0;
 									el.progress = res.data[1104 + index * 3];
 									el.statusProgress = res.data[1103 + index * 3]
@@ -3344,7 +3383,7 @@
 						// 内保温
 						if (this.purviewList.indexOf('27') != -1) {
 							this.interiorthermalinsulationList.forEach((el, index) => {
-								el.interiorthermalinsulationState = res.data[1182 + index * 3];
+								el.state = res.data[1182 + index * 3];
 								el.progress = res.data[1184 + index * 3];
 								el.statusProgress = res.data[1183 + index * 3]
 							})
@@ -3353,7 +3392,7 @@
 						// 立面保温
 						if (this.purviewList.indexOf('29') != -1) {
 							this.upFaceInsulationList.forEach((el, index) => {
-								el.upFaceInsulationState = res.data[1196 + index * 3];
+								el.state = res.data[1196 + index * 3];
 								el.progress = res.data[1198 + index * 3];
 								el.statusProgress = res.data[1197 + index * 3]
 							})
@@ -3362,14 +3401,24 @@
 
 						// 电磁阀
 						for (let t = 0; t < this.electronMagneticStatus.length; t++) {
-							this.electronMagneticStatus[t].status = res.data[1166 + t]
-
+							this.electronMagneticStatus[t].state = res.data[1166 + t]
+								this.electronMagneticStatus[t].open=this.getDCF(t,res.data)
 						}
 						// console.log(this.electronMagneticStatus,'this.electronMagneticStatus');
 					}
 				})
 			},
+        getDCF(t,data){
+            var index=t
+            var num=data[1174]
+                var num1 = this.padString(num.toString(2), 8)
 
+            var openListNew = []
+            openListNew = num1.split("")
+           var actList = openListNew.reverse();
+           
+            return actList[index]
+        },
 			// 丽水 风机
 			fanmodelHander() {
 				this.fanmodelShow = true;