From 7c07d7d269d2de371fdea18fb4478682f214201f Mon Sep 17 00:00:00 2001 From: yang chen Date: Thu, 8 Jan 2026 16:59:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor(screens):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=B1=BB=E5=92=8C=E5=B7=A5=E7=A8=8B=E7=B1=BB?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将'安全类'和'工程类'统一改为'安全类事项'和'工程类事项' - 更新companyScreen.vue中的类型定义和数据结构 - 更新mainScreen.vue中的标签处理逻辑 - 更新regionScreen.vue中的类型定义和数据初始化 - 修正所有相关组件中的switch语句匹配条件 --- src/views/screen/companyScreen.vue | 16 ++++++++-------- src/views/screen/mainScreen.vue | 10 +++++----- src/views/screen/regionScreen.vue | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/views/screen/companyScreen.vue b/src/views/screen/companyScreen.vue index 1dbb2f1..7ad63e8 100644 --- a/src/views/screen/companyScreen.vue +++ b/src/views/screen/companyScreen.vue @@ -321,16 +321,16 @@ const handleGeneralCountClick = () => { } const riskStatistics = ref({ - '安全类': [], - '工程类': [] + '安全类事项': [], + '工程类事项': [] }) const dangerDetail = ref({ - '安全类': [], - '工程类': [] + '安全类事项': [], + '工程类事项': [] }) const parkValue = ref('') -type TabType = '安全类' | '工程类' +type TabType = '安全类事项' | '工程类事项' const handleRiskTabChange = async (tab: TabType) => { @@ -339,10 +339,10 @@ const handleRiskTabChange = async (tab: TabType) => { try { let workOrderType = '' switch (tab) { - case '安全类': + case '安全类事项': workOrderType = '安全生产' break - case '工程类': + case '工程类事项': workOrderType = '物业服务-工程' break default: @@ -757,7 +757,7 @@ onMounted(async () => { query.campus_id = route.query.parkCode as string } - handleRiskTabChange('安全类') + handleRiskTabChange('安全类事项') // 先检查缓存 const cachedRecords = getCachedRegionOption() diff --git a/src/views/screen/mainScreen.vue b/src/views/screen/mainScreen.vue index 826f046..6022d15 100644 --- a/src/views/screen/mainScreen.vue +++ b/src/views/screen/mainScreen.vue @@ -608,11 +608,11 @@ const handleRiskTabChange = async (tab: TabType | '安全类事项' | '工程类 console.log('Tab changed to:', tab) try { // 处理类型映射:组件可能传入 '安全类事项' 或 '工程类事项' - let normalizedTab: TabType = '安全类' - if (tab === '安全类事项' || tab === '安全类') { - normalizedTab = '安全类' - } else if (tab === '工程类事项' || tab === '工程类') { - normalizedTab = '工程类' + let normalizedTab: TabType = '安全类事项' + if (tab === '安全类事项' || tab === '安全类事项') { + normalizedTab = '安全类事项' + } else if (tab === '工程类事项' || tab === '工程类事项') { + normalizedTab = '工程类事项' } let workOrderType = '' diff --git a/src/views/screen/regionScreen.vue b/src/views/screen/regionScreen.vue index 7a0b230..6c288b4 100644 --- a/src/views/screen/regionScreen.vue +++ b/src/views/screen/regionScreen.vue @@ -76,7 +76,7 @@ interface RegionItem { code: string } -type TabType = '安全类' | '工程类' +type TabType = '安全类事项' | '工程类事项' // 响应式数据 const currentDateTime = ref('') @@ -98,8 +98,8 @@ const visitorCount = ref(0) const parkStatistics = ref() // 危险作业/安全考核/安全、保密培训 const riskStatistics = ref>({ - 安全类: [], - 工程类: [] + 安全类事项: [], + 工程类事项: [] }) const dangerDetail = ref() // 动画相关的状态 @@ -433,7 +433,7 @@ const loadDashboardData = async (): Promise => { } catch (error) { console.error('获取超期工单数据失败:', error) } - handleRiskTabChange('安全类') + handleRiskTabChange('安全类事项') handleHiddenDangerPannelData(query) console.log('dashboardData.value>>>>>>>>>>', dashboardData.value); } @@ -623,10 +623,10 @@ const handleRiskTabChange = async (tab: TabType) => { try { let workOrderType = '' switch (tab) { - case '安全类': + case '安全类事项': workOrderType = '安全生产' break - case '工程类': + case '工程类事项': workOrderType = '物业服务-工程' break default: