From 60e71d7aac38a338ce2e0bd9dc5be57123926c58 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期四, 08 十月 2026 11:36:57 +0800
Subject: [PATCH] 修改首页指标显示名称+周期标签重新做数据请求
---
src/modules/report/views/screen/overview.vue | 2 +-
src/modules/report/views/screen/carbon.vue | 2 +-
src/plugins/crud/components/select/button.tsx | 5 ++++-
src/modules/report/views/screen/resource.vue | 2 +-
src/modules/report/hooks/use-screen.ts | 4 +++-
src/modules/report/views/screen/map.vue | 2 +-
6 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/modules/report/hooks/use-screen.ts b/src/modules/report/hooks/use-screen.ts
index bababc0..12abc49 100644
--- a/src/modules/report/hooks/use-screen.ts
+++ b/src/modules/report/hooks/use-screen.ts
@@ -115,7 +115,9 @@
if (!inited) {
inited = true;
- watch(sharedTimeRange, () => load());
+ watch(sharedTimeRange, () => {
+ loadImpl();
+ });
}
load();
diff --git a/src/modules/report/views/screen/carbon.vue b/src/modules/report/views/screen/carbon.vue
index 09763ed..b58c3ec 100644
--- a/src/modules/report/views/screen/carbon.vue
+++ b/src/modules/report/views/screen/carbon.vue
@@ -58,7 +58,7 @@
);
const kpis = computed(() => [
- { field: 'kpis.periodWeightTon', label: `${rangeLabel.value}璧勬簮鍥炴敹`, value: data.value.kpis.periodWeightTon, suffix: '鍚�', fixed: 2, hint: '褰撳墠鏃堕棿鑼冨洿' },
+ { field: 'kpis.periodWeightTon', label: `${rangeLabel.value}鎬婚噺`, value: data.value.kpis.periodWeightTon, suffix: '鍚�', fixed: 2, hint: '褰撳墠鏃堕棿鑼冨洿' },
{ field: 'kpis.newParticipants', label: `${rangeLabel.value}鍙備笌甯堢敓`, value: data.value.kpis.newParticipants, suffix: '浜�', fixed: 0, hint: '鍖洪棿鍐呭嚭鐜拌繃鐨勫幓閲嶇敤鎴�' },
{ field: 'kpis.greenActions', label: `${rangeLabel.value}鐜繚琛屼负`, value: data.value.kpis.greenActions, suffix: '娆�', fixed: 0, hint: '鍖洪棿鍐呭凡瀹屾垚璁㈠崟鏁�' }
]);
diff --git a/src/modules/report/views/screen/map.vue b/src/modules/report/views/screen/map.vue
index 669366f..0582eda 100755
--- a/src/modules/report/views/screen/map.vue
+++ b/src/modules/report/views/screen/map.vue
@@ -120,7 +120,7 @@
/** 椤堕儴 KPI */
const kpis = computed(() => [
- { field: 'kpis.periodWeightTon', label: `${rangeLabel.value}鍥炴敹閲廯, value: data.value.kpis.periodWeightTon, suffix: '鍚�', fixed: 2 },
+ { field: 'kpis.periodWeightTon', label: `${rangeLabel.value}鎬婚噺`, value: data.value.kpis.periodWeightTon, suffix: '鍚�', fixed: 2 },
{ field: 'kpis.resourceRate', label: '璧勬簮鍖栫巼', value: data.value.kpis.resourceRate, suffix: '%', fixed: 1 },
{ field: 'kpis.periodValue', label: '鍥炴敹浠峰��', value: data.value.kpis.periodValue, suffix: '鍏�', fixed: 0 },
{ field: 'kpis.periodCarbonTon', label: '纰冲噺鎺�(tCO鈧俥)', value: data.value.kpis.periodCarbonTon, suffix: 'tCO鈧俥', fixed: 2 },
diff --git a/src/modules/report/views/screen/overview.vue b/src/modules/report/views/screen/overview.vue
index 87601a2..2c12d09 100644
--- a/src/modules/report/views/screen/overview.vue
+++ b/src/modules/report/views/screen/overview.vue
@@ -79,7 +79,7 @@
);
const kpis = computed(() => [
- { field: 'kpis.periodWeightTon', label: `${rangeLabel.value}鍥炴敹閲廯, value: data.value.kpis.periodWeightTon, suffix: 't', fixed: 2, hint: '褰撳墠鏃堕棿鑼冨洿' },
+ { field: 'kpis.periodWeightTon', label: `${rangeLabel.value}鎬婚噺`, value: data.value.kpis.periodWeightTon, suffix: 't', fixed: 2, hint: '褰撳墠鏃堕棿鑼冨洿' },
{ field: 'kpis.resourceRate', label: '璧勬簮鍖栫巼', value: data.value.kpis.resourceRate, suffix: '%', fixed: 1, hint: '鍙洖鏀剁墿閲嶉噺/鎬婚噸閲忥紝涓嶅惈澶т欢' },
{ field: 'kpis.periodValue', label: '鍥炴敹浠峰��', value: data.value.kpis.periodValue, suffix: '鍏�', fixed: 0, hint: '鏃ヨ〃浼扮畻閿�鍞' },
{ field: 'kpis.periodCarbonTon', label: '纰冲噺鎺�', value: data.value.kpis.periodCarbonTon, suffix: 'tCO鈧俥', fixed: 2, hint: '鍒嗙被閲嶉噺 脳 纰冲噺鍥犳暟' },
diff --git a/src/modules/report/views/screen/resource.vue b/src/modules/report/views/screen/resource.vue
index dcb45ad..cc65457 100644
--- a/src/modules/report/views/screen/resource.vue
+++ b/src/modules/report/views/screen/resource.vue
@@ -43,7 +43,7 @@
const { textColor, mutedColor, splitColor, primary, tooltip } = useChartTheme();
const kpis = computed(() => [
- { field: 'kpis.periodWeightTon', label: '鍥炴敹鎬婚噺', value: data.value.kpis.periodWeightTon, suffix: '鍚�', fixed: 2, hint: '鍏ㄩ儴鍒嗙被閲嶉噺鍚堣' },
+ { field: 'kpis.periodWeightTon', label: '鎬婚噺', value: data.value.kpis.periodWeightTon, suffix: '鍚�', fixed: 2, hint: '鍏ㄩ儴鍒嗙被閲嶉噺鍚堣' },
{ field: 'kpis.recyclableTon', label: '鍙洖鏀剁墿', value: data.value.kpis.recyclableTon, suffix: '鍚�', fixed: 2, hint: 'SW62' },
{ field: 'kpis.bulkTon', label: '澶т欢鍨冨溇', value: data.value.kpis.bulkTon, suffix: '鍚�', fixed: 2, hint: 'SW63' },
{ field: 'kpis.elecTon', label: '鐢靛瓙浜у搧', value: data.value.kpis.elecTon, suffix: '鍚�', fixed: 2, hint: '鍙洖鏀跺瓙绫�' },
diff --git a/src/plugins/crud/components/select/button.tsx b/src/plugins/crud/components/select/button.tsx
index 8f30c0b..31d3112 100644
--- a/src/plugins/crud/components/select/button.tsx
+++ b/src/plugins/crud/components/select/button.tsx
@@ -23,7 +23,10 @@
'is-small': props.small
}
]}
- v-model={value.value}
+ modelValue={value.value}
+ onUpdate:modelValue={(val: string | number) => {
+ value.value = val;
+ }}
options={props.options}
/>
);
--
Gitblit v1.9.1