From 781539c6bea54b7689baf008e22fb25028729b4a Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期六, 26 九月 2026 11:42:26 +0800
Subject: [PATCH] 修改首页显示和统计任务
---
src/modules/report/views/screen/carbon.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/modules/report/views/screen/carbon.vue b/src/modules/report/views/screen/carbon.vue
index 3121ae7..17e6a2e 100644
--- a/src/modules/report/views/screen/carbon.vue
+++ b/src/modules/report/views/screen/carbon.vue
@@ -46,6 +46,7 @@
import KpiCard from '../../components/kpi-card.vue';
import PanelCard from '../../components/panel-card.vue';
import { TIME_RANGE_OPTIONS } from '../../data/screen';
+import { chartSeries, pieTooltipFormatter, toPieData } from '../../data/screen-chart';
import { useChartTheme, useScreenData, useScreenFieldSource } from '../../hooks/use-screen';
const { data, timeRange } = useScreenData();
@@ -129,7 +130,7 @@
}));
const sourceOption = computed(() => ({
- tooltip: { trigger: 'item', formatter: '{b}<br/>{c} kgCO鈧俥 ({d}%)', ...tooltip() },
+ tooltip: { trigger: 'item', ...tooltip(), formatter: pieTooltipFormatter('kgCO鈧俥') },
legend: { bottom: 0, textStyle: { color: mutedColor.value } },
series: [
{
@@ -139,11 +140,11 @@
padAngle: 3,
itemStyle: { borderRadius: 6 },
label: { color: textColor.value, formatter: '{b}\n{d}%' },
- data: data.value.recycleItems.map(e => ({
- name: e.name + '鍥炴敹',
- value: e.carbon,
- itemStyle: { color: e.color }
- }))
+ data: toPieData(
+ chartSeries(data.value.recycleItems, e => e.carbon, { carbon: true }),
+ e => e.name + '鍥炴敹',
+ e => e.color
+ )
}
]
}));
--
Gitblit v1.9.1