diff --git a/App.vue b/App.vue
index 892d0a4..26180e8 100644
--- a/App.vue
+++ b/App.vue
@@ -1,11 +1,13 @@
 <script>
 	import indexUtil from "@/utils/indexUtil.js"
+	import dc from "@/utils/deviceUtil/dc.js"
 	import mqttUtil from "@/utils/mqttUtil.js"
 
 	export default {
 		data() {
 			return {
-				indexData: new indexUtil(), //全局地块列表管理
+				indexData: new indexUtil(this.deviceChange), //全局地块列表管理
+				dc: new dc(),
 				mqtt: null,
 				mqttObj: {
 					topics: []
@@ -36,6 +38,22 @@
 			console.log('App Hide')
 		},
 		methods: {
+			deviceChange(e) {
+				console.error("deviceChange：", e);
+				if (e == this.indexData.eventType.land) {
+					console.error("地块更新通知")
+					// this.indexData.getNewDeviceList();
+				}
+				if (e == this.indexData.eventType.device) {
+					console.error("设备更新通知")
+					console.error("dexice:", this.indexData.device) 
+					this.dc.setStations(this.indexData.device.stations);
+					this.dc.setFlapValves(this.indexData.device.flapValves);
+					this.dc.setValves(this.indexData.selectItem.id, this.indexData.device.waterOutlets);
+					
+					console.error("this.dc:",this.dc)
+				}
+			},
 			setTime: function() {
 				console.error(this.globalData.num);
 				// setTimeout(() => {
diff --git a/api/index.js b/api/index.js
index 293c358..9956960 100644
--- a/api/index.js
+++ b/api/index.js
@@ -14,4 +14,13 @@ export function getManagerGroundList(userID) {
 		url: "/landManager/select/" + userID,
 		method: "get"
 	})
+}
+
+//查询设备列表
+export function getDeviceList(data) {
+	return request({
+		url: "/device/control/app/listNew2",
+		method: "get",
+		data: data
+	})
 }
\ No newline at end of file
diff --git a/components/custom-select-land/custom-select-land.vue b/components/custom-select-land/custom-select-land.vue
index 2b72817..647273d 100644
--- a/components/custom-select-land/custom-select-land.vue
+++ b/components/custom-select-land/custom-select-land.vue
@@ -89,7 +89,8 @@
 				if (item.id != oldItem.id) {
 					this.indexData.setStorage(2, item);
 					this.$emit("select", item);
-					uni.$emit("notify-updates-land");
+					this.indexData.onEventHandler(this.indexData.eventType.land);
+					uni.$emit("notify-update-land");
 				}
 				this.close();
 			},
diff --git a/pages/index.vue b/pages/index.vue
index 4040023..5f5a88c 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -4,7 +4,7 @@
 		<block v-slot:left>
 			<view @click="openLand">地块</view>
 		</block>
-		<view>田间</view>
+		<view>{{ indexData.selectItem ? indexData.selectItem.name:"田间" }}</view>
 		<block v-slot:right>
 			<view class="fixed">
 				<view align="right" class="icon iconfont icon-liebiao" @click="toList"></view>
@@ -108,62 +108,32 @@
 								</view>
 							</template>
 							<view class="u-collapse-content">
-								<u-row>
+								<u-row v-for="item in dc.stations">
 									<u-col span="3">
 										<view class="fixed">
-											<text class="font-red">●</text>
-											<view>E0000104</view>
+											<text :class="[item.online ? 'font-green':'font-red']">●</text>
+											<view>{{ item.deviceCode }}</view>
 										</view>
 									</u-col>
 									<u-col span="4" style="align-items: center;">
 										<view class="fixed">
-											<view class="signal">
-												<view class="bar"></view>
-												<view class="bar"></view>
-												<view class="bar"></view>
-												<view class="bar"></view>
-												<view class="bar"></view>
+											<!-- <view class="signal" v-if="item.signalValue > 110"> -->
+											<view class="signal" v-if="item.signalValue > 0">
+												<view v-for="(_,i) in 4"
+													:class="['bar',item.signalValue > (8 * i) ? 'green':'']"></view>
+												<view :class="['bar',item.signalValue > 30 ? 'green':'']"></view>
+											</view>
+											<view class="signal" v-else>
+												<view class="bar" v-for="i in 5"></view>
 												<view class="bar-no">
 													<u-icon name="close"></u-icon>
 												</view>
 											</view>
-											<text>(12)</text>
+											<text>({{ item.signalValue }})</text>
 											<view class="battery-container">
-												<text>{{ 10 }}</text>
-												<view class="battery-level" :style="[`width:${10}%`]" />
-											</view>
-										</view>
-									</u-col>
-									<u-col span="5">
-										<view class="fixed">
-											<u-button type="success" size="mini" text="手持基站"></u-button>
-											<u-button type="success" size="mini" text="刷新" icon="reload"></u-button>
-										</view>
-									</u-col>
-								</u-row>
-								<u-row>
-									<u-col span="3">
-										<view class="fixed">
-											<text class="font-green">●</text>
-											<view>E0000104</view>
-										</view>
-									</u-col>
-									<u-col span="4" style="align-items: center;">
-										<view class="fixed">
-											<view class="signal">
-												<view class="bar green"></view>
-												<view class="bar green"></view>
-												<view class="bar green"></view>
-												<view class="bar green"></view>
-												<view class="bar"></view>
-												<view class="bar-no" style="display: none;">
-													<u-icon name="close"></u-icon>
-												</view>
-											</view>
-											<text>(12)</text>
-											<view class="battery-container">
-												<text>{{ 60 }}</text>
-												<view class="battery-level" :style="[`width:${60}%`]" />
+												<text>{{ item.currentBatteryCapacity }} </text>
+												<view class="battery-level"
+													:style="[`width:${item.currentBatteryCapacity}%`]" />
 											</view>
 										</view>
 									</u-col>
@@ -176,28 +146,28 @@
 								</u-row>
 							</view>
 						</u-collapse-item>
-
 					</u-collapse>
 				</view>
 				<!-- 阀门列表 -->
 				<view class="card">
 					<u-collapse accordion>
-						<u-collapse-item>
+						<u-collapse-item v-for="item in dc.valves">
 							<template #title>
 								<view class="sf-title fixed">
 									<view class="iconfont icon-diefa icon"></view>
-									<view class="text">A1</view>
+									<view class="text">{{ item.rowKey }}</view>
 									<view style="margin:0 10px;">出水口数量</view>
-									<u-badge numberType="overflow" type="info" max="999" value="155"></u-badge>
+									<u-badge numberType="overflow" type="info" max="999"
+										:value="item.children.length || 0" />
 								</view>
 							</template>
 							<view class="u-collapse-content">
 								<!-- 蝶阀 -->
-								<u-row>
+								<u-row v-if="item.deviceId">
 									<u-col span="4">
 										<view class="fixed">
-											<view>A1</view>
-											<text class="font-green">●在线</text>
+											<text class="font-green">●</text>
+											<view>{{ item.rowKey }}</view>
 										</view>
 									</u-col>
 									<u-col span="5">
@@ -213,86 +183,141 @@
 									</u-col>
 								</u-row>
 								<!-- 阀门 -->
-								<view class="card-grey">
-									<view class="card-title">
-										<u-row>
-											<u-col span="2">
-												<view><text class="font-green">●</text>1-1</view>
-											</u-col>
-											<u-col span="5">
-												<view class="fixed">
-													<view class="battery-container">
-														<text>60</text>
-														<view class="battery-level battery-level-60">
+								<view v-for="item2 in item.children">
+									<view v-if="item2.deviceId" class="card-grey">
+										<view class="card-title">
+											<u-row>
+												<u-col span="2">
+													<view><text class="font-green">●</text>{{ item2.rowKey }}</view>
+												</u-col>
+												<u-col span="5">
+													<view class="fixed">
+														<view class="battery-container">
+															<text>{{ item2.device.custom.battery.value }}</text>
+															<view class="battery-level"
+																:style="[`width:${item2.device.custom.battery.value}%`]" />
+														</view>
+														<view>
+															<view class="iconfont icon-wendu icon" />
+															{{ item2.device.custom.t }}
 														</view>
 													</view>
-													<view>
-														<view class="iconfont icon-wendu icon"></view>26.2
+												</u-col>
+												<u-col span="5" style="align-items: flex-end;">
+													<view class="fixed">
+														<u-button type="success" size="mini" text="刷新"
+															icon="reload"></u-button>
 													</view>
-												</view>
-											</u-col>
-											<u-col span="5" style="align-items: flex-end;">
-												<view class="fixed">
-													<u-button type="success" size="mini" text="刷新"
-														icon="reload"></u-button>
-												</view>
-											</u-col>
-										</u-row>
-									</view>
-									<view class="control">
-										<u-row>
-											<u-col span="3" style=" align-items: flex-end;" @click="angleSliderShow">
-												<view class="buttons">
-													<view class="btn fixed active">
-														<text>①</text>
-														<text>0.00</text>
-														<view class="iconfont icon-suoding icon"></view>
-													</view>
-												</view>
-												<u-line-progress height="8" :showText="false" :percentage="60"
-													activeColor="#74ffd4" inactiveColor="#c7c7c7"
-													style="width: 75px;margin-top: 5px;">
-												</u-line-progress>
-											</u-col>
-											<u-col span="6">
-												<view class="valve">
-													<view>
-														<view class="btn fixed">
-															<text>全开</text>
-														</view>
-													</view>
-													<view class="btn-img">
-														<view class="text">
-															<view class="left">-99.63</view>
-															<view class="top">-99.63</view>
-															<view class="middle">离线</view>
-															<view class="right">-99.63</view>
-															<view class="bottom">-99.63</view>
-														</view>
-														<image src="../static/images/valves/valve3-all.gif"
-															mode="widthFix">
-														</image>
-													</view>
-													<view>
-														<view class="btn fixed">
-															<text>全关</text>
-														</view>
-													</view>
-												</view>
-											</u-col>
-											<u-col span="3">
-												<view class="buttons">
-													<view class="btn fixed">
-														<text>④</text>
-														<text>0.00</text>
-														<view class="iconfont icon-suoding icon"></view>
-													</view>
-												</view>
-											</u-col>
-										</u-row>
-										<view class="font-red">
-											<view class="iconfont icon-guzhang icon"></view>角度4故障
+												</u-col>
+											</u-row>
 										</view>
+										<view class="control">
+											<u-row
+												v-if="item2.device.deviceTypeId  == 2 || item2.device.deviceTypeId  == 3">
+												<u-col span="3" style=" align-items: flex-end;"
+													@click="angleSliderShow">
+													<view class="buttons">
+														<view class="btn fixed active">
+															<text>①</text>
+															<text>(999)</text>
+															<!-- <view class="iconfont icon-suoding icon"></view> -->
+														</view>
+													</view>
+													<u-line-progress height="8" :showText="false" :percentage="60"
+														activeColor="#74ffd4" inactiveColor="#c7c7c7"
+														style="width: 75px;margin-top: 5px;">
+													</u-line-progress>
+												</u-col>
+												<u-col span="6">
+													<view class="valve">
+														<view>
+															<view class="btn fixed">
+																<text>全开</text>
+															</view>
+														</view>
+														<view class="btn-img">
+															<view class="text">
+																<view class="left">{{ item2.device.custom.p1 }}</view>
+																<view class="top"></view>
+																<view class="middle"
+																	v-show="!item2.device.custom.online">离线</view>
+																<view class="right">{{ item2.device.custom.p2 }}</view>
+																<view class="bottom"></view>
+															</view>
+															<image :src="item2.device.custom.showImg" mode="widthFix" />
+														</view>
+														<view>
+															<view class="btn fixed">
+																<text>全关</text>
+															</view>
+														</view>
+													</view>
+												</u-col>
+												<u-col span="3">
+													<view class="buttons">
+														<view class="btn fixed">
+															<text>④</text>
+															<text>(超时)</text>
+															<!-- <view class="iconfont icon-suoding icon"></view> -->
+														</view>
+													</view>
+												</u-col>
+											</u-row>
+											<u-row v-if="item2.device.deviceTypeId  == 13">
+												<u-col span="3" style=" align-items: flex-end;">
+													<view class="buttons">
+														<view class="btn fixed active">
+															<text>①</text>
+															<text>0.00</text>
+															<view class="iconfont icon-suoding icon"></view>
+														</view>
+
+													</view>
+												</u-col>
+												<u-col span="6">
+													<view class="valve">
+														<view>
+															<view class="btn fixed">
+																<text>②</text>
+															</view>
+														</view>
+														<view class="btn-img">
+															<view class="text5">
+																<view class="left">{{ item2.device.custom.p[0] }}</view>
+																<view class="top">{{ item2.device.custom.p[1] }}</view>
+																<view class="middle"
+																	v-show="!item2.device.custom.online">离线</view>
+																<view class="right">{{ item2.device.custom.p[2] }}
+																</view>
+																<view class="bottom">{{ item2.device.custom.p[3] }}
+																</view>
+															</view>
+															<image :src="item2.device.custom.showImg" mode="widthFix" />
+														</view>
+														<view>
+															<view class="btn fixed">
+																<text>④</text>
+															</view>
+														</view>
+													</view>
+												</u-col>
+												<u-col span="3">
+													<view class="buttons">
+														<view class="btn fixed">
+															<text>③</text>
+															<text>0.00</text>
+															<view class="iconfont icon-suoding icon"></view>
+														</view>
+													</view>
+												</u-col>
+											</u-row>
+											<view class="font-red">
+												<view class="iconfont icon-guzhang icon"></view>角度4故障
+											</view>
+										</view>
+									</view>
+									<view v-else class="card-grey">
+										{{ item2.rowKey }}
 									</view>
 								</view>
 								<view class="card-grey">
@@ -372,6 +397,7 @@
 									</view>
 								</view>
 							</view>
+
 						</u-collapse-item>
 					</u-collapse>
 				</view>
@@ -394,20 +420,22 @@
 	export default {
 		data() {
 			return {
-				isSticky: false,
-				show: false,
-				landList: [1, 2, 3],
+				isSticky: false, //吸顶状态
 				value: false,
-				sliderValue: 1,
-				landDataChange: true,
+				indexData: getApp().indexData,
+				dc: getApp().dc,
+				// show: false, 
 			}
 		},
 		onLoad() {
+			console.error("onLoad")
 			// uni.$emit("mqtt-link"); 
-			uni.$off("notify-updates-land");
-			uni.$on("notify-updates-land", () => {
-				console.error("更新数据")
-				this.landDataChange = true;
+
+			uni.$off("notify-update-land");
+			uni.$on("notify-update-land", () => {
+				console.error("index监听地块更新")
+				// this.landDataChange = true; 
+				getApp().indexData.getNewDeviceList();
 			});
 		},
 		onShow() {
diff --git a/static/images/valves/3/valve3.png b/static/images/valves/3/valve3.png
new file mode 100644
index 0000000..7386d90
Binary files /dev/null and b/static/images/valves/3/valve3.png differ
diff --git a/static/images/valves/3/valve3_1.gif b/static/images/valves/3/valve3_1.gif
new file mode 100644
index 0000000..d3837dc
Binary files /dev/null and b/static/images/valves/3/valve3_1.gif differ
diff --git a/static/images/valves/3/valve3_2.gif b/static/images/valves/3/valve3_2.gif
new file mode 100644
index 0000000..1c5e9f7
Binary files /dev/null and b/static/images/valves/3/valve3_2.gif differ
diff --git a/static/images/valves/3/valve3_all.gif b/static/images/valves/3/valve3_all.gif
new file mode 100644
index 0000000..7365f88
Binary files /dev/null and b/static/images/valves/3/valve3_all.gif differ
diff --git a/static/images/valves/3/valve3_run.gif b/static/images/valves/3/valve3_run.gif
new file mode 100644
index 0000000..bfa1e40
Binary files /dev/null and b/static/images/valves/3/valve3_run.gif differ
diff --git a/static/images/valves/5/valve5.png b/static/images/valves/5/valve5.png
new file mode 100644
index 0000000..01ad3a4
Binary files /dev/null and b/static/images/valves/5/valve5.png differ
diff --git a/static/images/valves/5/valve5_1.gif b/static/images/valves/5/valve5_1.gif
new file mode 100644
index 0000000..667e217
Binary files /dev/null and b/static/images/valves/5/valve5_1.gif differ
diff --git a/static/images/valves/5/valve5_2.gif b/static/images/valves/5/valve5_2.gif
new file mode 100644
index 0000000..67e5a08
Binary files /dev/null and b/static/images/valves/5/valve5_2.gif differ
diff --git a/static/images/valves/5/valve5_3.gif b/static/images/valves/5/valve5_3.gif
new file mode 100644
index 0000000..6d4d540
Binary files /dev/null and b/static/images/valves/5/valve5_3.gif differ
diff --git a/static/images/valves/5/valve5_4.gif b/static/images/valves/5/valve5_4.gif
new file mode 100644
index 0000000..01f4ea8
Binary files /dev/null and b/static/images/valves/5/valve5_4.gif differ
diff --git a/static/images/valves/5/valve5_all.gif b/static/images/valves/5/valve5_all.gif
new file mode 100644
index 0000000..d5e43ca
Binary files /dev/null and b/static/images/valves/5/valve5_all.gif differ
diff --git a/static/images/valves/5/valve5_run.gif b/static/images/valves/5/valve5_run.gif
new file mode 100644
index 0000000..d88d9b4
Binary files /dev/null and b/static/images/valves/5/valve5_run.gif differ
diff --git a/utils/constant.js b/utils/constant.js
index 4b262ea..5d2aa80 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -10,5 +10,6 @@ const constant = {
 	rememberPassword: "rememberPassword",
 	lands: "custom_lands",
 	landItem: "custom_landItem",
+	device: "custom_device",
 }
 export default constant
\ No newline at end of file
diff --git a/utils/deviceUtil/dc.js b/utils/deviceUtil/dc.js
new file mode 100644
index 0000000..1367a6f
--- /dev/null
+++ b/utils/deviceUtil/dc.js
@@ -0,0 +1,1260 @@
+import {
+	alone,
+	presentStationData
+} from "@/utils/deviceUtil/js/baseStation.js"
+import {
+	flapValveControl,
+	flapValvePreload,
+	threeWayValveControl,
+	threeWayValvePreload,
+	fiveWayValveControl,
+	getValveAngleConfig,
+	calcEndTime
+} from "@/utils/deviceUtil/js/valveNew.js"
+
+const msgType = {
+	default: 0,
+	ok: 1,
+	err: -1,
+}
+/**
+ * 设备控制
+ */
+class deviceControl {
+	// 双击操作
+	doubleClick = true;
+
+	/**
+	 * @param {landData} 地块信息
+	 */
+	land = {
+		data: [],
+		item: {
+			id: null,
+			name: ""
+		},
+	};
+	/**
+	 * @param {stations} 基站列表
+	 */
+	stations = [];
+	/**
+	 * @param {flapValves} 基站列表
+	 */
+	flapValves = [];
+	/**
+	 * @param {valves} 阀门列表
+	 */
+	valves = [];
+	/**
+	 * @param {adjustNumber} 调压值
+	 */
+	adjustNumber = 1;
+	/**
+	 * @param {others} 其他列表
+	 */
+	others = {
+		header: [],
+		agricultural: [],
+		deviceMp: [],
+	}
+	/**
+	 * @param {topics} 订阅topic
+	 */
+	topics = {
+		oldV: [],
+		newV: [],
+	};
+	/**
+	 * 数据筛选
+	 */
+	forward = false;
+	screenKey = "";
+	screen = {
+		all: 0,
+		online: 0,
+		offline: 0,
+		watering: 0,
+		unwater: 0,
+		error: 0,
+	};
+
+	/**
+	 * @param {Object} 初始化方法
+	 */
+	constructor(eventHandler, msgHandler) {
+		this.eventHandler = eventHandler;
+		this.msgHandler = msgHandler;
+	};
+	//获取消息类型
+	get msgType() {
+		return msgType;
+	}
+	get topic() {
+		if (this.topics.newV.length && this.topics.newV.length) {
+			const newV = new Set(this.topics.newV);
+			const oldV = this.topics.oldV.filter(x => !newV.has(x));
+			return {
+				oldV: oldV,
+				newV: this.topics.newV,
+			}
+		} else {
+			return this.topics;
+		}
+	}
+
+	/**
+	 * 设置地块数据
+	 * @param companys 公司
+	 * @param lands 地块
+	 * @param id 当前id
+	 */
+	setLandData(companys, lands, id) {
+		let selectItem = null;
+		if (companys.length && lands.length) {
+			const companyObj = companys.reduce((accumulator, current) => {
+				accumulator[current.id] = current;
+				return accumulator;
+			}, {});
+			let groups = {};
+			lands.map(item => {
+				let param = {
+					companyId: item.companyId,
+					companyName: companyObj[item.companyId] ? companyObj[item.companyId].label : "",
+					id: item.id,
+					name: item.landName,
+					landIcon: item.landIcon || '',
+					valueNum: item.valveNum,
+					controlFlag: item.controlFlag, //设备是否可控（0是 1否）
+					enableFlapValve: item.enableFlapValve == 0, //启用蝶阀
+					landManualOperation: item.landManualOperation == 0, //启用批量控制
+					mapContent: null
+				}
+				// 获取地图信息
+				if (item.landMap != null) {
+					param.mapContent = JSON.parse(decodeURIComponent(item.landMap.mapContent)) //地块地图 地图标点
+				}
+				// 判断公司是否已经分组，如果未分组，则添加分组
+				if (!groups[item.companyId]) {
+					groups[item.companyId] = [];
+				}
+				groups[item.companyId].push(param);
+				if (param.id == id) {
+					selectItem = param;
+				}
+			})
+			companys.forEach(item => {
+				item.children = groups[item.id] || [];
+			});
+			if (!selectItem) {
+				selectItem = landArr[0];
+			}
+		}
+		this.land.data = companys;
+		return selectItem;
+	}
+	/**
+	 * 设置选中地块数据
+	 * @param item 选中列表
+	 * @param callback
+	 */
+	setLandItem(item, callback) {
+		if (item != this.land.item) {
+			this.land.item = item;
+			this.stations = [];
+			this.flapValves = [];
+			this.valves = [];
+			this.adjustNumber = 1;
+			this.others = {
+				header: [],
+				agricultural: [],
+				deviceMp: [],
+			}
+			this.topics = {
+				oldV: this.topics.newV,
+				newV: [],
+			};
+			this.forward = false;
+			this.screenKey = "";
+			this.screen = {
+				all: 0,
+				online: 0,
+				offline: 0,
+				watering: 0,
+				unwater: 0,
+				error: 0,
+			};
+
+			this.addTopics([`jsy/iot/control/${item.id}`]);
+			this.getTaskStatus();
+			if (typeof callback === 'function') {
+				callback();
+			}
+		}
+	}
+	/**
+	 * 设置设备数据（除阀门外的设备）
+	 * @param {Object} data
+	 */
+	setOtherDevices(data) {
+		if (data && data.length) {
+			let stations = [],
+				header = [],
+				agricultural = [],
+				flapValves = [];
+			data.forEach(item => {
+				if (item.deviceTypeId === 1) {
+					stations.push(item);
+				} else if (item.deviceTypeId === 4 || item.deviceTypeId === 5) {
+					header.push(item);
+				} else if (item.deviceTypeId === 6 || item.deviceTypeId === 7 || item.deviceTypeId === 8) {
+					agricultural.push(item);
+				} else if (item.deviceTypeId === 12) {
+					flapValves.push(item);
+				}
+			});
+			this.setStations(stations);
+			this.setFlapValves(flapValves);
+			this.others.header = header;
+			this.others.agricultural = agricultural;
+		}
+	}
+	/**
+	 * 设置墒情
+	 * @param {Object} data
+	 */
+	setDeviceMp(data) {
+		if (data && data.length) {
+			this.others.deviceMp = data;
+		} else {
+			this.others.deviceMp = []
+		}
+	}
+	/**
+	 * 设置基站数据
+	 * @param {Object} data
+	 */
+	setStations(data) {
+		let topic = [];
+		if (data && data.length) {
+			let stations = presentStationData(data);
+			stations.forEach(item => {
+				topic.push("jsy/iot/push/" + item.iotId);
+				item["hidden"] = false;
+			});
+			this.stations = stations;
+		} else {
+			this.stations = []
+		}
+		this.addTopics(topic);
+	}
+	/**
+	 * 设置蝶阀数据
+	 * @param {Object} data
+	 */
+	setFlapValves(data) {
+		let topic = [];
+		if (data && data.length) {
+			for (let i = 0; i < data.length; i++) {
+				data[i] = flapValveControl(data[i]);
+				topic.push("jsy/iot/push/" + data[i].iotId);
+			}
+			this.flapValves = data;
+		} else {
+			this.flapValves = [];
+		}
+		this.addTopics(topic);
+	}
+	/**
+	 * 设置阀门数据
+	 * @param landId
+	 * @param {Object} data
+	 */
+	setValves(landId, data) {
+		const that = this;
+		let topic = [],
+			loadData = [];
+		if (data && data.length) {
+			// 数据排序
+			data.sort(commonUtil.compareDataNew("landGroup", "branchCanalCode"));
+			data.forEach((item, i) => {
+				item.isOpened = false; // 展开折叠
+				item.isHide = false; // 隐藏
+				item.presentGroup = true; // 组状态
+				item.rowKey = item.pipeNetworkName; // 出水口名称
+				item.stationCode = "无";
+				// 蝶阀数据设置
+				item.device = item.controlDevice;
+				if (item.deviceId && that.flapValves.length) {
+					const device = that.flapValves.find(x => x.id == item.deviceId);
+					item.device = device || null;
+					if (item.deviceFlapValveSub) {
+						item.subIndex = item.deviceFlapValveSub.subIndex;
+					}
+				}
+				let Controllable = false; // 蝶阀权限字段
+				//便利出水口设备
+				if (item.children && item.children.length) {
+					item.children.sort(commonUtil.compareDataNew("outletCode", "multiPortCode"));
+					item.children.forEach((x, j) => {
+						x.isHide = false; // 隐藏
+						x.rowKey = x.waterOutletName; // 出水口名称
+						x.stationCode = "无";
+						// 阀门数据设置
+						x.device = x.controlDevice;
+						if (x.device) {
+							topic.push("jsy/iot/push/" + x.device.iotId);
+							if (x.device.deviceTypeId == 2 || x.device.deviceTypeId == 3) {
+								x.device.deviceValve = x.deviceValve
+								x.device = threeWayValveControl(x.device);
+								that.setValveShowRate(x, null);
+								// 这里的状态都是本地或者根据状态判断了，所以这个预加载没有意义了
+								// if (x.device.loading && x.device.loading.vss) {
+								// 	x.device = threeWayValvePreload(x.device, x.device.loading.vss, x
+								// 		.device.loading.mc);
+								// }
+
+								if (x.device.data && x.device.data.items && x.device.data.items
+									.mc) {
+									let mc = Math.abs(Number(x.device.data.items.mc.value));
+									if (mc == 0 || mc > 5) {
+										x.device.stall = that.adjustNumber;
+									} else {
+										x.device.stall = mc;
+									}
+								} else {
+									x.device.stall = that.adjustNumber;
+								}
+
+								// 判断设备权限
+								const btnControllable = x.device.custom.btnControllable
+								if (btnControllable.closeAll || btnControllable.open1 ||
+									btnControllable.open2 || btnControllable.openAll) {
+									Controllable = true;
+								}
+							} else if (x.device.deviceTypeId == 13) {
+								x.device.deviceValve = x.deviceValve;
+								x.device = fiveWayValveControl(x.device);
+								that.setValveShowRate(x, 1);
+								x.device.stall = that.adjustNumber;
+								const btnControllable = x.device.custom.btnControllable
+								if (btnControllable.open1 || btnControllable.open2 ||
+									btnControllable.open3 || btnControllable.open4) {
+									Controllable = true;
+								}
+							}
+							if (that.isLoading(x.device)) {
+								loadData.push({
+									device: x.device,
+									arr: [i, j],
+								});
+							}
+							x.stationCode = x.device.deviceValve.stationName || "无";
+						}
+					});
+				}
+				item.btnControllable = Controllable;
+			});
+			if (that.valves && that.valves.length && landId == that.land.item.id) {
+				// 更新数据
+				if (data.length == that.valves.length) {
+					for (var i = 0; i < that.valves.length; i++) {
+						let item = that.valves[i];
+						if (item.id == data[i].id) {
+							item.controlDevice = data[i].controlDevice;
+							item.device = data[i].device;
+							item.deviceCode = data[i].deviceCode;
+							item.deviceFlapValve = data[i].deviceFlapValve;
+							item.deviceFlapValveSub = data[i].deviceFlapValveSub;
+							item.deviceId = data[i].deviceId;
+							item.children = data[i].children;
+						}
+						that.valves[i] = item;
+					}
+				} else {
+					// 替换数据
+					that.valves = data;
+					that.onMsgHandler({
+						success: msgType.default,
+						msg: "数据变动，重新加载"
+					})
+				}
+			} else {
+				// 替换数据
+				that.valves = data;
+			}
+		} else {
+			that.valves = [];
+		}
+		if (loadData.length) {
+			loadData.forEach(item => {
+				that.setLoadTimersData(item.device, item.arr);
+			});
+		}
+		that.addTopics(topic);
+		that.screenData();
+		that.startRunningTimer();
+
+		// // 如果数据有效，查询相关数据
+		// if(that.valves.length){
+		// 	//给设备匹配时间
+		// 	this.matchTime("all");
+		// }
+	}
+	/**
+	 * 设置阀门显示的角度百分比
+	 * @param {Object} item
+	 * @param {Object} index
+	 */
+	setValveShowRate(item, index) {
+		if (item.device.deviceTypeId == 2 || item.device.deviceTypeId == 3) {
+			for (var key in item.device.custom.btnState) {
+				if (item.device.custom.btnState[key].color != 'info') {
+					if (key == 'closeAll') {
+						item.showRate = 0;
+					} else if (key == 'openAll') {
+						item.showRate = 100;
+					} else {
+						item.showRate = item.device.custom.aRate;
+					}
+				}
+			}
+		}
+		if (item.device.deviceTypeId == 13) {
+			item.showRate = `open${index}`;
+		}
+	}
+	/**
+	 * 添加tioic
+	 * @param {Object} topic
+	 */
+	addTopics(topic) {
+		this.topics.newV = this.topics.newV.concat(topic);
+	}
+	/**
+	 * 设置调压等级
+	 * @param {Object} number
+	 */
+	setAdjustNumber(number) {
+		this.adjustNumber = Number(number);
+	}
+	/****************************** 数据、操作验证 ******************************/
+	/**
+	 * 获取地块轮灌状态
+	 * @param {Object} id
+	 */
+	getTaskStatus(id) {
+		console.error("轮灌状态查询")
+	}
+	// 双击参数
+	dblClickThreshold = 500;
+	dblClicObj = {
+		time: 0,
+		type: undefined
+	};
+	/**
+	 * 验证双击
+	 * @param type 按钮类型
+	 */
+	dbClickHandle(type) {
+		const that = this;
+		if (!that.doubleClick) {
+			return true;
+		}
+		const timestamp = new Date().getTime();
+		if (that.dblClicObj.type === type) {
+			if ((timestamp - that.dblClicObj.time) < that.dblClickThreshold) {
+				that.dblClicObj.type = undefined;
+				that.dblClicObj.time = 0;
+				return true;
+			} else {
+				that.dblClicObj.type = type;
+				that.dblClicObj.time = timestamp;
+				return false;
+			}
+		} else {
+			that.dblClicObj.type = type;
+			that.dblClicObj.time = timestamp;
+			return false;
+		}
+	}
+
+	//点击的时候判断有没有操作权限
+	hasPermission(item, index) {
+		let msg = "";
+		if (item.device.deviceTypeId == 2 || item.device.deviceTypeId == 3) {
+			const btnOpen = item.device.custom.btnOpen;
+			let state = true;
+			for (const key in btnOpen) {
+				if (btnOpen[key]) {
+					state = item.device.custom.btnControllable[key];
+				}
+			}
+			if (!state) {
+				msg = "对方正在使用，请联系对方出水口账号人员关闭阀门后操作。"
+			}
+		} else if (item.device.deviceTypeId == 13) {
+			if (!item.device.custom.btnControllable[`open${index}`]) {
+				msg = "无操作权限!"
+			}
+		}
+		if (msg) {
+			that.onMsgHandler({
+				success: msgType.default,
+				msg: msg
+			})
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	/****************************** 设备操作 ******************************/
+	/**
+	 * 刷新设备
+	 * @param {Object} item
+	 */
+	refreshDeviceItem(item) {
+		if (!this.dbClickHandle("refreshDeviceItem")) return;
+		const that = this;
+		that.onMsgHandler({
+			success: msgType.ok,
+			msg: `${item.rowKey}刷新`
+		})
+		item.device.custom.ws = 1;
+		that.onEventHandler(that.eventType.refresh, item);
+	}
+	/**
+	 * 设置刷新状态数据
+	 * @param {Object} item
+	 * @param {Object} res
+	 */
+	setRefreshDeviceState(item, res) {
+		item.device.status = res.data.status;
+		item.device.data = res.data.data;
+		//数据解析
+		if (item.device.deviceTypeId == 11 || item.device.deviceTypeId == 12) {
+			item.device = flapValveControl(item.device);
+		} else if (item.device.deviceTypeId == 2 || item.device.deviceTypeId == 3) {
+			item.device = threeWayValveControl(item.device);
+		} else if (item.device.deviceTypeId == 13) {
+			item.device = fiveWayValveControl(item.device);
+		}
+		item.device.custom.ws = 1;
+
+		// loadTimer(row.device, arr);
+	}
+	/**
+	 * 控制按钮事件
+	 * @param {Object} item
+	 * @param {Object} index
+	 */
+	deviceControlHandle(item, index, value) {
+		this.setValveShowRate(item, index);
+		if (!this.dbClickHandle(`${item.deviceId}-${index}`)) return;
+		// if (!this.hasPermission(item, index)) return;
+		this.buildCommand(item, index, value);
+	}
+	/**
+	 * 组织命令
+	 * @param {Object} item
+	 * @param {Object} index
+	 * @param {Object} value
+	 */
+	buildCommand(item, index, value) {
+		const that = this;
+		if (item.device.deviceTypeId == 11 || item.device.deviceTypeId == 12) {
+			// 配置的角度参数
+			const config = getValveAngleConfig(item.device.deviceTypeId);
+			let params = {
+				deviceTypeId: item.device.deviceTypeId,
+				privateSeal: item.device.privateSeal,
+				deviceVersionId: item.device.deviceVerId,
+				angleKey: config[Number(value)],
+				angleSize: 0, //大角度控制，正负数未调压的大小
+				valveNo: index,
+				operationType: Number(value) > 0 ? 10 : 11,
+			}
+			item.device.custom.subData[index - 1].btnPreload = true;
+			item.device.custom.subData[index - 1].btnLoading.closeAll = true;
+			item.device.custom.subData[index - 1].btnLoading.openAll = false;
+			item.device.custom.subData[index - 1].btnDisable.closeAll = true;
+			item.device.custom.subData[index - 1].btnDisable.openAll = true;
+
+			this.onEventHandler(this.eventType.send, params, item);
+		} else {
+			if (value >= 0) {
+				const config = getValveAngleConfig(item.device.deviceTypeId);
+				const deviceValveAngles = item.device.deviceValveAngles.reduce((obj, item) => {
+					obj[item.angleKey] = item;
+					return obj;
+				}, {});
+				let angleObj = null,
+					angleADC = null,
+					operationType = undefined;
+				let params = null;
+
+				if (item.device.deviceTypeId == 2 || item.device.deviceTypeId == 3) {
+					let btnKey = "";
+					if (index == 0) { // 全关
+						angleObj = deviceValveAngles[config[0]];
+						angleADC = angleObj.angleAdc;
+						operationType = 6;
+						btnKey = "closeAll";
+					} else if (index == 1 || index == 2) { //  12开
+						if (value == 0) {
+							angleObj = deviceValveAngles[config[0]];
+							angleADC = angleObj.angleAdc;
+							operationType = 6;
+							btnKey = "closeAll";
+						} else if (value == 100) {
+							if (index == 1) {
+								angleObj = deviceValveAngles[config[2]];
+								angleADC = angleObj.angleAdc;
+								operationType = 3;
+								btnKey = "open1";
+							}
+							if (index == 2) {
+								angleObj = deviceValveAngles[config[4]];
+								angleADC = angleObj.angleAdc;
+								operationType = 4;
+								btnKey = "open2";
+							}
+						} else {
+							if (index == 1) {
+								angleObj = deviceValveAngles[config[3]];
+								let angleInterval = angleObj.angleAdcUpperLimit - angleObj.angleAdcLowerLimit;
+								angleADC = angleObj.angleAdcUpperLimit - Math.ceil(angleInterval * value / 100);
+								operationType = 7;
+								btnKey = "open1";
+							}
+							if (index == 2) {
+								angleObj = deviceValveAngles[config[5]];
+								let angleInterval = angleObj.angleAdcUpperLimit - angleObj.angleAdcLowerLimit;
+								angleADC = Math.ceil(angleInterval * value / 100) + angleObj.angleAdcLowerLimit;
+								operationType = 7;
+								btnKey = "open2";
+							}
+						}
+					} else if (index == 3) { // 全开
+						angleObj = deviceValveAngles[config[1]];
+						angleADC = angleObj.angleAdc;
+						operationType = 5;
+						btnKey = "openAll";
+					} else {
+						return null;
+					}
+					// 控制参数
+					params = {
+						deviceTypeId: item.device.deviceTypeId,
+						privateSeal: item.device.privateSeal,
+						deviceVersionId: item.device.deviceVerId,
+						angleKey: angleObj.angleKey,
+						// angleSize: angleSize, //大角度控制，正负数未调压的大小
+						valveNo: index,
+						angleADC: angleADC,
+						operationType: operationType,
+					};
+					// 更新预加载状态 
+					item.device.custom.ct.time = 0;
+					item.device.custom.ct.value = 0;
+					item.device.custom.ct.endS = -1;
+					for (let key in item.device.custom.btnState) {
+						if (key == btnKey) {
+							item.device.custom.btnState[key].loading = true;
+							item.device.custom.btnState[key].color = item.device.custom.btnColorType.success;
+						} else {
+							item.device.custom.btnState[key].loading = false;
+							item.device.custom.btnState[key].color = item.device.custom.btnColorType.info;
+						}
+
+						for (let key in item.device.custom.btnState) {
+							if (key == btnKey) {
+								item.device.custom.btnState[key].loading = true;
+								item.device.custom.btnState[key].color = item.device.custom.btnColorType
+									.success;
+							} else {
+								item.device.custom.btnState[key].loading = false;
+								item.device.custom.btnState[key].color = item.device.custom.btnColorType.info;
+							}
+						}
+					}
+				} else if (item.device.deviceTypeId == 13) {
+					if (value == 0 || value == 100) {
+						angleObj = deviceValveAngles[config[value == 100 ? 1 : 0]];
+						angleADC = angleObj.angleAdc;
+						operationType = (value == 100 ? 51 : 55) + Number(index) - 1;
+					} else {
+						angleObj = deviceValveAngles[config[2]];
+						let angleInterval = angleObj.angleAdcUpperLimit - angleObj.angleAdcLowerLimit;
+						angleADC = Math.ceil(angleInterval * value / 100) + angleObj.angleAdcLowerLimit;
+						operationType = 59 + Number(index) - 1;
+					}
+					// 控制参数
+					params = {
+						deviceTypeId: item.device.deviceTypeId,
+						privateSeal: item.device.privateSeal,
+						deviceVersionId: item.device.deviceVerId,
+						angleKey: angleObj.angleKey,
+						// angleSize: angleSize, //大角度控制，正负数未调压的大小
+						valveNo: index,
+						angleADC: angleADC,
+						operationType: operationType,
+					};
+					// 更新预加载状态 
+					let key = "open" + index;
+					item.device.custom.btnPreload = true;
+					item.device.custom.btnState[key].loading = true;
+					if (value == 0) {
+						item.device.custom.btnState[key].color = item.device.custom.btnColorType.danger;
+					} else {
+						item.device.custom.btnState[key].color = item.device.custom.btnColorType.success;
+					}
+				}
+
+				this.onEventHandler(this.eventType.send, params, item);
+			} else {
+				if ((item.device.deviceTypeId == 2 || item.device.deviceTypeId == 3) && (index == 0 || index ==
+						3)) {
+					const config = getValveAngleConfig(item.device.deviceTypeId);
+					let params = {
+						deviceTypeId: item.device.deviceTypeId,
+						privateSeal: item.device.privateSeal,
+						deviceVersionId: item.device.deviceVerId,
+						angleKey: index == 0 ? config[0] : config[1],
+						angleSize: 0, //大角度控制，正负数未调压的大小
+						// valveNo: swiperData.value.index,
+						// angleADC: angleADC,
+						operationType: index == 0 ? 6 : 5,
+					};
+					// 更新预加载状态
+					let btnKey = index == 0 ? "closeAll" : "openAll";
+					item.device.custom.ct.time = 0;
+					item.device.custom.ct.value = 0;
+					item.device.custom.ct.endS = -1;
+					for (let key in item.device.custom.btnState) {
+						if (key == btnKey) {
+							item.device.custom.btnState[key].loading = true;
+							item.device.custom.btnState[key].color = item.device.custom.btnColorType.success;
+						} else {
+							item.device.custom.btnState[key].loading = false;
+							item.device.custom.btnState[key].color = item.device.custom.btnColorType.info;
+						}
+					}
+
+					this.onEventHandler(this.eventType.send, params, item);
+				} else {
+					if (item.device.deviceTypeId == 2 || item.device.deviceTypeId == 3) {
+						this.onEventHandler(this.eventType.interface, {
+							title: item.rowKey,
+							extra: `${index}`,
+							value: item.device.custom.aRate,
+							other: {
+								item: item,
+								index: index,
+							}
+						}, item);
+					} else if (item.device.deviceTypeId == 13) {
+						this.onEventHandler(this.eventType.interface, {
+							title: item.rowKey,
+							extra: index,
+							value: item.device.custom.angle["open" + index].aRate,
+							other: {
+								item: item,
+								index: index,
+							}
+						}, item);
+					} else {
+						return null;
+					}
+
+				}
+			}
+		}
+	}
+
+	/****************************** 数据更新 ******************************/
+	/**
+	 * 解析数据
+	 * @param {Object} message
+	 */
+	handleMessage(message) {
+		const that = this;
+		let obj = message;
+		let {
+			iotId,
+			items,
+			status
+		} = obj
+		let deviceIndex = null;
+		deviceIndex = that.stations.findIndex(x => x.iotId == iotId);
+		if (deviceIndex != -1) {
+			let newData = that.stations[deviceIndex];
+			if (items && obj.iotId) {
+				obj.privateSeal = newData.privateSeal;
+				obj.deviceTypeId = newData.deviceTypeId;
+				obj.rolaFrequency = newData.rolaFrequency;
+
+				newData = alone(obj, newData.online)
+				newData.loading = null;
+			} else {
+				newData.online = status === "online";
+				newData.loading = null;
+			}
+			that.stations[deviceIndex] = newData;
+		} else {
+			let indexArr = commonUtil.findIndexByIotId(that.valves, iotId);
+			if (indexArr.length) {
+				let device = null;
+				if (indexArr.length == 1) {
+					device = that.valves[indexArr[0]].device;
+				} else if (indexArr.length == 2) {
+					device = that.valves[indexArr[0]].children[indexArr[1]].device;
+				}
+				//更新状态
+				if (items) {
+					device.data = obj
+				} else {
+					device.status = status;
+				}
+				//数据解析 
+				if (device.deviceTypeId == 11 || device.deviceTypeId == 12) {
+					device = flapValveControl(device);
+				} else if (device.deviceTypeId == 2 || device.deviceTypeId == 3) {
+					device = threeWayValveControl(device);
+				} else if (device.deviceTypeId == 13) {
+					device = fiveWayValveControl(device);
+				}
+				//刷新数据
+				if (indexArr.length == 1) {
+					this.valves[indexArr[0]].device = device;
+				} else if (indexArr.length == 2) {
+					this.valves[indexArr[0]].children[indexArr[1]].device = device;
+				}
+				// 设置阀门倒计时
+				this.setLoadTimersData(device, indexArr);
+				this.screenData();
+				// if (items && device) {
+				// 	// 如果上报了数据，就更新一下阀门的一些时间
+				// 	this.matchTime("alone", device.id)
+				// }
+			}
+		}
+	}
+
+
+	/****************************** 计时器 ******************************/
+	loadTimerObj = {};
+	loadTimerState = false;
+	// 判断是否是控制中的设备
+	isLoading(device) {
+		let isLoading = false;
+		if ((device.deviceTypeId == 2 || device.deviceTypeId == 3) && device.custom.ws == 2) {
+			isLoading = true;
+		}
+		if (device.deviceTypeId == 13 && (device.custom.control.open1 || device.custom.control.open2 ||
+				device
+				.custom.control.open3 || device.custom.control.open4)) {
+			isLoading = true;
+		}
+		return isLoading;
+	}
+	/**
+	 * 设置倒计时数据
+	 * @param {Object} device
+	 * @param {Object} array
+	 */
+	setLoadTimersData(device, array) {
+		if (!this.isLoading(device)) return;
+		this.loadTimerObj[device.deviceCode] = {
+			arr: array,
+			deviceTypeId: device.deviceTypeId,
+			ct: device.custom.ct,
+		};
+		if (!this.loadTimerState) {
+			this.loadTimer();
+		}
+	}
+	// 控制中倒计时
+	loadTimer() {
+		const that = this;
+		if (Object.keys(that.loadTimerObj).length) {
+			this.loadTimerState = true;
+			let loadTimerArr = Object.entries(that.loadTimerObj).map(([key, value]) => ({
+				key,
+				value
+			}));
+			loadTimerArr.forEach(item => {
+				let arr = item.value.arr;
+				let deviceTypeId = item.value.deviceTypeId;
+				let ct = item.value.ct;
+				if (deviceTypeId == 2 || deviceTypeId == 3) {
+					let endS = calcEndTime(ct.time, ct.value);
+					ct.endS = endS;
+					if (endS <= 0) {
+						delete that.loadTimerObj[item.key];
+					}
+				}
+				if (deviceTypeId == 13) {
+					let allEnd = true;
+					for (var key in ct) {
+						let endS = calcEndTime(ct[key].time, ct[key].value);
+						ct[key].endS = endS;
+						if (endS > 0) {
+							allEnd = false;
+						}
+					}
+					if (allEnd) {
+						delete that.loadTimerObj[item.key];
+					}
+				}
+				// if (arr.length == 1) {
+				// 	groupDeviceList.value[arr[0]].device.custom.ct.endS = endS;
+				// }
+				if (arr.length == 2) {
+					that.valves[arr[0]].children[arr[1]].device.custom.ct = ct;
+				}
+			})
+			setTimeout(() => {
+				that.loadTimer();
+			}, 1000);
+		} else {
+			that.clearTimer();
+		}
+	}
+	// 清理计时器
+	clearTimer() {
+		this.loadTimerState = false;
+		this.loadTimerObj = {};
+	}
+
+
+	/****************************** 数据筛选 ******************************/
+	/**
+	 * @param {Object} type 筛选状态：1在线 2离线 3警告 0/其他 全部
+	 */
+	showType(key = "") {
+		if (this.screenKey == key) return;
+		this.screenKey = key;
+		this.screenData();
+	}
+	/**
+	 * 工作阀门
+	 */
+	workingForward(value) {
+		if (this.forward == value) return;
+		this.forward = value;
+		this.screenData(true);
+	}
+	/**
+	 * 筛选设备数据
+	 * isSort 是否需要排序，默认false
+	 */
+	screenData(isSort = false) {
+		// 如果在线就显示 不在线就隐藏
+		const that = this;
+		let all = 0,
+			online = 0,
+			offline = 0,
+			watering = 0,
+			unwater = 0,
+			error = 0;
+		let screenKey = that.screenKey;
+		let forward = that.forward;
+		that.valves.forEach(item => {
+			item.isOpen = false;
+			if (false) {
+				console.log("蝶阀暂不统计");
+				// if (type == 1) { // 在线
+				// 	if (item.deviceId && item.device && item.device.custom && item.device.custom
+				// 		.online) {
+				// 		item.isHide = that.#workingScreen(item, work);
+				// 	} else {
+				// 		item.isHide = true;
+				// 	}
+				// } else if (type == 2) { // 离线
+				// 	if (item.deviceId && item.device && item.device.custom && !item.device.custom
+				// 		.online) {
+				// 		item.isHide = that.#workingScreen(item, work);
+				// 	} else {
+				// 		item.isHide = true;
+				// 	}
+				// } else if (type == 3) { // 警告
+				// 	if (item.deviceId && item.device && item.device.custom && (!item.device.custom
+				// 			.online ||
+				// 			item.device.custom.earlyWarning.showTips)) {
+				// 		item.isHide = that.#workingScreen(item, work);
+				// 	} else {
+				// 		item.isHide = true;
+				// 	}
+				// } else { // 全部
+				// 	if (work == 1 || work == 2) {
+				// 		if (item.deviceId && item.device && item.device.custom) {
+				// 			item.isHide = that.#workingScreen(item, work);
+				// 		} else {
+				// 			item.isHide = true;
+				// 		}
+				// 	} else {
+				// 		item.isHide = false;
+				// 	}
+				// }
+			}
+			if (item.children && item.children.length) {
+				item.children.forEach(item2 => {
+					item2.isOpen = false;
+					let keys = [];
+					// 状态数据统计
+					if (item2.device) {
+						all++;
+						if (item2.device.custom) {
+							if (item2.device.custom.online) {
+								online++;
+								keys.push('online');
+							} else {
+								offline++;
+								error++;
+								keys.push('offline');
+								keys.push('error');
+							}
+							if (item2.device.custom.isOpen) {
+								item2.isOpen = true;
+								item.isOpen = true;
+								watering++;
+								keys.push('watering');
+							} else {
+								unwater++;
+								keys.push('unwater');
+							}
+						} else {
+							offline++;
+							unwater++;
+							error++;
+							keys = ['offline', 'unwater', 'error'];
+						}
+					}
+					// 显示状态判断
+					if (screenKey == "") {
+						item2.isHide = false;
+					} else if (screenKey == "all") {
+						if (item2.device) {
+							item2.isHide = false;
+						} else {
+							item2.isHide = true;
+						}
+					} else if (keys.includes(screenKey)) {
+						item2.isHide = false;
+					} else {
+						item2.isHide = true;
+					}
+				});
+				// 如果阀门全部都不在线 就隐藏阀门组的折叠
+				// if (item.children.every(j => j.isHide == true) && item.isHide) {
+				if (item.children.every(j => j.isHide == true)) {
+					item.isHide = true;
+				} else {
+					item.isHide = false;
+				}
+				if (isSort) {
+					if (forward) {
+						item.children.sort((a, b) => Number(!a.isOpen) - Number(!b.isOpen));
+					} else {
+						item.children.sort(commonUtil.compareDataNew("outletCode", "multiPortCode"));
+					}
+				}
+			} else {
+				if (screenKey == "") {
+					item.isHide = false;
+				} else {
+					item.isHide = true;
+				}
+			}
+		})
+		if (isSort) {
+			if (forward) {
+				that.valves.sort((a, b) => Number(!a.isOpen) - Number(!b.isOpen));
+			} else {
+				that.valves.sort(commonUtil.compareDataNew("landGroup", "branchCanalCode"));
+			}
+		}
+		this.screen.all = all;
+		this.screen.online = online;
+		this.screen.offline = offline;
+		this.screen.watering = watering;
+		this.screen.unwater = unwater;
+		this.screen.error = error;
+	}
+	/**
+	 * 筛选设备数据
+	 * value 阀门/出水口编号
+	 */
+	screenDataByName(value) {
+		// 如果在线就显示 不在线就隐藏
+		const that = this;
+		that.forward = false;
+		that.screenKey = "";
+		if (value == "" || !value) {
+			value = null;
+		}
+		that.valves.forEach(item => {
+			item.isOpen = false;
+			if (item.children && item.children.length) {
+				item.children.forEach(item2 => {
+					if (value) {
+						if (item2.rowKey.includes(value)) {
+							item2.isHide = false;
+						} else {
+							if (item2.device) {
+								if (item2.device.deviceCode.includes(value)) {
+									item2.isHide = false;
+								} else {
+									item2.isHide = true;
+								}
+							} else {
+								item2.isHide = true;
+							}
+						}
+					} else {
+						item2.isHide = false;
+					}
+				});
+				// 如果阀门全部都不在线 就隐藏阀门组的折叠
+				// if (item.children.every(j => j.isHide == true) && item.isHide) {
+				if (item.children.every(j => j.isHide == true)) {
+					item.isHide = true;
+				} else {
+					item.isHide = false;
+				}
+			} else {
+				item.isHide = true;
+			}
+		})
+	}
+
+	/****************************** 自动刷新 ******************************/
+	runningTimer = false;
+	/**
+	 * 自动刷新页面数据
+	 */
+	startRunningTimer() {
+		if (this.runningTimer) return;
+		const that = this;
+		that.runningTimer = true;
+		setTimeout(() => {
+			that.onEventHandler(that.eventType.refreshApi, that.land.item.id)
+		}, 20 * 1000);
+	}
+	// 数据解析
+	valveRefresh(e) {
+		const arr = commonUtil.findIndexByIotId(this.valves, e.data.data.iotId);
+		if (arr.length) {
+			if (arr.length == 1) {}
+			if (arr.length == 2) {
+				let row = this.valves[arr[0]].children[arr[1]];
+				row.device.status = e.data.status;
+				row.device.data = e.data.data;
+				//数据解析
+				if (row.device.deviceTypeId == 11 || row.device.deviceTypeId == 12) {
+					row.device = flapValveControl(row.device);
+				} else if (row.device.deviceTypeId == 2 || row.device.deviceTypeId == 3) {
+					row.device = threeWayValveControl(row.device);
+				} else if (row.device.deviceTypeId == 13) {
+					row.device = fiveWayValveControl(row.device);
+				}
+				this.valves[arr[0]].children[arr[1]].device = row.device;
+				this.setLoadTimersData(row.device, arr)
+			}
+		}
+	}
+
+
+	/****************************** 消息回调 ******************************/
+	eventType = {
+		interface: 0,
+		send: 1,
+		refresh: 2,
+		refreshApi: 3,
+	}
+	//应用类型 type:0打开操作界面，1控制命令发送，2刷新命令发送 ，3接口刷新阀门数据 
+	onEventHandler(type, params, item = null) {
+		if (typeof this.eventHandler === 'function') {
+			this.eventHandler(type, params, item);
+		}
+	}
+	onMsgHandler(msg) {
+		if (typeof this.msgHandler === 'function') {
+			this.msgHandler(msg);
+		}
+	}
+}
+export default deviceControl
+
+/***************************** 公共方法 *****************************/
+var commonUtil = {
+	// 数据排序 
+	compareDataNew(file1, file2) {
+		return function(b, a) {
+			if (b[file1] < a[file1]) {
+				return -1;
+			} else if (b[file1] > a[file1]) {
+				return 1;
+			} else {
+				if (b[file2] < a[file2]) {
+					return -1;
+				} else if (b[file2] > a[file2]) {
+					return 1;
+				} else {
+					return 0;
+				}
+			}
+		}
+	},
+	// 服务商
+	facilitator(type) {
+		if (type) {
+			if (type == "1") {
+				return "移动"
+			} else if (type == "2") {
+				return "电信"
+			} else if (type == "3") {
+				return "联通"
+			}
+		} else {
+			return "未知"
+		}
+	},
+	//格式化时间戳
+	getYMDHMS(timestamp) {
+		let date = new Date(parseInt(timestamp))
+		let Year = date.getFullYear()
+		let Moth = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1
+		let Day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate()
+		let Hour = date.getHours() < 10 ? "0" + date.getHours() : date.getHours()
+		let Minute = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()
+		let Sechond = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds()
+		let GMT = Year + "-" + Moth + "-" + Day + "   " + Hour + ":" + Minute + ":" + Sechond
+		return GMT
+	},
+	findIndexByIotId(arr, iotid) {
+		if (arr.length) {
+			var index1 = arr.findIndex(x => x.device && x.device.iotId == iotid);
+			if (index1 != -1) {
+				return [index1];
+			} else {
+				let arrIndex = [];
+				for (var i = 0; i < arr.length; i++) {
+					if (arr[i].children && arr[i].children.length) {
+						var j = arr[i].children.findIndex(x => x.device && x.device.iotId ==
+							iotid);
+						if (j != -1) {
+							arrIndex = [i, j];
+							break;
+						}
+					}
+				}
+				return arrIndex;
+			}
+		} else {
+			return [];
+		}
+	}
+}
\ No newline at end of file
diff --git a/utils/deviceUtil/js/baseStation.js b/utils/deviceUtil/js/baseStation.js
new file mode 100644
index 0000000..7621f5a
--- /dev/null
+++ b/utils/deviceUtil/js/baseStation.js
@@ -0,0 +1,105 @@
+import { getYMDHMS } from "@/utils/deviceUtil/js/common.js" 
+
+// 服务商
+function facilitator(variate) {
+	if (variate) {
+		if (variate.value === "1") {
+			return "移动"
+		} else if (variate.value === "2") {
+			return "电信"
+		} else if (variate.value === "3") {
+			return "联通"
+		}
+	} else {
+		return "未知"
+	}
+}
+
+// 鼠标划过要显示的文字
+function handleHoverShowText(object, code) {
+	if (object && object.items) {
+		let { cs, ns, ls } = object.items
+		let { b, bb, cc, g, l, mcu, ps, t } = object.items.adcProperty
+		return [
+			// ["基站编码：", code],
+			["充电状态：", cs.value],
+			["433环境噪声：", ls.value],
+			["4G信号强度(%)：", ns.value],
+			["电池ADC(V)：", b],
+			["电池ADC(%)：", Number(bb) > 100 ? 100 : bb],
+			["433ADC(V)：", l],
+			["MCUADC(V) ：", mcu],
+			["4G供电ADC(V)：", g],
+			["MCU温度ADC(℃)：", t],
+			["充电电流ADC(mA)：", cc],
+			["充电电压ADC(V)：", ps],
+			["数据上报时间：", getYMDHMS(object.time)]
+		]
+	} else {
+		return false
+	}
+}
+
+// 处理单条数据
+export function alone(obj, state) {
+	let { status, deviceName, iotId, privateSeal, deviceTypeId, rolaFrequency } = obj
+	let { ns, to, cs, adcProperty } = obj.items
+	return {
+		online: status !== "" ? status === "online" : state,
+		signalValue: ns ? Number(ns.value) : 0,
+		facilitator: facilitator(to),
+		deviceCode: deviceName,
+		chargedState: cs ? cs.value === "1" : false,
+		currentBatteryCapacity: adcProperty ? (parseInt(adcProperty.bb) > 100 ? 100 : parseInt(adcProperty.bb)) : 0,
+		iotId: iotId,
+		privateSeal,
+		deviceTypeId,
+		rolaFrequency,
+		text: handleHoverShowText(obj, deviceName)
+	}
+}
+
+export function presentStationData(arr) {
+	let newArray = []
+	for (let i = 0; i < arr.length; i++) {
+		let { status, deviceCode, privateSeal, deviceTypeId, rolaFrequency,deviceVer,softVer,id } = arr[i]
+
+		if (arr[i].data && arr[i].data.items) {
+			let { ns, to, cs, adcProperty } = arr[i].data.items
+			newArray.push({
+				online: status === "online",
+				signalValue: ns ? Number(ns.value) : 0,
+				facilitator: facilitator(to),
+				deviceCode: deviceCode,
+				chargedState: cs ? cs.value === "1" : false,
+				currentBatteryCapacity: adcProperty ? (parseInt(adcProperty.bb) > 100 ? 100 : parseInt(adcProperty.bb)) : 0,
+				iotId: arr[i].iotId,
+				privateSeal,
+				deviceTypeId,
+				rolaFrequency,
+				deviceVer,
+				softVer,
+				id,
+				text: handleHoverShowText(arr[i].data, deviceCode)
+			})
+		} else {
+			newArray.push({
+				online: status === "online",
+				signalValue: 0,
+				facilitator: "未知",
+				deviceCode: deviceCode,
+				chargedState: false,
+				currentBatteryCapacity: 0,
+				iotId: arr[i].iotId,
+				privateSeal,
+				deviceTypeId,
+				rolaFrequency,
+				deviceVer,
+				softVer,
+				id,
+				text: handleHoverShowText(arr[i].data, deviceCode)
+			})
+		}
+	}
+	return newArray
+}
diff --git a/utils/deviceUtil/js/common.js b/utils/deviceUtil/js/common.js
new file mode 100644
index 0000000..4f5f3a1
--- /dev/null
+++ b/utils/deviceUtil/js/common.js
@@ -0,0 +1,138 @@
+import store from "@/store"
+
+// 是否拥有管理员角色权限
+export function hasRole() {
+	const roleFlag = ["admin", "sysAdmin"] // 管理员的角色字符
+
+	const roles = store.getters && store.getters.roles
+	console.log(roles)
+	const isHasRole = roles.some(role => {
+		return roleFlag.includes(role)
+	})
+	return isHasRole
+}
+
+// 将报警类型转换为汉字
+export function convertToKanji(row) {
+	if (row.data && row.data.items && row.data.items.wt) {
+		let {
+			wt
+		} = row.data.items
+		wt = Number(wt.value)
+		if (wt === 0) {
+			return "无"
+		} else if (wt === 1) {
+			return "电机堵转"
+		} else if (wt === 2) {
+			return "角度故障"
+		} else if (wt === 3) {
+			return "低电量禁止控制"
+		} else if (wt === 4) {
+			return "电机初始化未完成"
+		} else if (wt === 5) {
+			return "压力1故障"
+		} else if (wt === 6) {
+			return "压力2故障"
+		} else {
+			return wt.value ? wt.value + "(未知错误)" : "(未知错误)"
+		}
+	} else {
+		return "/"
+	}
+}
+
+// 电量、温度、压力一、压力二
+export function showValueFn(row, type) {
+	if (row.data && row.data.items && row.data.items.adcProperty) {
+		let {
+			bb,
+			t,
+			pp1,
+			pp2
+		} = row.data.items.adcProperty
+		if (type === 1) {
+			return parseInt(bb) > 100 ? 100 : parseInt(bb)
+		}
+		if (type === 2) {
+			return t
+		}
+		if (type === 3) {
+			return pp1
+		}
+		if (type === 4) {
+			return pp2
+		}
+	} else {
+		return ""
+	}
+}
+
+export function getYMDHMS(timestamp) {
+	let date = new Date(parseInt(timestamp))
+	let Year = date.getFullYear()
+	let Moth = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1
+	let Day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate()
+	let Hour = date.getHours() < 10 ? "0" + date.getHours() : date.getHours()
+	let Minute = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()
+	let Sechond = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds()
+	let GMT = Year + "-" + Moth + "-" + Day + "   " + Hour + ":" + Minute + ":" + Sechond
+	return GMT
+}
+
+
+const warningTypeText = {
+	"valve": [
+		"电机堵转",
+		"角度故障",
+		"低电量禁止控制",
+		"电机初始化未完成",
+		"压力1故障",
+		"压力2故障",
+	],
+	"flapValve": [
+		"电机堵转",
+		"低电量禁止控制",
+		"压力故障"
+	]
+};
+export function getWarningTypeText(row) {
+	let wtText = "";
+	let controllable = true;
+	if (row.data && row.data.items && row.data.items.wt) {
+		let {
+			wt
+		} = row.data.items;
+		let wtArray = Number(wt.value).toString(2).split('').map(Number);
+		wtArray.reverse();
+		let wtTextArr = [];
+		if (row.deviceValve) {
+			wtTextArr = warningTypeText.valve;
+			if (wtArray.length > 2 && wtArray[2] === 1) {
+				controllable = false;
+			}
+		} else if (row.deviceFlapValve) {
+			wtTextArr = warningTypeText.flapValve;
+			if (wtArray.length > 1 && wtArray[1] === 1) {
+				controllable = false;
+			}
+		}
+		for (var i = 0; i < wtArray.length; i++) {
+			if (wtArray[i] === 1) {
+				if (wtTextArr.length > i) {
+					if (wtText == "") {
+						wtText = wtTextArr[i];
+					} else {
+						wtText += "," + wtTextArr[i];
+					}
+				} else {
+					wtText += "未知故障";
+					break;
+				}
+			}
+		};
+	}
+	return {
+		controllable: controllable,
+		text: wtText || "/"
+	};
+}
\ No newline at end of file
diff --git a/utils/deviceUtil/js/images.js b/utils/deviceUtil/js/images.js
new file mode 100644
index 0000000..c8eb666
--- /dev/null
+++ b/utils/deviceUtil/js/images.js
@@ -0,0 +1,95 @@
+// // 温度图片
+// import temperatureIcon from "@/static/images/index/temperature.png"
+// // 红点图片
+// import redDotIcon from "@/static/images/red-point.png"
+// // 绿点图片
+// import greenDotIcon from "@/static/images/green-point.png"
+// // 灰色电池图片
+// import grayBatteryIcon from "@/static/images/index/dianchigray.png"
+// // 绿色电池图片
+// import greenBatteryIcon from "@/static/images/index/dianchigreen.png"
+// // 向上白色箭头
+// import upWhiteArrowIcon from "@/static/images/index/upwhitearrow.png"
+// // 向上黑色箭头
+// import upBlackArrowIcon from "@/static/images/index/upblackarrow.png"
+// // 向下黑色箭头
+// import downBlackArrowIcon from "@/static/images/index/downblackarrow.png"
+// // 向下白色箭头
+// import downWhiteArrowIcon from "@/static/images/index/downwhitearrow.png"
+// // 警告标志
+// import warningIcon from "@/static/images/index/warning.png"
+
+// // 阀门未激活图片
+// import valveInactiveIcon from "@/static/images/index/valves/valveinactive.gif"
+// // L型全关图片
+// import lTypeAllClosedIcon from "@/static/images/index/valves/ltypeallclosed.gif"
+// // T型全关图片
+// import tTypeAllClosedIcon from "@/static/images/index/valves/ttypeallclosed.gif"
+// // L型一开
+// import lTypeOneOpenIcon from "@/static/images/index/valves/ltypeoneopen.gif"
+// // T型一开
+// import tTypeOneOpenIcon from "@/static/images/index/valves/ttypeoneopen.gif"
+// // L型二开
+// import lTypeTwoOpenIcon from "@/static/images/index/valves/ltypetwoopen.gif"
+// // T型二开
+// import tTypeTwoOpenIcon from "@/static/images/index/valves/ttypetwoopen.gif"
+// // 全开
+// import allOpenIcon from "@/static/images/index/valves/allopen.gif"
+// // 全开
+// import loaddingIcon from "@/static/images/index/valves/loaddingIcon.gif"
+
+// // 五通阀默认图标
+// import fiveDefault from "@/static/images/index/fiveValves/default.png"
+
+// export {
+// 	temperatureIcon,
+// 	redDotIcon,
+// 	greenDotIcon,
+// 	grayBatteryIcon,
+// 	greenBatteryIcon,
+// 	upWhiteArrowIcon,
+// 	upBlackArrowIcon,
+// 	downBlackArrowIcon,
+// 	downWhiteArrowIcon,
+// 	warningIcon,
+// 	valveInactiveIcon,
+// 	lTypeAllClosedIcon,
+// 	tTypeAllClosedIcon,
+// 	lTypeOneOpenIcon,
+// 	tTypeOneOpenIcon,
+// 	lTypeTwoOpenIcon,
+// 	tTypeTwoOpenIcon,
+// 	allOpenIcon,
+// 	loaddingIcon,
+// 	fiveDefault
+// }
+
+//3通阀
+import valve3 from "@/static/images/valves/3/valve3.png"
+import valve3_1 from "@/static/images/valves/3/valve3_1.gif"
+import valve3_2 from "@/static/images/valves/3/valve3_2.gif"
+import valve3_all from "@/static/images/valves/3/valve3_all.gif"
+import valve3_run from "@/static/images/valves/3/valve3_run.gif"
+//5通阀
+import valve5 from "@/static/images/valves/5/valve5.png"
+import valve5_1 from "@/static/images/valves/5/valve5_1.gif"
+import valve5_2 from "@/static/images/valves/5/valve5_2.gif"
+import valve5_3 from "@/static/images/valves/5/valve5_3.gif"
+import valve5_4 from "@/static/images/valves/5/valve5_4.gif"
+import valve5_all from "@/static/images/valves/5/valve5_all.gif"
+import valve5_run from "@/static/images/valves/5/valve5_run.gif"
+
+export {
+	valve3,
+	valve3_1,
+	valve3_2,
+	valve3_all,
+	valve3_run,
+	valve5,
+	valve5_1,
+	valve5_2,
+	valve5_3,
+	valve5_4,
+	valve5_all,
+	valve5_run
+}
\ No newline at end of file
diff --git a/utils/deviceUtil/js/valveNew.js b/utils/deviceUtil/js/valveNew.js
new file mode 100644
index 0000000..19de08f
--- /dev/null
+++ b/utils/deviceUtil/js/valveNew.js
@@ -0,0 +1,1748 @@
+import {
+	valve3,
+	valve3_1,
+	valve3_2,
+	valve3_all,
+	valve3_run,
+	valve5,
+	valve5_1,
+	valve5_2,
+	valve5_3,
+	valve5_4,
+	valve5_all,
+	valve5_run
+} from "@/utils/deviceUtil/js/images.js"
+
+//按钮样式选项
+const btnColorType = {
+	default: "info",
+	info: "info", //黑色
+	success: "success", //绿色
+	danger: "error", //红色
+};
+
+function getthreeWayValveImg(obj) {
+	obj.showImg = valve3
+	if (!obj.vss) {
+		return obj;
+	}
+
+	const vss = obj.vss;
+	if (obj.valveType == "L") {
+		if (vss == 10) {
+			obj.showImg = valve3
+		}
+		if (vss == 11 || vss == 14) {
+			obj.showImg = valve3_1
+		}
+		if (vss == 12 || vss == 15) {
+			obj.showImg = valve3_2
+		}
+		if (vss == 13 || vss == 16) {
+			obj.showImg = valve3_all
+		}
+	}
+	if (obj.valveType == "T") {
+		if (vss == 10) {
+			obj.showImg = valve3
+		}
+		if (vss == 11 || vss == 14) {
+			obj.showImg = valve3_1
+		}
+		if (vss == 12 || vss == 15) {
+			obj.showImg = valve3_2
+		}
+		if (vss == 13 || vss == 16) {
+			obj.showImg = valve3_all
+		}
+	}
+	if (vss >= 20) {
+		obj.showImg = valve3
+	}
+	return obj;
+}
+
+function getfiveWayValveImg(obj) {
+	obj.showImg = valve5;
+	return obj;
+}
+
+/*
+ * 控制阀门按钮
+ * 主要控制的方向--> 按钮的显隐、颜色、禁用、加载中的状态
+ */
+const warningTypeText = {
+	"flapValve": [
+		"从机1未响应",
+		"从机2未响应",
+		"从机3未响应",
+		"从机4未响应",
+		"从机5未响应",
+		"从机6未响应",
+		"从机7未响应",
+		"从机8未响应",
+	],
+	"flapValveSub": [
+		"电机堵转",
+		"角度故障",
+		"电机初始化未完成",
+		"压力故障",
+		"电机故障",
+	],
+	"valve": [
+		"电机堵转",
+		"角度故障",
+		"低电量禁止控制",
+		"电机初始化未完成",
+		"压力1故障",
+		"压力2故障",
+		"电机故障",
+	],
+	"fiveValve": [
+		"角度1故障",
+		"角度2故障",
+		"角度3故障",
+		"角度4故障",
+		"压力1故障",
+		"压力2故障",
+		"压力3故障",
+		"压力4故障",
+	]
+};
+// 电量、温度、压力一、压力二
+function showValueFn(row, type) {
+	if (row.data && row.data.items && row.data.items.adcProperty) {
+		let {
+			bb,
+			t,
+			pp1,
+			pp2
+		} = row.data.items.adcProperty
+		if (type === 1) {
+			return parseInt(bb) > 100 ? 100 : parseInt(bb)
+		}
+		if (type === 2) {
+			return t
+		}
+		if (type === 3) {
+			return pp1
+		}
+		if (type === 4) {
+			return pp2
+		}
+	} else {
+		return ""
+	}
+}
+//报警解析 type：1蝶阀，2三通阀，3五通阀，4蝶阀子设备
+function getWarningTypeText(type, row) {
+	let wtText = "";
+	let controllable = true;
+	if (row.data && row.data.items && row.data.items.wt) {
+		let {
+			wt
+		} = row.data.items;
+		let wtArray = Number(wt.value).toString(2).split('').map(Number);
+		wtArray.reverse();
+		let wtTextArr = [];
+		if (type == 1) {
+			wtTextArr = warningTypeText.flapValve;
+		} else if (type == 2) {
+			wtTextArr = warningTypeText.valve;
+			if (wtArray.length > 2 && wtArray[2] === 1) {
+				controllable = false;
+			}
+		} else if (type == 3) {
+			wtTextArr = warningTypeText.fiveValve;
+			// if (wtArray.length > 2 && wtArray[2] === 1) {
+			// 	controllable = false;
+			// }
+		} else if (type == 4) {
+			wtTextArr = warningTypeText.flapValveSub;
+		}
+
+		for (var i = 0; i < wtArray.length; i++) {
+			if (wtArray[i] === 1) {
+				if (wtTextArr.length > i) {
+					if (wtText == "") {
+						wtText = wtTextArr[i];
+					} else {
+						wtText += "," + wtTextArr[i];
+					}
+				} else {
+					wtText += "未知故障";
+					break;
+				}
+			}
+		};
+	}
+	return {
+		controllable: controllable,
+		text: wtText
+	};
+}
+//判断控制权限
+function setValveControl(row, obj) {
+	if (row.valveControl) { //有权限，则权限设置
+		if (row.valveControl.valveClose && row.valveControl.valveOpen &&
+			row.valveControl.valveOneOpen && row.valveControl.valveTwoOpen &&
+			row.valveControl.valveThreeOpen && row.valveControl.valveFourOpen) {
+			for (const key in obj.btnControllable) {
+				if (["up", "down"].includes(key)) {
+					for (const key2 in obj.btnControllable[key]) {
+						obj.btnControllable[key][key2] = false;
+					}
+				} else {
+					obj.btnControllable[key] = false;
+				}
+			}
+			obj.showMask.show = true;
+			obj.showMask.text = ""; //无操作权限
+		} else {
+			if (row.valveControl.valveClose && obj.btnControllable.hasOwnProperty("closeAll")) {
+				obj.btnControllable.closeAll = false;
+			} else {
+				obj.btnControllable.closeAll = true;
+			}
+			if (row.valveControl.valveOpen && obj.btnControllable.hasOwnProperty("openAll")) {
+				obj.btnControllable.openAll = false;
+			} else {
+				obj.btnControllable.openAll = true;
+			}
+			if (row.valveControl.valveOneOpen && obj.btnControllable.hasOwnProperty("open1")) {
+				obj.btnControllable.open1 = false;
+			} else {
+				obj.btnControllable.open1 = true;
+			}
+			if (obj.btnControllable.hasOwnProperty("up") && obj.btnControllable.up.hasOwnProperty("open1")) {
+				obj.btnControllable.up.open1 = obj.btnControllable.open1;
+			}
+			if (obj.btnControllable.hasOwnProperty("down") && obj.btnControllable.down.hasOwnProperty("open1")) {
+				obj.btnControllable.down.open1 = obj.btnControllable.open1;
+			}
+			if (row.valveControl.valveTwoOpen && obj.btnControllable.hasOwnProperty("open2")) {
+				obj.btnControllable.open2 = false;
+			} else {
+				obj.btnControllable.open2 = true;
+			}
+			if (obj.btnControllable.hasOwnProperty("up") && obj.btnControllable.up.hasOwnProperty("open2")) {
+				obj.btnControllable.up.open2 = obj.btnControllable.open2;
+			}
+			if (obj.btnControllable.hasOwnProperty("down") && obj.btnControllable.down.hasOwnProperty("open2")) {
+				obj.btnControllable.down.open2 = obj.btnControllable.open2;
+			}
+			if (row.valveControl.valveThreeOpen && obj.btnControllable.hasOwnProperty("open3")) {
+				obj.btnControllable.open3 = false;
+			} else {
+				obj.btnControllable.open3 = true;
+			}
+			if (obj.btnControllable.hasOwnProperty("up") && obj.btnControllable.up.hasOwnProperty("open3")) {
+				obj.btnControllable.up.open3 = obj.btnControllable.open3;
+			}
+			if (obj.btnControllable.hasOwnProperty("down") && obj.btnControllable.down.hasOwnProperty("open3")) {
+				obj.btnControllable.down.open3 = obj.btnControllable.open3;
+			}
+			if (row.valveControl.valveFourOpen && obj.btnControllable.hasOwnProperty("open4")) {
+				obj.btnControllable.open4 = false;
+			} else {
+				obj.btnControllable.open4 = true;
+			}
+			if (obj.btnControllable.hasOwnProperty("up") && obj.btnControllable.up.hasOwnProperty("open4")) {
+				obj.btnControllable.up.open4 = obj.btnControllable.open4;
+			}
+			if (obj.btnControllable.hasOwnProperty("down") && obj.btnControllable.down.hasOwnProperty("open4")) {
+				obj.btnControllable.down.open4 = obj.btnControllable.open4;
+			}
+		}
+	} else { //无权限，则默认都可控制
+		for (const key in obj.btnControllable) {
+			if (["up", "down"].includes(key)) {
+				for (const key2 in obj.btnControllable[key]) {
+					obj.btnControllable[key][key2] = true;
+				}
+			} else {
+				obj.btnControllable[key] = true;
+			}
+		}
+	}
+	return obj;
+}
+// 阀门角度ADC配置
+export function getValveAngleConfig(deviceTypeId) {
+	return getValveAngleConfigFun(deviceTypeId)
+}
+const ValveAngleConfig = {
+	flapValve: ["close", "open"],
+	fiveValve: ["close", "open", "adjust"],
+	threeValve: ["close", "open", "open1", "adjust1", "open2", "adjust2"],
+}
+
+function getValveAngleConfigFun(deviceTypeId) {
+	let arr = [];
+	switch (Number(deviceTypeId)) {
+		case 2:
+		case 3:
+			arr = ValveAngleConfig.threeValve;
+			break;
+		case 11:
+		case 12:
+			arr = ValveAngleConfig.flapValve;
+			break;
+		case 13:
+			arr = ValveAngleConfig.fiveValve;
+			break;
+	}
+	return arr;
+}
+
+// 计算结束倒计时
+export function calcEndTime(time, value) {
+	return calcEndTimeFun(time, value)
+}
+
+function calcEndTimeFun(time, value) {
+	if (time > 0 && value > 0) {
+		time = Number(time);
+		value = Number(value);
+		time = time + value * 1000;
+		let newTime = Date.now();
+		let endS = Math.floor((time - newTime) / 1000);
+		if (endS > 0) {
+			return endS;
+		} else {
+			return 0;
+		}
+	} else {
+		return -1;
+	}
+}
+
+// 计算角度占比
+export function calcAngleRate(deviceTypeId, valveAngles, value) {
+	return calcAngleRateFun(deviceTypeId, valveAngles, value)
+}
+
+function calcAngleRateFun(deviceTypeId, valveAngles, value) {
+	value = Number(value);
+	var aRate = -1,
+		text = "未知";
+	var minVal = "";
+	var maxVal = "";
+	let valveAnglesObj = {};
+	valveAngles.forEach(x => valveAnglesObj[x.angleKey] = x);
+	for (var key in valveAnglesObj) {
+		let x = valveAnglesObj[key];
+		if (minVal == "" || x.angleAdcLowerLimit < minVal) {
+			minVal = x.angleAdcLowerLimit;
+		}
+		if (maxVal == "" || x.angleAdcUpperLimit > maxVal) {
+			maxVal = x.angleAdcUpperLimit;
+		}
+		if (x.angleAdcLowerLimit <= value && value <= x.angleAdcUpperLimit) {
+			let lowerLimit = valveAnglesObj[key].angleAdcLowerLimit;
+			let upperLimit = valveAnglesObj[key].angleAdcUpperLimit;
+			if (deviceTypeId == 2 || deviceTypeId == 3) {
+				if (key == "open" || key == "open1" || key == "open2" || key == "close") {
+					aRate = 1;
+					if (key == "open") {
+						text = "全开";
+					}
+					if (key == "open1") {
+						text = "①开";
+					}
+					if (key == "open2") {
+						text = "②开";
+					}
+					if (key == "close") {
+						text = "全关";
+					}
+				} else if (key == "adjust1") {
+					aRate = (value - lowerLimit) / (upperLimit - lowerLimit);
+					aRate = 1 - aRate;
+					text = "①开";
+				} else if (key == "adjust2") {
+					aRate = (value - lowerLimit) / (upperLimit - lowerLimit);
+					text = "②开";
+				} else {
+					aRate = -1;
+					text = "未知";
+				}
+			} else if (deviceTypeId == 13) {
+				if (key == "close") {
+					aRate = 1;
+					text = "关";
+				} else if (key == "open") {
+					aRate = 1;
+					text = "开";
+				} else if (key == "adjust") {
+					aRate = (value - lowerLimit) / (upperLimit - lowerLimit);
+					text = "开";
+				} else {
+					aRate = -1;
+					text = "未知";
+				}
+			}
+			// aRate = aRate.toFixed(2);
+			break;
+		}
+	}
+	if (aRate > 0) {
+		aRate = aRate.toFixed(2);
+		aRate = Math.ceil(aRate * 100);
+		return {
+			text: text,
+			value: aRate
+		}
+	} else {
+		// return "-";
+		return {
+			text: "-",
+			value: ""
+		}
+	}
+}
+/************************************************** 蝶阀 **************************************************/
+export function flapValveControl(row) {
+	let obj = {
+		online: false, //默认阀门离线 online || offline
+		is4G: false, //是否4G设备
+		si: "-", //433信号强度,4G信号强度
+		t: showValueFn(row, 2), //温度 
+		battery: { //电池状态
+			charge: false,
+			value: showValueFn(row, 1) || 0,
+		},
+		earlyWarning: {
+			controllable: false, //true：能控制,false：不能控制
+			showTips: false,
+			text: ""
+		},
+		showMask: {
+			show: false, //遮罩状态
+			text: "", // 遮罩文字
+		},
+		btnControllable: false, //控制权限
+		btnShow: false, //按钮显示
+		btnColorType: btnColorType,
+		subData: [], //子设备
+	};
+
+	//设置阀门权限
+	// obj = setValveControl(row, obj);
+
+	//开始处理按钮状态
+	if (row.data && row.data.items) {
+		// 当前阀门是否在线
+		obj.online = row.status === "online";
+		// 信号强度
+		if (row.data.items.ns && row.data.items.ns.value) {
+			obj.si = Number(row.data.items.ns.value);
+		}
+		// 预警类型
+		const wtObj = getWarningTypeText(1, row);
+		obj.earlyWarning.controllable = wtObj.controllable;
+		obj.earlyWarning.text = wtObj.text;
+		obj.earlyWarning.showTips = !(wtObj.text == "");
+
+		// 解析子设备
+		if (row.data.items.devProperty) {
+			// 查看是否有角度相关信息
+			const valveAngles = row.deviceValveAngles ? row.deviceValveAngles : null;
+			if (valveAngles && valveAngles.length) {
+				for (var i = 1; i <= 5; i++) {
+					const key = `sub${i}Property`;
+					let subObj = {
+						data: null,
+						ws: [0, 0],
+						t: "-", //温度 
+						battery: { //电池状态
+							charge: false,
+							value: "-",
+						},
+						earlyWarning: {
+							controllable: false, //true：能控制,false：不能控制
+							showTips: false,
+							text: ""
+						},
+						showMask: {
+							show: false, //遮罩状态
+							text: "", // 遮罩文字
+						},
+						btnDisable: { //按钮禁用
+							closeAll: true,
+							openAll: true,
+						},
+						btnColor: { //按钮样式
+							closeAll: btnColorType.info,
+							openAll: btnColorType.info,
+						},
+						btnPreload: false, //false：绿色(物模型返回)，true：黄色(预加载)，
+						btnLoading: { //按钮动画
+							closeAll: false, //全关
+							openAll: false, //全开
+						},
+						isOpenType: 0, //0未知 1打开 2关闭
+					}
+					if (row.data.items.devProperty[key]) {
+						let sub = row.data.items.devProperty[key];
+						subObj.data = sub;
+						// ws [刷新，控制] 0否1中
+						if (sub.ws == 1) {
+							subObj.ws = [1, 0];
+						} else if (sub.ws == 2) {
+							subObj.ws = [0, 1];
+						} else if (sub.ws == 3) {
+							subObj.ws = [1, 1];
+						} else {
+							subObj.ws = [0, 0];
+						}
+						subObj.t = sub.adcProperty.t;
+						subObj.battery.value = sub.adcProperty.bb;
+
+						// 预警类型
+						const subwtObj = getWarningTypeText(4, {
+							data: {
+								items: {
+									wt: {
+										value: sub.wt,
+										time: 0
+									}
+								}
+							}
+						});
+						subObj.earlyWarning.controllable = subwtObj.controllable;
+						subObj.earlyWarning.text = subwtObj.text;
+						subObj.earlyWarning.showTips = !(subwtObj.text == "");
+						// 控制状态判断
+						let control = false,
+							vav = sub.va;
+						if (subObj.ws[1] == 1) {
+							control = true;
+							vav = (sub.vav >= 0) ? sub.vav : sub.va;
+						}
+						// 禁用
+						subObj.btnDisable.closeAll = control;
+						subObj.btnDisable.openAll = control;
+						const index = valveAngles.findIndex(x => x.angleAdcLowerLimit <= vav && vav <= x
+							.angleAdcUpperLimit);
+						if (index == -1) {
+							subObj.showMask.show = true;
+							subObj.showMask.text = `${i}未找到角度信息`;
+							subObj.isOpenType = 0;
+							// 按钮样式
+							subObj.btnColor.closeAll = btnColorType.default;
+							subObj.btnColor.openAll = btnColorType.default;
+							// 加载动画
+							subObj.btnPreload = false;
+							subObj.btnLoading.closeAll = control;
+							subObj.btnLoading.openAll = control;
+						} else {
+							if (valveAngles[index].angleKey == ValveAngleConfig.flapValve[0]) { // 关
+								subObj.isOpenType = 2;
+								// 按钮样式
+								subObj.btnColor.closeAll = btnColorType.danger;
+								subObj.btnColor.openAll = btnColorType.default;
+								// 加载动画
+								subObj.btnPreload = false;
+								subObj.btnLoading.closeAll = control;
+								subObj.btnLoading.openAll = false;
+							} else if (valveAngles[index].angleKey == ValveAngleConfig.flapValve[1]) { // 开
+								subObj.isOpenType = 1;
+								// 按钮样式
+								subObj.btnColor.closeAll = btnColorType.default;
+								subObj.btnColor.openAll = btnColorType.success;
+								// 加载动画
+								subObj.btnPreload = false;
+								subObj.btnLoading.closeAll = false;
+								subObj.btnLoading.openAll = control;
+							} else {
+								subObj.showMask.show = true;
+								subObj.showMask.text = `${i}未找到角度信息`;
+								subObj.isOpenType = 0;
+								// 按钮样式
+								subObj.btnColor.closeAll = btnColorType.default;
+								subObj.btnColor.openAll = btnColorType.default;
+								// 加载动画
+								subObj.btnPreload = false;
+								subObj.btnLoading.closeAll = control;
+								subObj.btnLoading.openAll = control;
+							}
+						}
+						obj.subData.push(subObj);
+					} else {
+						obj.subData.push(false);
+					}
+				}
+			} else {
+				obj.earlyWarning.controllable = false;
+				obj.showMask.showTips = true;
+				obj.showMask.text = "未找到角度信息";
+			}
+		}
+		//判断是否在线
+		if (!obj.online) {
+			obj.showMask.show = true;
+			obj.showMask.text = "离线";
+		}
+	} else {
+		obj.showMask.show = true; //遮罩状态
+		obj.showMask.text = "无数据上报"; // 遮罩文字
+	}
+	return {
+		...row,
+		custom: obj
+	}
+}
+//蝶阀预加载状态
+export function flapValvePreload(row, vss) {
+	return flapValvePreloadFun(row, vss);
+}
+
+function flapValvePreloadFun(row, vss) {
+	if (vss === 10 || vss === 11) {
+		row.custom.btnDisable.closeAll = true;
+		row.custom.btnDisable.openAll = true;
+
+		row.custom.btnColor.closeAll = btnColorType.info;
+		row.custom.btnColor.openAll = btnColorType.info;
+
+		row.custom.btnPreload = true;
+		row.custom.showMask.show = false;
+		row.custom.showMask.text = "";
+		if (vss == 10) {
+			row.custom.btnLoading.closeAll = true;
+			row.custom.btnLoading.openAll = false;
+		}
+		if (vss == 11) {
+			row.custom.btnLoading.closeAll = false;
+			row.custom.btnLoading.openAll = true;
+		}
+	}
+	row.loading = null;
+	return row;
+}
+
+/************************************************** 三通阀 **************************************************/
+export function threeWayValveControl(row) {
+	let obj = {
+		online: false, //默认阀门离线 online || offline
+		valveType: undefined, //阀门类型 L||T
+		is4G: false, //是否4G设备
+		ws: undefined, //工作状态：0:未工作/状态未知,1:刷新中,2:控制中 
+		vss: undefined, //阀门状态
+		ava: undefined, //阀门角度
+		va: undefined, //阀门角度
+		mc: undefined, //微调状态
+		ls: "-", //433信号强度
+		ns: "-", //4G信号强度
+		t: showValueFn(row, 2), //温度
+		p1: showValueFn(row, 3), //压力
+		p2: showValueFn(row, 4), //压力 
+		sbid: undefined, //桥接 
+		ct: {
+			time: 0, //上报时间戳
+			value: 0, //时间间隔s
+			endS: -1 //结束时间s
+		}, //控制时间
+		battery: { //电池状态
+			charge: false,
+			value: showValueFn(row, 1) || 0,
+		},
+		earlyWarning: {
+			controllable: false, //true：能控制,false：不能控制
+			showTips: false,
+			text: ""
+		},
+		showMask: {
+			show: false, //遮罩状态
+			text: "", // 遮罩文字
+		},
+		btnControllable: { //按钮控制权限（false表示不可控，true可控）
+			closeAll: false, //全关
+			open1: false, //1开
+			open2: false, //2开
+			openAll: false, //全开
+			up: { //升压
+				open1: false, //1开
+				open2: false, //2开
+			},
+			down: { //降压
+				open1: false, //1开
+				open2: false, //2开
+			},
+		},
+		btnShow: { //按钮显示
+			closeAll: false, //全关
+			open1: false, //1开
+			open2: false, //2开
+			openAll: false, //全开
+			up: false, //升压
+			down: false, //降压
+		},
+		btnDisable: { //按钮禁用
+			closeAll: true, //全关
+			open1: true, //1开
+			open2: true, //2开
+			openAll: true, //全开
+			up: true, //升压
+			down: true, //降压
+		},
+		btnColorType: btnColorType,
+		btnColor: { //按钮样式
+			closeAll: btnColorType.info,
+			open1: btnColorType.info,
+			open2: btnColorType.info,
+			openAll: btnColorType.info,
+			up: btnColorType.info,
+			down: btnColorType.info,
+		},
+		btnPreload: false, //false：绿色(物模型返回)，true：黄色(预加载)，
+		btnLoading: { //按钮动画
+			closeAll: false, //全关
+			open1: false, //1开
+			open2: false, //2开
+			openAll: false, //全开
+			up: false, //升压
+			down: false, //降压
+		},
+		btnShowMC: { //微调状态
+			open1: false, //1开
+			open2: false, //2开
+		},
+		isOpen: false, //是否打开
+		btnOpen: {
+			closeAll: false, //全关
+			open1: false, //1开
+			open2: false, //2开
+			openAll: false, //全开
+		},
+		btnState: {
+			closeAll: {
+				color: btnColorType.info,
+				loading: false,
+			},
+			openAll: {
+				color: btnColorType.info,
+				loading: false,
+			},
+			open1: {
+				color: btnColorType.info,
+				loading: false,
+			},
+			open2: {
+				color: btnColorType.info,
+				loading: false,
+			}
+		},
+		aRate: 0
+	};
+
+	//设置阀门权限
+	obj = setValveControl(row, obj);
+
+	//阀门类型 L || T
+	if (row.deviceValve) {
+		if (row.deviceValve.ballCenterType == 1) {
+			obj.valveType = "L";
+		} else if (row.deviceValve.ballCenterType == 2) {
+			obj.valveType = "T";
+		} else {
+			obj.valveType = undefined;
+		}
+	} else {
+		obj.valveType = undefined;
+	}
+
+	if (obj.valveType == "L" || obj.valveType == "T") {
+		//阀门默认显示和隐藏的按钮
+		obj.btnShow.closeAll = true;
+		obj.btnShow.open1 = true;
+		obj.btnShow.open2 = true;
+		obj.btnShow.openAll = true;
+		obj.btnShow.up = true;
+		obj.btnShow.down = true;
+	} else {
+		return {
+			...row,
+			custom: obj
+		}
+	}
+
+	//开始处理按钮状态
+	if (row.data && row.data.items) {
+		// 当前阀门是否在线
+		obj.online = row.status === "online";
+		//工作状态
+		if (row.data.items.ws && row.data.items.ws.value) {
+			obj.ws = Number(row.data.items.ws.value);
+		}
+		if (row.data.items.vss && row.data.items.vss.value) {
+			//阀门状态
+			obj.vss = Number(row.data.items.vss.value);
+		}
+		if (row.data.items.mc && row.data.items.mc.value) {
+			//微调状态
+			obj.mc = Number(row.data.items.mc.value);
+		}
+		if (row.data.items.va && row.data.items.va.value) {
+			//阀门角度
+			obj.va = Number(row.data.items.va.value);
+			const valveAngles = row.deviceValveAngles ? row.deviceValveAngles : null;
+			let aRate = calcAngleRateFun(row.deviceTypeId, valveAngles, obj.va);
+			obj.aRate = aRate.value;
+		}
+		if (obj.vss == 0) {
+			if (row.data.items.ava && row.data.items.ava.value) {
+				//阀门目标角度
+				obj.ava = Number(row.data.items.ava.value);
+			} else {
+				obj.ava = obj.va;
+			}
+			let vastr = threeWayValveVaToVss(obj.ws, obj.ava, obj.va, row.deviceValveAngles);
+			obj.vss = vastr.vss;
+			obj.mc = vastr.mc;
+		}
+		//充电状态
+		if (row.data.items.cs) {
+			obj.battery.charge = Number(row.data.items.cs.value) == 1
+		}
+		//桥接
+		if (row.data.items.sbid) {
+			obj.sbid = row.data.items.sbid.value || undefined;
+		}
+		//控制时间
+		if (obj.ws == 2 && row.data.items.ct) {
+			obj.ct = Object.assign(obj.ct, row.data.items.ct);
+			obj.ct.endS = calcEndTimeFun(obj.ct.time, obj.ct.value);
+		}
+
+		const wtObj = getWarningTypeText(2, row);
+		obj.earlyWarning.controllable = wtObj.controllable;
+		obj.earlyWarning.text = wtObj.text;
+		obj.earlyWarning.showTips = !(wtObj.text == "");
+
+		//根据设备类型判断是否为4G设备
+		if (row.networkDevice && row.networkDevice == 1) {
+			obj.is4G = true;
+		} else {
+			obj.is4G = false;
+		}
+
+		//ls 433信号 ns 4G信号
+		if (!obj.is4G && row.data.items.ls != undefined) {
+			obj.ls = Number(row.data.items.ls.value);
+		}
+		if (obj.is4G && row.data.items.ns != undefined) {
+			obj.ns = Number(row.data.items.ns.value);
+		}
+
+		const vss = obj.vss;
+		if (vss === 10 || vss === 20) { //全关 全关中
+			//微调状态
+			obj.btnShowMC.open1 = false;
+			obj.btnShowMC.open2 = false;
+			//按钮禁用状态
+			for (let key in obj.btnDisable) {
+				if (vss === 10) {
+					if (["closeAll", "up", "down"].includes(key)) {
+						obj.btnDisable[key] = true;
+					} else {
+						if (vss === 10) {
+							obj.btnDisable[key] = false;
+						} else {
+							obj.btnDisable[key] = true;
+						}
+					}
+				} else {
+					obj.btnDisable[key] = true;
+				}
+			}
+			//按钮样式
+			for (let key in obj.btnColor) {
+				if (vss === 10) {
+					if (key == "closeAll") {
+						obj.btnColor[key] = obj.btnColorType.danger;
+					} else if (["up", "down"].includes(key)) {
+						obj.btnColor[key] = obj.btnColorType.info;
+					} else {
+						obj.btnColor[key] = obj.btnColorType.default;
+					}
+				} else {
+					obj.btnColor[key] = obj.btnColorType.info;
+				}
+			}
+			//动画
+			obj.btnPreload = false;
+			for (let key in obj.btnLoading) {
+				if (vss === 10) {
+					obj.btnLoading[key] = false;
+				} else {
+					if (key == "closeAll") {
+						obj.btnLoading[key] = true;
+					} else {
+						obj.btnLoading[key] = false;
+					}
+				}
+			}
+
+			for (let key in obj.btnState) {
+				if (key == "closeAll") {
+					obj.btnState[key].loading = vss == 20;
+					obj.btnState[key].color = obj.btnColorType.danger;
+				} else {
+					obj.btnState[key].loading = false;
+					obj.btnState[key].color = obj.btnColorType.default;
+				}
+			}
+		} else if (vss === 11 || vss === 21 || //1开 1开中
+			vss === 12 || vss === 22 || //2开 2开中
+			vss === 13 || vss === 23) { //全开 全开中
+
+			let btnKey = "";
+			if (vss === 11 || vss === 21) {
+				btnKey = "open1"
+				//微调状态
+				obj.btnShowMC.open1 = true;
+				obj.btnShowMC.open2 = false;
+			}
+			if (vss === 12 || vss === 22) {
+				btnKey = "open2"
+				//微调状态
+				obj.btnShowMC.open1 = false;
+				obj.btnShowMC.open2 = true;
+			}
+			if (vss === 13 || vss === 23) {
+				btnKey = "openAll"
+				//微调状态
+				obj.btnShowMC.open1 = false;
+				obj.btnShowMC.open2 = false;
+			}
+			let isWorking = vss >= 20;
+			//按钮禁用状态
+			for (let key in obj.btnDisable) {
+				if (isWorking) {
+					obj.btnDisable[key] = true;
+				} else {
+					if (key == btnKey) {
+						obj.btnDisable[key] = true;
+					} else if (["up", "down"].includes(key)) {
+						if (btnKey == "openAll") {
+							obj.btnDisable[key] = true;
+						} else {
+							obj.btnDisable[key] = microControl(obj.mc)[key];
+						}
+					} else {
+						obj.btnDisable[key] = false;
+					}
+				}
+			}
+			//按钮样式
+			for (let key in obj.btnColor) {
+				if (isWorking) {
+					obj.btnColor[key] = obj.btnColorType.info;
+				} else {
+					if (key == btnKey) {
+						obj.btnColor[key] = obj.btnColorType.success;
+					} else if (["up", "down"].includes(key)) {
+						if (obj.btnDisable[key]) {
+							obj.btnColor[key] = obj.btnColorType.info;
+						} else {
+							obj.btnColor[key] = obj.btnColorType.default;
+						}
+					} else {
+						obj.btnColor[key] = obj.btnColorType.default;
+					}
+				}
+			}
+			//动画
+			obj.btnPreload = false;
+			for (let key in obj.btnLoading) {
+				if (isWorking) {
+					if (key == btnKey) {
+						obj.btnLoading[key] = true;
+					} else {
+						obj.btnLoading[key] = false;
+					}
+				} else {
+					obj.btnLoading[key] = false;
+				}
+			}
+
+			for (let key in obj.btnState) {
+				if (key == btnKey) {
+					obj.btnState[key].loading = isWorking;
+					obj.btnState[key].color = obj.btnColorType.success;
+				} else {
+					obj.btnState[key].loading = false;
+					obj.btnState[key].color = obj.btnColorType.default;
+				}
+			}
+		} else if (vss === 14 || vss === 24 || //1开微调 1开微调中
+			vss === 15 || vss === 25 || //2开微调 2开微调中
+			vss === 16 || vss === 26) { //全开微调 全开微调中
+
+			let btnKey = "";
+			if (vss === 14 || vss === 24) {
+				btnKey = "open1"
+				//微调状态
+				obj.btnShowMC.open1 = true;
+				obj.btnShowMC.open2 = false;
+			}
+			if (vss === 15 || vss === 25) {
+				btnKey = "open2"
+				//微调状态
+				obj.btnShowMC.open1 = false;
+				obj.btnShowMC.open2 = true;
+			}
+			if (vss === 16 || vss === 26) {
+				btnKey = "openAll"
+				//微调状态
+				obj.btnShowMC.open1 = false;
+				obj.btnShowMC.open2 = false;
+			}
+			let isWorking = vss >= 20;
+			//按钮禁用状态
+			for (let key in obj.btnDisable) {
+				if (isWorking) {
+					obj.btnDisable[key] = true;
+				} else {
+					if (key == btnKey) {
+						obj.btnDisable[key] = true;
+					} else if (["up", "down"].includes(key)) {
+						if (btnKey == "openAll") {
+							obj.btnDisable[key] = true;
+						} else {
+							obj.btnDisable[key] = microControl(obj.mc)[key];
+						}
+					} else {
+						obj.btnDisable[key] = false;
+					}
+				}
+			}
+			//按钮样式
+			for (let key in obj.btnColor) {
+				if (isWorking) {
+					if (key == btnKey) {
+						obj.btnColor[key] = obj.btnColorType.success;
+					} else {
+						obj.btnColor[key] = obj.btnColorType.info;
+					}
+				} else {
+					if (key == btnKey) {
+						obj.btnColor[key] = obj.btnColorType.success;
+					} else if (["up", "down"].includes(key)) {
+						if (obj.btnDisable[key]) {
+							obj.btnColor[key] = obj.btnColorType.info;
+						} else {
+							obj.btnColor[key] = obj.btnColorType.default;
+						}
+					} else {
+						obj.btnColor[key] = obj.btnColorType.default;
+					}
+				}
+			}
+			//动画
+			obj.btnPreload = false;
+			for (let key in obj.btnLoading) {
+				if (isWorking) {
+					if (["up"].includes(key)) {
+						if (obj.mc > 0) {
+							obj.btnLoading[key] = true;
+						} else {
+							obj.btnLoading[key] = false;
+						}
+					} else if (["down"].includes(key)) {
+						if (obj.mc < 0) {
+							obj.btnLoading[key] = true;
+						} else {
+							obj.btnLoading[key] = false;
+						}
+					} else {
+						obj.btnLoading[key] = false;
+					}
+				} else {
+					obj.btnLoading[key] = false;
+				}
+			}
+
+			for (let key in obj.btnState) {
+				if (key == btnKey) {
+					obj.btnState[key].loading = isWorking;
+					obj.btnState[key].color = obj.btnColorType.success;
+				} else {
+					obj.btnState[key].loading = false;
+					obj.btnState[key].color = obj.btnColorType.default;
+				}
+			}
+		}
+
+		if ([10, 20].includes(vss)) {
+			obj.isOpen = false;
+		} else {
+			obj.isOpen = true;
+		}
+
+		obj.btnOpen.closeAll = vss == 10;
+		obj.btnOpen.open1 = (vss == 11 || vss == 14);
+		obj.btnOpen.open2 = (vss == 12 || vss == 15);
+		obj.btnOpen.openAll = (vss == 13 || vss == 16);
+
+		//判断是否在线
+		if (!obj.online) {
+			obj.showMask.show = true;
+			obj.showMask.text = "离线";
+		}
+	} else {
+		obj.showMask.show = true; //遮罩状态
+		obj.showMask.text = "无数据上报"; // 遮罩文字
+	}
+
+	if (typeof getthreeWayValveImg === 'function') {
+		// 方法存在
+		obj = getthreeWayValveImg(obj);
+	}
+
+	return {
+		...row,
+		custom: obj
+	}
+}
+//判断三通阀微调按钮状态
+function microControl(mc) {
+	let obj = {
+		up: true,
+		down: true
+	};
+	if (mc >= 9) { //最大值，只能降压
+		obj.up = true;
+		obj.down = false;
+	} else if (mc <= -9) { //最小值，只能升压
+		obj.up = false;
+		obj.down = true;
+	} else if (mc != 0 && (mc >= -5 || mc <= 5)) {
+		obj.up = false;
+		obj.down = false;
+	} else {
+		obj.up = true;
+		obj.down = true;
+	}
+	return obj;
+}
+//三通阀预加载状态
+export function threeWayValvePreload(row, vss, mc) {
+	return threeWayValvePreloadFun(row, vss, mc);
+}
+
+function threeWayValvePreloadFun(row, vss, mc) {
+	if (vss === 10 || vss === 11 || vss === 12 || vss === 13 || vss === 14 || vss === 15 || vss === 16) {
+		row.custom.btnPreload = true;
+		row.custom.showMask.show = false;
+		row.custom.showMask.text = "";
+		for (let key in row.custom.btnDisable) {
+			row.custom.btnDisable[key] = true;
+		}
+		let btnKey = "";
+		if (vss === 10) {
+			btnKey = "closeAll";
+			//微调状态
+			row.custom.btnShowMC.open1 = false;
+			row.custom.btnShowMC.open2 = false;
+		} else if (vss === 11 || vss === 14) {
+			btnKey = "open1";
+			//微调状态
+			row.custom.btnShowMC.open1 = true;
+			row.custom.btnShowMC.open2 = false;
+		} else if (vss === 12 || vss === 15) {
+			btnKey = "open2";
+			//微调状态
+			row.custom.btnShowMC.open1 = false;
+			row.custom.btnShowMC.open2 = true;
+		} else if (vss === 13 || vss === 16) {
+			btnKey = "openAll";
+			//微调状态
+			row.custom.btnShowMC.open1 = false;
+			row.custom.btnShowMC.open2 = false;
+		} else {
+			btnKey = "";
+			//微调状态
+			row.custom.btnShowMC.open1 = false;
+			row.custom.btnShowMC.open2 = false;
+		}
+		if (mc == undefined || mc === 0) { //大角度控制
+			for (let key in row.custom.btnColor) {
+				row.custom.btnColor[key] = btnColorType.info;
+			}
+			for (let key in row.custom.btnLoading) {
+				if (key == btnKey) {
+					row.custom.btnLoading[key] = true;
+				} else {
+					row.custom.btnLoading[key] = false;
+				}
+			}
+		} else { //调压
+			for (let key in row.custom.btnColor) {
+				if (key == btnKey) {
+					if (key == "closeAll") {
+						row.custom.btnColor[key] = btnColorType.danger;
+					} else {
+						row.custom.btnColor[key] = btnColorType.success;
+					}
+				} else {
+					row.custom.btnColor[key] = btnColorType.info;
+				}
+			}
+			if (mc > 0) { //升压
+				btnKey = "up";
+			} else if (mc < 0) { //降压
+				btnKey = "down";
+			} else {
+				btnKey = "";
+			}
+			for (let key in row.custom.btnLoading) {
+				if (key == btnKey) {
+					row.custom.btnLoading[key] = true;
+				} else {
+					row.custom.btnLoading[key] = false;
+				}
+			}
+		}
+	}
+	row.loading = null;
+	return row;
+}
+
+function threeWayValveVaToVss(ws, ava, va, valveAngles) {
+	let value = ws == 2 ? ava : va;
+	let vss = 0,
+		text = "",
+		mc = 0;
+
+	if (valveAngles && valveAngles.length) {
+		let anglesObj = {};
+		valveAngles.forEach(x => anglesObj[x.angleKey] = x);
+		let item = null;
+		for (var key in anglesObj) {
+			let x = anglesObj[key];
+			if (x.angleAdcLowerLimit <= value && value <= x.angleAdcUpperLimit) {
+				item = x;
+				if (x.angleKey == "close") {
+					vss = 10;
+					text = "全关";
+					mc = 0;
+				} else if (x.angleKey == "open") {
+					vss = 13;
+					text = "全开";
+					mc = 0;
+				} else if (x.angleKey == "open1") {
+					vss = 11;
+					text = "①开";
+					if (ws == 2) {
+						mc = 0;
+					} else {
+						mc = 1;
+					}
+				} else if (x.angleKey == "open2") {
+					vss = 12;
+					text = "②开";
+					if (ws == 2) {
+						mc = 0;
+					} else {
+						mc = 1;
+					}
+				} else if (x.angleKey == "adjust1") {
+					vss = 14;
+					text = "①开";
+					if (ws == 2) {
+						mc = -1;
+					} else {
+						if (value == x.angleAdcLowerLimit) {
+							mc = -9;
+						} else if (value == x.angleAdcUpperLimit) {
+							mc = 9;
+						} else {
+							mc = 1;
+						}
+					}
+				} else if (x.angleKey == "adjust2") {
+					vss = 15;
+					text = "②开";
+					if (ws == 2) {
+						mc = -1;
+					} else {
+						if (value == x.angleAdcLowerLimit) {
+							mc = 9;
+						} else if (value == x.angleAdcUpperLimit) {
+							mc = -9;
+						} else {
+							mc = 1;
+						}
+					}
+				} else {
+					vss = 0;
+					text = "未知";
+					mc = 0;
+				}
+				if (ws == 2) {
+					vss = vss == 0 ? 0 : (vss + 10);
+				}
+				break;
+			}
+		}
+	}
+	return {
+		vss: vss,
+		text: text,
+		mc: mc,
+	};
+}
+/************************************************** 五通阀 **************************************************/
+export function fiveWayValveControl(row) {
+	let obj = {
+		online: false, //默认阀门离线 online || offline
+		ws: 0, // 这里为了页面方便，只作为刷新状态使用
+		is4G: false, //是否4G设备
+		si: "-", //433信号强度/4G信号强度 
+		t: "-", //温度
+		p: [], //压力
+		sbid: undefined, //桥接 
+		battery: { //电池状态
+			charge: false,
+			value: showValueFn(row, 1) || 0,
+		},
+		earlyWarning: {
+			controllable: false, //true：能控制,false：不能控制
+			showTips: false,
+			text: ""
+		},
+		showMask: {
+			show: false, //遮罩状态
+			text: "", // 遮罩文字
+		},
+		refresh: false, //刷新状态
+		control: { //控制状态
+			open1: false, //开1
+			open2: false, //开2
+			open3: false, //开3
+			open4: false, //开4
+		},
+		angle: { //角度信息,type: close, open, adjust
+			open1: {
+				present: 0,
+				aim: 0,
+				isOpen: false,
+			}, //开1
+			open2: {
+				present: 0,
+				aim: 0,
+				isOpen: false,
+			}, //开2
+			open3: {
+				present: 0,
+				aim: 0,
+				isOpen: false,
+			}, //开3
+			open4: {
+				present: 0,
+				aim: 0,
+				isOpen: false,
+			}, //开4
+		},
+		ct: {
+			open1: {
+				time: 0, //上报时间戳
+				value: 0, //时间间隔s
+				endS: -1 //结束时间s
+			}, //控制时间
+			open2: {
+				time: 0, //上报时间戳
+				value: 0, //时间间隔s
+				endS: -1 //结束时间s
+			}, //控制时间
+			open3: {
+				time: 0, //上报时间戳
+				value: 0, //时间间隔s
+				endS: -1 //结束时间s
+			}, //控制时间
+			open4: {
+				time: 0, //上报时间戳
+				value: 0, //时间间隔s
+				endS: -1 //结束时间s
+			}, //控制时间
+		},
+		btnControllable: { //控制权限
+			open1: false, //开1
+			open2: false, //开2
+			open3: false, //开3
+			open4: false, //开4
+		},
+		btnShow: { //按钮显示
+			open1: false, //开1
+			open2: false, //开2
+			open3: false, //开3
+			open4: false, //开4
+			up: { //升压
+				open1: false, //1开
+				open2: false, //2开
+				open3: false, //2开
+				open4: false, //2开
+			},
+			down: { //降压
+				open1: false, //1开
+				open2: false, //2开
+				open3: false, //2开
+				open4: false, //2开
+			},
+		},
+		btnDisable: { //按钮禁用
+			open1: true, //开1
+			open2: true, //开2
+			open3: true, //开3
+			open4: true, //开4
+			up: { //升压
+				open1: true, //1开
+				open2: true, //2开
+				open3: true, //2开
+				open4: true, //2开
+			},
+			down: { //降压
+				open1: true, //1开
+				open2: true, //2开
+				open3: true, //2开
+				open4: true, //2开
+			},
+		},
+		btnColorType: btnColorType,
+		btnColor: { //按钮样式
+			open1: btnColorType.danger, //开1
+			open2: btnColorType.danger, //开2
+			open3: btnColorType.danger, //开3
+			open4: btnColorType.danger, //开4
+			up: { //升压
+				open1: btnColorType.info, //开1
+				open2: btnColorType.info, //开1
+				open3: btnColorType.info, //开1
+				open4: btnColorType.info, //开1
+			},
+			down: { //降压
+				open1: btnColorType.info, //开1
+				open2: btnColorType.info, //开1
+				open3: btnColorType.info, //开1
+				open4: btnColorType.info, //开1
+			},
+		},
+		btnPreload: false, //false：绿色(物模型返回)，true：黄色(预加载)，
+		btnLoading: { //按钮动画
+			open1: false, //开1
+			open2: false, //开2
+			open3: false, //开3
+			open4: false, //开4
+			up: { //升压
+				open1: false, //1开
+				open2: false, //2开
+				open3: false, //2开
+				open4: false, //2开
+			},
+			down: { //降压
+				open1: false, //1开
+				open2: false, //2开
+				open3: false, //2开
+				open4: false, //2开
+			},
+		},
+		btnState: {
+			open1: {
+				color: btnColorType.danger,
+				loading: false,
+			},
+			open2: {
+				color: btnColorType.danger,
+				loading: false,
+			},
+			open3: {
+				color: btnColorType.danger,
+				loading: false,
+			},
+			open4: {
+				color: btnColorType.danger,
+				loading: false,
+			}
+		},
+		isOpen: false,
+	};
+
+	//设置阀门权限
+	obj = setValveControl(row, obj);
+
+	//开始处理按钮状态
+	if (row.data && row.data.items) {
+		for (let key in obj.btnShow) {
+			obj.btnShow[key] = true;
+		}
+
+		// 当前阀门是否在线
+		obj.online = row.status === "online";
+
+		//充电状态
+		if (row.data.items.cs) {
+			obj.battery.charge = Number(row.data.items.cs.value) == 1
+		}
+
+		//温度
+		if (row.data.items.adcProperty && row.data.items.adcProperty.t) {
+			obj.t = Number(row.data.items.adcProperty.t)
+		}
+
+		//桥接
+		if (row.data.items.sbid) {
+			obj.sbid = row.data.items.sbid.value || undefined;
+		}
+
+		//压力
+		if (row.data.items.adcProperty && row.data.items.adcProperty.p) {
+			obj.p = row.data.items.adcProperty.pp.map(obj => {
+				if (typeof obj === "object" && obj !== null) {
+					return obj.value;
+				} else {
+					return obj;
+				}
+			});
+		}
+
+		// 解析工作状态
+		let wsArray = Number(row.data.items.ws.value).toString(2).split('').map(Number);
+		wsArray.reverse(); // 数组倒置
+		while (wsArray.length < 5) { // 不够5位则补0
+			wsArray.push(0);
+		}
+		//控制状态
+		obj.control.open1 = wsArray[0] == 1 ? true : false;
+		obj.control.open2 = wsArray[1] == 1 ? true : false;
+		obj.control.open3 = wsArray[2] == 1 ? true : false;
+		obj.control.open4 = wsArray[3] == 1 ? true : false;
+
+		//控制时间
+		if ((obj.control.open1 || obj.control.open2 || obj.control.open3 || obj.control.open4) && row.data.items.ct) {
+			const endS = calcEndTimeFun(row.data.items.ct.time, row.data.items.ct.value);
+			for (var key in obj.control) {
+				if (obj.control[key]) {
+					obj.ct[key] = Object.assign(obj.ct[key], row.data.items.ct);
+					obj.ct[key].endS = endS; //结束时间s 
+				}
+			}
+		}
+		//刷新状态
+		obj.refresh = wsArray[4] == 1 ? true : false;
+		obj.ws = obj.refresh ? 1 : 0;
+		//角度解析
+		if (row.data.items.va && row.data.items.va.value) {
+			const present = JSON.parse(row.data.items.va.value);
+			obj.angle.open1.present = present[0];
+
+			if (row.data.items.ava1) {
+				obj.angle.open1.aim = row.data.items.ava1.value;
+			}
+			obj.angle.open2.present = present[1];
+			if (row.data.items.ava2) {
+				obj.angle.open2.aim = row.data.items.ava2.value;
+			}
+			obj.angle.open3.present = present[2];
+			if (row.data.items.ava3) {
+				obj.angle.open3.aim = row.data.items.ava3.value;
+			}
+			obj.angle.open4.present = present[3];
+			if (row.data.items.ava4) {
+				obj.angle.open4.aim = row.data.items.ava4.value;
+			}
+		}
+		// 警告
+		const wtObj = getWarningTypeText(3, row);
+		obj.earlyWarning.controllable = wtObj.controllable;
+		obj.earlyWarning.text = wtObj.text;
+		obj.earlyWarning.showTips = !(wtObj.text == "");
+
+		//根据设备类型判断是否为4G设备
+		if (row.networkDevice && row.networkDevice == 1) {
+			obj.is4G = true;
+		} else {
+			obj.is4G = false;
+		}
+		//ls 433信号 ns 4G信号
+		if (row.data.items.si != undefined) {
+			obj.si = Number(row.data.items.si.value);
+		}
+
+		// 查看是否有角度相关信息
+		const valveAngles = row.deviceValveAngles ? row.deviceValveAngles : null;
+		if (valveAngles && valveAngles.length) {
+			// 判断阀门状态
+			for (const key in obj.angle) {
+				// 角度判断啊
+				const present = obj.angle[key].present; //当前状态
+				const aim = obj.angle[key].aim; //目标状态 
+				let aRate = calcAngleRateFun(row.deviceTypeId, valveAngles, present);
+				obj.angle[key].aRate = aRate.value;
+
+				const searchA = obj.control[key] ? aim : present; // 当前用于查询数据的角度
+				const index = valveAngles.findIndex(x => x.angleAdcLowerLimit <= searchA && searchA <= x
+					.angleAdcUpperLimit);
+				if (index == -1) {
+					// 阀门的工作状态
+					obj.angle[key].isOpen = false;
+					// 按钮禁控
+					obj.btnDisable[key] = obj.control[key];
+					obj.btnDisable.up[key] = true;
+					obj.btnDisable.down[key] = true;
+					// 按钮样式
+					obj.btnColor[key] = obj.btnColorType.default;
+					obj.btnColor.up[key] = obj.btnColorType.info;
+					obj.btnColor.down[key] = obj.btnColorType.info;
+					// 加载状态
+					obj.btnLoading[key] = obj.control[key];
+					obj.btnLoading.up[key] = false;
+					obj.btnLoading.down[key] = false;
+
+					obj.btnState[key].color = obj.btnColorType.default;
+					obj.btnState[key].loading = obj.control[key];
+				} else {
+					const data = valveAngles[index];
+					// 按钮样式
+					if (data.angleKey == ValveAngleConfig.fiveValve[0]) { // 关
+						// 阀门的工作状态
+						obj.angle[key].isOpen = false;
+						// 按钮禁控
+						obj.btnDisable[key] = obj.control[key];
+						obj.btnDisable.up[key] = true;
+						obj.btnDisable.down[key] = true;
+						// 按钮样式
+						// obj.btnColor[key] = obj.control[key] ? obj.btnColorType.default : obj.btnColorType.danger;
+						obj.btnColor[key] = obj.btnColorType.danger;
+						obj.btnColor.up[key] = obj.btnColorType.info;
+						obj.btnColor.down[key] = obj.btnColorType.info;
+						// 加载状态
+						obj.btnLoading[key] = obj.control[key];
+						obj.btnLoading.up[key] = false;
+						obj.btnLoading.down[key] = false;
+
+						obj.btnState[key].color = obj.btnColorType.danger;
+					} else if (data.angleKey == ValveAngleConfig.fiveValve[1]) { // 开
+						// 阀门的工作状态
+						obj.angle[key].isOpen = true;
+						// 按钮禁控
+						obj.btnDisable[key] = obj.control[key];
+						obj.btnDisable.up[key] = true;
+						obj.btnDisable.down[key] = obj.control[key];
+						// 按钮样式
+						// obj.btnColor[key] = obj.control[key] ? obj.btnColorType.default : obj.btnColorType.success;
+						obj.btnColor[key] = obj.btnColorType.success;
+						obj.btnColor.up[key] = obj.btnColorType.info;
+						obj.btnColor.down[key] = obj.btnColorType.default;
+						// 加载状态
+						obj.btnLoading[key] = obj.control[key];
+						obj.btnLoading.up[key] = false;
+						obj.btnLoading.down[key] = false;
+
+						obj.btnState[key].color = obj.btnColorType.success;
+					} else if (data.angleKey == ValveAngleConfig.fiveValve[2]) { // 调压
+						// 阀门的工作状态
+						obj.angle[key].isOpen = true;
+						if (obj.control[key]) {
+							// 按钮禁控
+							obj.btnDisable[key] = true;
+							obj.btnDisable.up[key] = true;
+							obj.btnDisable.down[key] = true;
+							// 按钮样式
+							obj.btnColor[key] = obj.btnColorType.success;
+							obj.btnColor.up[key] = obj.btnColorType.info;
+							obj.btnColor.down[key] = obj.btnColorType.info;
+							// 加载状态
+							obj.btnLoading[key] = false;
+							if (present > aim) { // 降压
+								obj.btnLoading.up[key] = false;
+								obj.btnLoading.down[key] = true;
+							} else if (present < aim) { // 升压
+								obj.btnLoading.up[key] = true;
+								obj.btnLoading.down[key] = false;
+							} else {
+								obj.btnLoading.up[key] = false;
+								obj.btnLoading.down[key] = false;
+							}
+						} else {
+							// 按钮禁控
+							obj.btnDisable[key] = false;
+							if (data.angleAdcLowerLimit < present && present < data.angleAdcUpperLimit) { //中间压力
+								obj.btnDisable.up[key] = false;
+								obj.btnDisable.down[key] = false;
+							} else if (data.angleAdcLowerLimit == present) { //最小压力
+								obj.btnDisable.up[key] = false;
+								obj.btnDisable.down[key] = true;
+							} else if (data.angleAdcUpperLimit == present) { //最大压力
+								obj.btnDisable.up[key] = true;
+								obj.btnDisable.down[key] = false;
+							} else {
+								obj.btnDisable.up[key] = true;
+								obj.btnDisable.down[key] = true;
+							}
+							// 按钮样式
+							obj.btnColor[key] = obj.btnColorType.success;
+							obj.btnColor.up[key] = obj.btnDisable.up[key] ? obj.btnColorType.info : obj.btnColorType
+								.default;
+							obj.btnColor.down[key] = obj.btnDisable.up[key] ? obj.btnColorType.info : obj.btnColorType
+								.default;
+						}
+
+						obj.btnState[key].color = obj.btnColorType.success;
+					} else { // 未识别
+						// 阀门的工作状态
+						obj.angle[key].isOpen = false;
+						// 按钮禁控
+						obj.btnDisable[key] = obj.control[key];
+						obj.btnDisable.up[key] = true;
+						obj.btnDisable.down[key] = true;
+						// 按钮样式
+						obj.btnColor[key] = obj.btnColorType.default;
+						obj.btnColor.up[key] = obj.btnColorType.info;
+						obj.btnColor.down[key] = obj.btnColorType.info;
+						// 加载状态
+						obj.btnLoading[key] = obj.control[key];
+						obj.btnLoading.up[key] = false;
+						obj.btnLoading.down[key] = false;
+
+						obj.btnState[key].color = obj.btnColorType.default;
+					}
+					obj.btnState[key].loading = obj.control[key];
+				}
+			}
+
+		} else {
+			obj.showMask.show = true;
+			obj.showMask.text = "未找到角度信息";
+		}
+
+		//缺少阀门控制状态逻辑
+		//判断是否在线
+		if (!obj.online) {
+			obj.showMask.show = true;
+			obj.showMask.text = "离线";
+		}
+	} else {
+		obj.showMask.show = true; //遮罩状态
+		obj.showMask.text = "无数据上报"; // 遮罩文字
+	}
+
+	// 判断阀门的打开状态
+	for (var key in obj.angle) {
+		if (obj.angle[key].isOpen) {
+			obj.isOpen = true;
+		}
+	}
+
+	if (typeof getfiveWayValveImg === 'function') {
+		// 方法存在
+		obj = getfiveWayValveImg(obj);
+	}
+
+	return {
+		...row,
+		custom: obj
+	}
+}
\ No newline at end of file
diff --git a/utils/indexUtil.js b/utils/indexUtil.js
index f0682dd..d47d95a 100644
--- a/utils/indexUtil.js
+++ b/utils/indexUtil.js
@@ -4,6 +4,7 @@ import * as commonUtils from "@/utils/common.js"
 import {
 	deptTreeSelectByRole,
 	getManagerGroundList,
+	getDeviceList
 } from "@/api/index.js"
 
 class indexUtil {
@@ -13,37 +14,56 @@ class indexUtil {
 	static showIndex = null; //默认显示的面板索引
 	static selectItem = null; //选中的数据
 	static isDataChange = false; //数据是否改变
+	static deviceData = null; //设备数据
 
 	//接收创建来的数据
-	constructor() {
+	constructor(eventHandler) {
 		this.isFirst = true;
 		this.userId = null;
 		this.list = [];
 		this.showIndex = null;
 		this.selectItem = null;
+
+		this.eventHandler = eventHandler;
 	}
 
 	// 获取列表
 	getList(userId) {
 		uni.showLoading();
 		this.userId = userId;
+		//如果是第一次获取，则先取缓存，然后异步更新数据
 		if (this.isFirst) {
+			//地块列表缓存
 			const lands = uni.getStorageSync(constant.lands);
 			if (lands && lands.userId == userId) {
 				this.list = lands.data;
 			}
+			//选中地块缓存
 			this.selectItem = uni.getStorageSync(constant.landItem) || null;
+			//默认显示索引
 			this.showIndex = this.findLandIndex(this.list, this.selectItem);
+			//设备列表
+			if (this.selectItem) {
+				const device = uni.getStorageSync(constant.device) || null;
+				if (device && device.landId == this.selectItem.id) {
+					this.device = device;
+				} else {
+					this.device = null;
+				}
+			} else {
+				this.device = null;
+			}
 		}
 		uni.hideLoading();
 		if (this.isFirst) {
 			this.isFirst = false;
-			this.getNewList(userId);
+			this.getNewLandList(userId);
+			this.getNewDeviceList(userId);
 		}
 	}
 
-	// 获取最新数据
-	async getNewList(userId) {
+	// 获取最新地块数据
+	async getNewLandList(userId) {
 		this.userId = userId;
 		// 如果是第一次获取，则重新查询一遍数据，更新旧数据
 		let company = await deptTreeSelectByRole();
@@ -58,7 +78,7 @@ class indexUtil {
 			let land = await getManagerGroundList(userId);
 			// console.error("land:", land);
 			if (land.data.length) {
-				this.handleData(companys, land.data);
+				this.handleLandData(companys, land.data);
 			} else {
 				commonUtils.toast("无数据");
 				this.list = null;
@@ -81,8 +101,8 @@ class indexUtil {
 		this.setStorage(2, this.selectItem);
 	}
 
-	// 组织数据
-	handleData(companys, lands) {
+	// 组织地块数据
+	handleLandData(companys, lands) {
 		let id = null;
 		let selectItem = null;
 		const landItem = uni.getStorageSync(constant.landItem);
@@ -106,8 +126,7 @@ class indexUtil {
 				controlFlag: item.controlFlag, //设备是否可控（0是 1否）
 				enableFlapValve: item.enableFlapValve == 0, //启用蝶阀
 				landManualOperation: item.landManualOperation == 0, //启用批量控制
-				mapContent: null,
-				isSelect: false
+				mapContent: null
 			}
 			// 获取地图信息
 			if (item.landMap != null) {
@@ -115,7 +134,6 @@ class indexUtil {
 			}
 			// 判断是否当前选中的数据
 			if (param.id == id) {
-				param.isSelect = true;
 				selectItem = param;
 			}
 			// 判断公司是否已经分组，如果未分组，则添加分组
@@ -130,7 +148,6 @@ class indexUtil {
 		let index = 0;
 		while (!selectItem) {
 			if (companys[index].children.length) {
-				companys[index].children[0].isSelect = true;
 				selectItem = companys[index].children[0];
 			}
 		}
@@ -153,6 +170,41 @@ class indexUtil {
 		return showIndex;
 	}
 
+	//获取最新设备数据
+	async getNewDeviceList() {
+		// 如果是第一次获取，则重新查询一遍数据，更新旧数据
+		// let device = await getDeviceList();
+		// console.error("device:", device) 
+		let query = {
+			landId: this.selectItem.id,
+			deviceCode: ""
+		}
+		getDeviceList(query).then(res => {
+			// console.error("device:", res);
+			let device = {
+				stations: [],
+				flapValves: [],
+				waterOutlets: [],
+			}
+			if (res.data) {
+				if (res.data.devices.length) {
+					device.stations = res.data.devices.filter(item => item.deviceTypeId === 1);
+					device.flapValves = res.data.devices.filter(item => item.deviceTypeId === 12);
+				}
+				if (res.data.waterOutletGroups.length) {
+					device.waterOutlets = res.data.waterOutletGroups;
+				}
+			} else {
+				device = null;
+			}
+			console.error("device:", device)
+			this.device = device;
+			this.onEventHandler(this.eventType.device);
+		}).catch(error => {
+			commonUtils.toast(error);
+		})
+	}
+
 	// 缓存数据
 	setStorage(type, data) {
 		if (type == 1) {
@@ -163,5 +215,14 @@ class indexUtil {
 			commonUtils.toast("数据持久化异常");
 		}
 	}
+
+	/****************************** 消息回调 ******************************/
+	eventType = {
+		land: "land",
+		device: "device",
+	}
+	onEventHandler(type) {
+		this.eventHandler(type);
+	}
 }
 export default indexUtil
\ No newline at end of file