From 7e00cfe328a6be1c50e83ff86da4f7fc15b520c2 Mon Sep 17 00:00:00 2001 From: yang chen Date: Tue, 30 Dec 2025 10:01:06 +0800 Subject: [PATCH 1/2] =?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) { From b4771b07220da7c66d68f3f886e2f05cc278aeec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=A5=8B=E5=8B=87?= Date: Tue, 30 Dec 2025 10:05:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E8=83=8C=E8=B0=83=E4=BA=BA=E5=91=98=E4=B8=8D=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?bug=EF=BC=8C=E5=8B=BE=E9=80=89=E6=9D=A1=E4=BB=B6=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E7=BB=99=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95=202.?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF=E5=A2=9E=E5=8A=A0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=AD=90=E7=B3=BB=E7=BB=9F=E7=9A=84=E8=B6=85=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5=E3=80=90?= =?UTF-8?q?=E9=9B=86=E5=9B=A2=E3=80=91=E6=8C=89=E9=92=AE=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LowDesign/src/utils/defaultUseUtil.ts | 2 +- src/views/Home/Index10.vue | 37 ++++++++++++------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/components/LowDesign/src/utils/defaultUseUtil.ts b/src/components/LowDesign/src/utils/defaultUseUtil.ts index ca02f84..b475414 100644 --- a/src/components/LowDesign/src/utils/defaultUseUtil.ts +++ b/src/components/LowDesign/src/utils/defaultUseUtil.ts @@ -19,7 +19,7 @@ export default { * @param options 请求配置 如：{ params:{ text:'测试' } } */ requestApi: (Method, url, options) => callApiFun(Method, url, options), - exportExcelCustom: (tableId, data) => exportExcelDataCustom(tableId, data), + exportExcelCustom: (explain,tableId, data) => exportExcelDataCustom(explain,tableId, data), cloneDeep, //深拷贝 listToTree,//列表转树结构 formatDate,//时间格式化 diff --git a/src/views/Home/Index10.vue b/src/views/Home/Index10.vue index b1a8fa4..053de84 100644 --- a/src/views/Home/Index10.vue +++ b/src/views/Home/Index10.vue @@ -26,12 +26,11 @@
-
+
👥 外协管理
-
@@ -53,12 +52,11 @@
-
+
🛡️ 风险管理
-
@@ -80,12 +78,11 @@
-
+
⚠️ 隐患管理
-
@@ -109,12 +106,11 @@
-
+
🚧 高危作业
-
@@ -146,12 +142,11 @@
-
+
📄 应急预案
-
@@ -186,12 +181,11 @@
-
+
📚 安全培训
-
@@ -866,6 +860,10 @@ const safetyTrainingChartOption = computed(() => { }) // 方法定义 +const navigateToModule = (path: string): void => { + router.push(path) +} + const openRegionSelector = (): void => { regionSelectorVisible.value = true } @@ -1430,7 +1428,7 @@ onMounted(async () => { .back-button { display: inline-flex; align-items: center; - padding: 8px 16px; + padding: 8px 30px; background: #409eff; border: 1px solid #e5e7eb; border-radius: 6px; @@ -1575,6 +1573,19 @@ onMounted(async () => { margin-bottom: 16px; padding-bottom: 12px; border-bottom: 1px solid #e5e7eb; + cursor: pointer; + transition: all 0.3s; + + &:hover { + background-color: #f9fafb; + border-radius: 4px; + padding-left: 8px; + padding-right: 8px; + margin-left: -8px; + margin-right: -8px; + padding-top: 4px; + margin-top: -4px; + } .card-title { display: flex;