From 0349637c32a191955f001647b6051b832264dd73 Mon Sep 17 00:00:00 2001
From: yang chen <yangchenjj@isoftstone.com>
Date: Thu, 8 Jan 2026 11:45:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(screen):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=88=E5=B9=B6=E9=80=BB=E8=BE=91=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E5=BF=97=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在数据处理过程中添加了 flag 标志位的初始化
- 确保在数据合并前 flag 标志位被正确设置
- 修复了因标志位未初始化导致的数据合并条件判断问题
---
 src/views/screen/mainScreen.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/screen/mainScreen.vue b/src/views/screen/mainScreen.vue
index a2b945d..15badfa 100644
--- a/src/views/screen/mainScreen.vue
+++ b/src/views/screen/mainScreen.vue
@@ -461,6 +461,7 @@ const handleHiddenDangerPannelData = (query) => {
             console.log('risk_status_count 接口返回数据:', record)
             console.log('处理后的 _data:', _data)
 
+            _data2.flag = false
             if (_data2.flag) {
               // 合并数据
               console.log("请求系统和第三方成功，合并数据", _data, _data2);

From 0042c048eb6194a668bda18632ccfb2f26422420 Mon Sep 17 00:00:00 2001
From: yang chen <yangchenjj@isoftstone.com>
Date: Thu, 8 Jan 2026 12:29:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(screen):=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E7=B1=BB=E5=9E=8B=E5=91=BD=E5=90=8D=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 TabType 类型定义中的 '安全类' 和 '工程类' 更新为 '安全类事项' 和 '工程类事项'
- 更新 riskStatistics 数据结构中的键名以匹配新的类型定义
- 修改 handleRiskTabChange 函数调用参数以使用新的事项类型名称
- 调整 switch 语句中的 case 条件以对应更新后的类型名称
---
 src/views/screen/mainScreen.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/screen/mainScreen.vue b/src/views/screen/mainScreen.vue
index 15badfa..a083868 100644
--- a/src/views/screen/mainScreen.vue
+++ b/src/views/screen/mainScreen.vue
@@ -74,7 +74,7 @@ interface RegionItem {
   code: string
 }
 
-type TabType = '安全类' | '工程类'
+type TabType = '安全类事项' | '工程类事项'
 
 // 响应式数据
 const currentDateTime = ref<string>('')
@@ -96,8 +96,8 @@ const visitorCount = ref<number>(0)
 const parkStatistics = ref<any>()
 // 高危作业/安全培训考试/安全培训考试
 const riskStatistics = ref<any>({
-  安全类: [],
-  工程类: []
+  安全类事项: [],
+  工程类事项: []
 })
 const dangerDetail = ref<any>()
 
@@ -416,7 +416,7 @@ const loadDashboardData = async (): Promise<void> => {
   } catch (error) {
     console.error('获取超期工单数据失败:', error)
   }
-  handleRiskTabChange('安全类')
+  handleRiskTabChange('安全类事项')
   handleHiddenDangerPannelData(query)
   console.log('dashboardData.value>>>>>>>>>>', dashboardData.value);
 }
@@ -605,10 +605,10 @@ const handleRiskTabChange = async (tab: TabType) => {
   try {
     let workOrderType = ''
     switch (tab) {
-      case '安全类':
+      case '安全类事项':
         workOrderType = '物业服务-安全'
         break
-      case '工程类':
+      case '工程类事项':
         workOrderType = '物业服务-工程'
         break
       default: