From 7e45c9fd79ff81248104fa75ab888359a6a4f79a Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Fri, 24 Jul 2026 19:35:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=92=8C=20=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemSetting/DeviceManagement.tsx | 2 +- src/components/alerts/AlarmHistory.tsx | 4 +- src/components/alerts/AlarmOverview.tsx | 88 +++++++++++------ src/constants.ts | 4 +- src/lib/utils.ts | 9 ++ src/pages/Home.tsx | 51 +++++++--- src/pages/WorkOrder.tsx | 95 +++++++++++++++---- 7 files changed, 187 insertions(+), 66 deletions(-) diff --git a/src/components/SystemSetting/DeviceManagement.tsx b/src/components/SystemSetting/DeviceManagement.tsx index 3ab1008..8e28ad1 100644 --- a/src/components/SystemSetting/DeviceManagement.tsx +++ b/src/components/SystemSetting/DeviceManagement.tsx @@ -227,7 +227,7 @@ export default function DeviceManagementPage() { siteId: stationId, orgId: userInfo.orgId, runSpeed: values.runSpeed, - id: paramData.id, + id: paramData?.id, }; const res = await deviceRunParamSave(payload); if (res.code === 200) { diff --git a/src/components/alerts/AlarmHistory.tsx b/src/components/alerts/AlarmHistory.tsx index 0cfa33b..18688e9 100644 --- a/src/components/alerts/AlarmHistory.tsx +++ b/src/components/alerts/AlarmHistory.tsx @@ -213,9 +213,7 @@ const AlarmHistory = () => { diff --git a/src/components/alerts/AlarmOverview.tsx b/src/components/alerts/AlarmOverview.tsx index 43430e1..c1cf434 100644 --- a/src/components/alerts/AlarmOverview.tsx +++ b/src/components/alerts/AlarmOverview.tsx @@ -11,7 +11,7 @@ import { ExclamationOutlined } from '@ant-design/icons'; import dayjs from 'dayjs'; -import { errorLevelOptions, exportTable, levelColorMap } from "../../lib/utils.js" +import { alarmHandleResultOptions, errorLevelOptions, exportTable, levelColorMap } from "../../lib/utils.js" // 接口引入 import { @@ -111,13 +111,17 @@ export default function AlarmCenterPage() { // ========== 新增:工单弹窗状态 & 表单 ========== const [createOrderModalVisible, setCreateOrderModalVisible] = useState(false); const [orderForm] = Form.useForm(); + // 图表使用:满足筛选条件的【全部告警明细】,不受分页限制 + const [allAlarmForChart, setAllAlarmForChart] = useState([]); + // 查询条件 const [queryParams, setQueryParams] = useState({ + siteId: stationId, deviceId: '', alarmLevel: '', alarmType: '', - handleStatus: '', + handleStatus: 1, startTime: '', endTime: '', }); @@ -153,12 +157,30 @@ export default function AlarmCenterPage() { setLoading(false); } }; + // 获取【全部满足筛选条件告警明细】,专门给趋势图使用,不分页 + const fetchChartAllAlarm = async () => { + try { + // pageSize 给超大值,拉取当前筛选条件下所有告警 + const res = await getAlarmList({ + pageNum: 1, + pageSize: 99999, + ...queryParams, + siteId: stationId, + handleStatus: queryParams.handleStatus + }); + if (res.code === 200) { + setAllAlarmForChart(res.rows || []); + } + } catch (err) { + console.error('加载图表告警数据失败', err); + } + }; // ====================== 获取统计(带上查询条件) ====================== const fetchStat = async () => { try { // 把查询条件一起传给统计接口 - const res = await getAlarmStatistics(queryParams); + const res = await getAlarmStatistics({ ...queryParams, handleStatus: "", siteId: stationId }); if (res.code === 200) { setStatData(res.data || {}); } @@ -191,6 +213,7 @@ export default function AlarmCenterPage() { await handleAlarm({ alarmId: currentAlarm.id, handleStatus: values.handleStatus, + handleResult: values.handleResult, handleRemark: values.handleRemark || '已处理', rootCause: values.rootCause || '无' }); @@ -249,8 +272,9 @@ export default function AlarmCenterPage() { useEffect(() => { fetchTodayAndYesterdayStat(); fetchStat(); + fetchChartAllAlarm(); - }, []); + }, [stationId]); // ====================== 表格列 ====================== const columns = [ @@ -301,12 +325,9 @@ export default function AlarmCenterPage() { render: (s) => { let color = 'default'; const text = handleStatusMap[s] || '-'; - // 1:待处理 2:处理中 3:已关闭 4:已忽略 switch (s) { case 1: color = 'orange'; break; // 待处理 - case 2: color = 'blue'; break; // 处理中 - case 3: color = 'green'; break; // 已关闭 - case 4: color = 'default'; break; // 已忽略 + case 2: color = 'green'; break; // 已关闭 default: break; } return {text}; @@ -339,11 +360,12 @@ export default function AlarmCenterPage() { } ]; // 按日期+告警级别分组统计趋势数据 + // 按日期+告警级别分组统计趋势数据(使用全量告警,不受分页影响) const getAlarmTrendData = () => { - if (!alarmList.length) return []; + if (!allAlarmForChart.length) return []; const groupMap = {}; - alarmList.forEach(item => { + allAlarmForChart.forEach(item => { if (!item.alarmTime || !item.alarmLevel) return; const day = dayjs(item.alarmTime).format('MM-DD'); const level = String(item.alarmLevel); @@ -352,7 +374,6 @@ export default function AlarmCenterPage() { groupMap[day][level] = (groupMap[day][level] || 0) + 1; }); - // 直接返回 ERROR/WARNING/INFO 字段,匹配图表series key return Object.entries(groupMap).map(([date, obj]) => ({ date, ERROR: obj.ERROR || 0, @@ -361,6 +382,7 @@ export default function AlarmCenterPage() { })); }; + const pieData = [ { name: '错误', @@ -387,6 +409,7 @@ export default function AlarmCenterPage() { const todayRes = await getAlarmStatistics({ startTime: `${today} 00:00:00`, endTime: `${today} 23:59:59`, + siteId: stationId, }); if (todayRes.code === 200) { setTodayData(todayRes.data || {}); @@ -396,6 +419,8 @@ export default function AlarmCenterPage() { const yesterdayRes = await getAlarmStatistics({ startTime: `${yesterday} 00:00:00`, endTime: `${yesterday} 23:59:59`, + siteId: stationId, + }); if (yesterdayRes.code === 200) { const yData = yesterdayRes.data || {}; @@ -513,7 +538,7 @@ export default function AlarmCenterPage() { bg: '#FFF1F0' }, { - title: '严重告警', + title: '今日严重告警', value: todayData.levelStats?.["ERROR"] || 0, trend: (() => { const now = todayData.levelStats?.["ERROR"] ?? 0; @@ -536,30 +561,30 @@ export default function AlarmCenterPage() { bg: '#FFF1F0' }, { - title: '处理中', - value: todayData.processing || 0, + title: '今日待处理', + value: todayData.pending || 0, trend: (() => { - const now = todayData.processing ?? 0; - const last = yesterdayData.processing ?? 0; + const now = todayData.pending ?? 0; + const last = yesterdayData.pending ?? 0; if (last === 0) return '较昨日 无变化'; const rateNum = ((now - last) / last) * 100; const rateStr = rateNum.toFixed(1); return rateNum > 0 ? `较昨日 +${rateStr}% ↑` : rateNum < 0 ? `较昨日 ${rateStr}% ↓` : '较昨日 0%'; })(), trendColor: (() => { - const now = todayData.processing ?? 0; - const last = yesterdayData.processing ?? 0; + const now = todayData.pending ?? 0; + const last = yesterdayData.pending ?? 0; if (last === 0) return '#86909C'; const rateNum = ((now - last) / last) * 100; return rateNum > 0 ? '#FF4D4F' : rateNum < 0 ? '#00B42A' : '#86909C'; })(), - subText: `昨日 ${yesterdayData.processing || 0}`, + subText: `昨日 ${yesterdayData.pending || 0}`, icon: , color: '#FA8C16', bg: '#FFF7E8' }, { - title: '已关闭', + title: '今日已关闭', value: todayData.closed || 0, trend: (() => { const now = todayData.closed ?? 0; @@ -644,8 +669,7 @@ export default function AlarmCenterPage() { onChange={v => setQueryParams({ ...queryParams, handleStatus: v })} options={[ { value: 1, label: '待处理' }, - { value: 2, label: '处理中' }, - { value: 3, label: '已关闭' }, + { value: 2, label: '已关闭' }, ]} /> @@ -689,13 +713,15 @@ export default function AlarmCenterPage() { @@ -790,10 +816,7 @@ export default function AlarmCenterPage() { name: '待处理', pending: statData.pending || 0, }, - { - name: '处理中', - pending: statData.processing || 0, - }, + { name: '已关闭', pending: statData.closed || 0, @@ -895,11 +918,16 @@ export default function AlarmCenterPage() { + +