From 88fbbff76ad4f2aecccdf225ce6f5028d4fea3d3 Mon Sep 17 00:00:00 2001 From: tangshaojian <63377964@qq.com> Date: Mon, 12 May 2025 12:15:00 +0800 Subject: [PATCH] =?UTF-8?q?tsj:=201=E3=80=81=E9=A4=90=E9=A5=AE=E6=B2=B9?= =?UTF-8?q?=E7=83=9F=E5=B7=A6=E4=BE=A7=E7=9A=84=E5=91=8A=E8=AD=A6=E6=8E=92?= =?UTF-8?q?=E8=A1=8C=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8E=92?= =?UTF-8?q?=E8=A1=8C=EF=BC=8C=E5=8A=A0=E4=B8=8Apercentage=E7=9A=84?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=EF=BC=9B=202=E3=80=81=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=9A=84=E5=91=8A=E8=AD=A6=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0=E6=88=AA=E7=9F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/RealtimeMonitoring/index.tsx | 7 +++++++ .../RestaurantOil/components/LeftContent/index.tsx | 13 +++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/LeftContent/components/RealtimeMonitoring/index.tsx b/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/LeftContent/components/RealtimeMonitoring/index.tsx index f3c06800..6c94194b 100644 --- a/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/LeftContent/components/RealtimeMonitoring/index.tsx +++ b/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/LeftContent/components/RealtimeMonitoring/index.tsx @@ -337,6 +337,13 @@ const RealtimeMonitoring: React.FC = ({
handleDeviceClick(record)} + style={{ + whiteSpace: 'nowrap', + overflow: 'hidden', + textOverflow: 'ellipsis', + maxWidth: '100%', + display: 'inline-block' + }} > {text}
diff --git a/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/LeftContent/index.tsx b/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/LeftContent/index.tsx index 7f41b73c..de6ede9e 100644 --- a/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/LeftContent/index.tsx +++ b/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/LeftContent/index.tsx @@ -276,9 +276,18 @@ const LeftContent: React.FC = () => { onSuccess: (data) => { // 提取正确路径下的数据并格式化 const records = data?.records || []; - const formattedData = records.map((item: any) => ({ + + // 先按count从大到小排序 + const sortedData = records.sort((a: any, b: any) => (b.num || 0) - (a.num || 0)); + + // 找到最大的count值 + const maxCount = sortedData.length > 0 ? sortedData[0].num || 0 : 0; + + // 格式化数据并计算percentage + const formattedData = sortedData.map((item: any) => ({ name: item.qymc || item.mn || '', // 企业名称 - count: item.num || 0 // 告警次数 + count: item.num || 0, // 告警次数 + percentage: maxCount > 0 ? Math.round((item.num || 0) / maxCount * 100) : 0 // 计算百分比 })); setAlertRankingData(formattedData); -- GitLab