From 250f2f86c6a6edebe29433c44fcdf9b111e5207c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Thu, 7 Aug 2025 19:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E7=A3=81=E9=98=80=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8E=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/controller/controller.vue | 35 +++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/pages/controller/controller.vue b/pages/controller/controller.vue
index e532ee4e..9a55bc8c 100644
--- a/pages/controller/controller.vue
+++ b/pages/controller/controller.vue
@@ -1000,7 +1000,7 @@
 		<view class="content">
 			<template v-for="(item,index) in electronMagneticStatus">
 			
-				<view class="lishui-item" v-if="item.state != 0" :key="index">
+				<view class="lishui-item" v-if="item.show == 0" :key="index">
 					<view class="lishui-title">
 						<view class="title-left">
 							{{ item.name }}
@@ -2247,52 +2247,68 @@
 				valve_input_value: '',
 				valveControlIndex: 0,
 				electronMagneticStatus: [{
+					id:11,
 						name: '1#电磁阀',
 						code: 1166,
 						state:0,
 						open:0,
+						show:0,
 					},
 					{
+					id:12,
 						name: '2#电磁阀',
 						code: 1167,
 						state:0,
 						open:0,
+						show:0,
 					},
 					{
+					id:13,
 						name: '3#电磁阀',
 						code: 1168,
 						state:0,
 						open:0,
+						show:0,
 					},
 					{
+					id:14,
 						name: '4#电磁阀',
 						code: 1169,
 						state:0,
 						open:0,
+						show:0,
 					},
 					{
+					id:15,
 						name: '5#电磁阀',
 						code: 1170,
 						state:0,
 						open:0,
+						show:0,
 					},
 					{
+					id:16,
 						name: '6#电磁阀',
 						code: 1171,
 						state:0,
 						open:0,
+						show:0,
 					},
 					{
+					id:17,
 						name: '7#电磁阀',
 						code: 1172,
 						state:0,
 						open:0,
+						show:0,
 					},
 					{
+					id:18,
 						name: '8#电磁阀',
 						code: 1173,
 						state:0,
 						open:0,
+						show:0,
 					},
 				],
 				electronMagneticList:[],
@@ -3019,6 +3035,8 @@
 					if (res.code == 200) {
 						uni.hideLoading()
 						uni.stopPullDownRefresh();
+						
+				
 						res.data.forEach((el, index) => {
 							this.purviewList.push(el.id.toString())
 							if (el.id == '19') {
@@ -3079,12 +3097,12 @@
 								this.highpressuremistList = this.toNewList(this.highpressuremistList,
 									el.child)
 							} else {
-
-								for (let t = 0; t < this.electronMagneticStatus.length; t++) {
-									if ((t + 11) == el.id) {
-										this.electronMagneticStatus[t].name = el.nickName
-									}
-								}
+								this.electronMagneticStatus.forEach((el1,index)=>{
+										if(el1.id==el.id){
+											this.electronMagneticStatus[index].name=el.nickName
+											this.electronMagneticStatus[index].show=el.state
+										}
+								})
 							}
 
 
@@ -3410,7 +3428,8 @@
 			},
         getDCF(t,data){
             var index=t
-            var num=data[1174]
+            var num=data[1174]?data[1174]:'0'
+
                 var num1 = this.padString(num.toString(2), 8)
 
             var openListNew = []