From 167d54aaec2c4ed145d527b9913462585494cbad Mon Sep 17 00:00:00 2001
From: Iruka <1017819588@qq.com>
Date: Tue, 18 Feb 2025 16:58:28 +0800
Subject: [PATCH] .

---
 pages/index-map.vue            |  2 +-
 pages/index.vue                |  2 +-
 utils/indexUtil/dc.js          | 18 +++++++++---------
 utils/indexUtil/imageAssets.js |  6 +++++-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pages/index-map.vue b/pages/index-map.vue
index 10c43d2..e795247 100644
--- a/pages/index-map.vue
+++ b/pages/index-map.vue
@@ -96,7 +96,7 @@
 						<u-col span="4" style="align-items: flex-end;">
 							<view class="fixed">
 								<u-button type="success" size="mini" text="刷新" icon="reload"
-									:loading="dc.dataObj[pop.item.dataKey]?.refresh"
+									:loading="dc.dataObj[pop.item.dataKey]?.refresh || dc.refreshObj[pop.item.dataKey]"
 									@click="dc.refreshDeviceItem(pop.item.dataKey, pop.item.device)" />
 							</view>
 						</u-col>
diff --git a/pages/index.vue b/pages/index.vue
index aff7abd..b31e442 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -246,7 +246,7 @@
 													<u-col span="4" style="align-items: flex-end;">
 														<view class="fixed">
 															<u-button type="success" size="mini" text="刷新" icon="reload"
-																:loading="dc.dataObj[child.dataKey]?.refresh"
+																:loading="dc.dataObj[child.dataKey]?.refresh || dc.refreshObj[child.dataKey]"
 																@click="dc.refreshDeviceItem(child.dataKey, child.device)" />
 														</view>
 													</u-col>
diff --git a/utils/indexUtil/dc.js b/utils/indexUtil/dc.js
index 8f35113..c7b954e 100644
--- a/utils/indexUtil/dc.js
+++ b/utils/indexUtil/dc.js
@@ -505,15 +505,15 @@ class deviceControl {
 				dcEventType.refresh,
 				device
 			)
-			if (this.dataObj[mark]) {
-				this.dataObj[mark].refresh = true
-			} else {
-				this.dataObj[mark] = {
-					online: false, //在线状态
-					refresh: true, //刷新状态
-					warning: []
-				}
-			}
+			// if (this.dataObj[mark]) {
+			// 	this.dataObj[mark].refresh = true
+			// } else {
+			// 	this.dataObj[mark] = {
+			// 		online: false, //在线状态
+			// 		refresh: true, //刷新状态
+			// 		warning: []
+			// 	}
+			// }
 			// 设置刷新状态重置倒计时
 			this.setRefreshCountdown(mark)
 		} else {
diff --git a/utils/indexUtil/imageAssets.js b/utils/indexUtil/imageAssets.js
index d7c877f..87d2124 100644
--- a/utils/indexUtil/imageAssets.js
+++ b/utils/indexUtil/imageAssets.js
@@ -24,6 +24,7 @@ import valve3_open from '@/static/images/valves/3/valve3_open.gif'
 import valve3_open1 from '@/static/images/valves/3/valve3_open1.gif'
 import valve3_open2 from '@/static/images/valves/3/valve3_open2.gif'
 import valve3_run from '@/static/images/valves/3/valve3_run.gif'
+import valve3_error from '@/static/images/valves/3/valve3_error.png'
 
 import valve5 from '@/static/images/map/valve5.png'
 import valve5_select from '@/static/images/map/valve5-select.png'
@@ -44,6 +45,7 @@ import valve5_1101 from '@/static/images/valves/5/valve5_1101.gif'
 import valve5_1110 from '@/static/images/valves/5/valve5_1110.gif'
 import valve5_1111 from '@/static/images/valves/5/valve5_1111.gif'
 import valve5_run from '@/static/images/valves/5/valve5_run.gif'
+import valve5_error from '@/static/images/valves/5/valve5_error.png'
 
 // 导出这个对象以便在其他地方使用
 export {
@@ -69,6 +71,7 @@ export {
 	valve3_open1,
 	valve3_open2,
 	valve3_run,
+	valve3_error,
 	valve5,
 	valve5_select,
 	valve5_0000,
@@ -87,5 +90,6 @@ export {
 	valve5_1101,
 	valve5_1110,
 	valve5_1111,
-	valve5_run
+	valve5_run,
+	valve5_error
 }
\ No newline at end of file