From 7e00cfe328a6be1c50e83ff86da4f7fc15b520c2 Mon Sep 17 00:00:00 2001
From: yang chen <yangchenjj@isoftstone.com>
Date: Tue, 30 Dec 2025 10:01:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor(dashboard):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=95=B0=E6=8D=AE=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将隐患数据初始化逻辑从数据获取方法中移出
- 在主屏幕和区域屏幕的初始化阶段进行数据重置
- 避免定时调用时重复初始化隐患数据
- 确保loadDashboardData方法专注数据加载而非初始化
---
 src/views/screen/mainScreen.vue   | 14 +++++++-------
 src/views/screen/regionScreen.vue | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/screen/mainScreen.vue b/src/views/screen/mainScreen.vue
index d049cec..5d13d27 100644
--- a/src/views/screen/mainScreen.vue
+++ b/src/views/screen/mainScreen.vue
@@ -308,8 +308,13 @@ onMounted(async () => {
     // 将parkMap转换为数组
     query.campus_id = Array.from(parkMap.values()).map(e1 => e1.code).join();
   }
-
-  // 初始化数据
+  // 将初始化的逻辑放在这里
+  dashboardData.value.hiddenDangerData.general = 0
+  dashboardData.value.hiddenDangerData.major = 0
+  dashboardData.value.hiddenDangerData.progress.overdue = 0
+  dashboardData.value.hiddenDangerData.progress.processed = 0
+  dashboardData.value.hiddenDangerData.progress.processing = 0
+  // 初始化数据，loadDashboardData()既然是包含初始化的逻辑，所以并不适合定时调用，不然每次都要初始化。
   await loadDashboardData()
 
   // 启动定时器
@@ -453,11 +458,6 @@ const handleHiddenDangerPannelData = (query) => {
     pending: 0
   }
   try {
-    dashboardData.value.hiddenDangerData.general = 0
-    dashboardData.value.hiddenDangerData.major = 0
-    dashboardData.value.hiddenDangerData.progress.overdue = 0
-    dashboardData.value.hiddenDangerData.progress.processed = 0
-    dashboardData.value.hiddenDangerData.progress.processing = 0
     // 获取隐患排查治理数据
     getTableList('risk_level_count', query).then(res => {
       if (res.records && res.records.length > 0) {
diff --git a/src/views/screen/regionScreen.vue b/src/views/screen/regionScreen.vue
index 902b079..e74c48c 100644
--- a/src/views/screen/regionScreen.vue
+++ b/src/views/screen/regionScreen.vue
@@ -310,7 +310,12 @@ onMounted(async () => {
 
     query.campus_id = regionOption.value.map(el => el.code).join()
   }
-
+  // 暂时先放在这里
+  dashboardData.value.hiddenDangerData.general = 0
+  dashboardData.value.hiddenDangerData.major = 0
+  dashboardData.value.hiddenDangerData.progress.overdue = 0
+  dashboardData.value.hiddenDangerData.progress.processed = 0
+  dashboardData.value.hiddenDangerData.progress.processing = 0
   // 初始化数据
   await loadDashboardData()
 
@@ -456,11 +461,6 @@ const handleHiddenDangerPannelData = (query) => {
     pending: 0
   }
   try {
-    dashboardData.value.hiddenDangerData.general = 0
-    dashboardData.value.hiddenDangerData.major = 0
-    dashboardData.value.hiddenDangerData.progress.overdue = 0
-    dashboardData.value.hiddenDangerData.progress.processed = 0
-    dashboardData.value.hiddenDangerData.progress.processing = 0
     // 获取隐患排查治理数据
     getTableList('risk_level_count', query).then(res => {
       if (res.records && res.records.length > 0) {