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 f3c068002020937980ce96b90513f0e1dcad574f..6c94194bdcbf3b1603601727a7778b06897f116b 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 7f41b73c401a0ddead8245e79a6bde1d3505faa0..de6ede9eb52f41af823ee6de7489647cba85edbd 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); diff --git a/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/RightContent/components/CompletionRate/index.tsx b/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/RightContent/components/CompletionRate/index.tsx index 4586a15215a1f5e9f37c8a11f9502518deb4e67c..fee58055c5794c74b1c3dcd07c5985a19d34eb56 100644 --- a/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/RightContent/components/CompletionRate/index.tsx +++ b/src/pages/Home_v_2504/components/SubPages/RestaurantOil/components/RightContent/components/CompletionRate/index.tsx @@ -156,13 +156,39 @@ const CompletionRate: React.FC = ({ dateType, dateRange }) setData([]); return; } + + // 由于办结率数据都是0,模拟数据来看效果 + // const processedData = data.map((item: any) => { + // if (item.value === 0) { + // // 如果value字段为0,改成100以内的随机数 + // item.value = Math.floor(Math.random() * 100) + 1; + // } + // return item; + // }); + // console.log('区县办结率数据成功:', processedData); - // 转换接口返回的数据格式为图表需要的格式 - const formattedData = data.map((item: any) => ({ + // 先按count从大到小排序 + const sortedData = data.sort((a: any, b: any) => (b.value || 0) - (a.value || 0)); + // const sortedData = processedData.sort((a: any, b: any) => (b.value || 0) - (a.value || 0)); + + // 找到最大的count值 + const maxCount = sortedData.length > 0 ? sortedData[0].value || 0 : 0; + + // 格式化数据并计算percentage + const formattedData = sortedData.map((item: any) => ({ name: item.name, - percentage: parseFloat(item.value) || 0 + count: item.value || 0, + // count: parseFloat(item.value) || 0, + percentage: maxCount > 0 ? Math.round((item.value || 0) / maxCount * 100) : 0 // 计算百分比 })); + // 转换接口返回的数据格式为图表需要的格式 + // const formattedData = data.map((item: any) => ({ + // name: item.name, + // percentage: parseFloat(item.value) || 0 + // })); + + // console.log('区县办结率数据成功:', formattedData); console.log('区县办结率数据成功:'); setData(formattedData); }, @@ -235,8 +261,10 @@ const CompletionRate: React.FC = ({ dateType, dateRange })