diff --git a/src/pages/WorkOrder.tsx b/src/pages/WorkOrder.tsx
index b2ee88f..1ac72fa 100644
--- a/src/pages/WorkOrder.tsx
+++ b/src/pages/WorkOrder.tsx
@@ -144,7 +144,7 @@ const WorkOrderPage = () => {
const [weekAlarmList, setWeekAlarmList] = useState([]);
const [alarmChartData, setAlarmChartData] = useState([]);
const [latestThreeAlarm, setLatestThreeAlarm] = useState([]);
-
+ const [alarmAllModalVisible, setAlarmAllModalVisible] = useState(false);
@@ -430,15 +430,6 @@ const WorkOrderPage = () => {
const pieData = getOrderStatusPieData();
- const alarmTrendData = [
- { date: '05-181', value: 5 },
- { date: '05-19', value: 10 },
- { date: '05-20', value: 7 },
- { date: '05-21', value: 12 },
- { date: '05-22', value: 8 },
- { date: '05-23', value: 15 },
- { date: '05-24', value: 11 },
- ];
const getWorkOrderList = async (params = {}) => {
setLoading(true);
@@ -1358,8 +1349,16 @@ const WorkOrderPage = () => {
+ {weekAlarmList.length > 3 && (
+
+ )}
{latestThreeAlarm.length === 0 ? (
近7天无告警记录
@@ -1565,6 +1564,72 @@ const WorkOrderPage = () => {
+
+ {/* 近7天全部告警弹窗 */}
+
setAlarmAllModalVisible(false)}
+ width={900}
+ footer={null}
+ >
+ {
+ // 时间倒序展示全部告警
+ return [...weekAlarmList].sort((a, b) => dayjs(b.alarmTime).valueOf() - dayjs(a.alarmTime).valueOf());
+ })()}
+ columns={[
+ {
+ title: '告警编号',
+ dataIndex: 'alarmNo',
+ width: 140
+ },
+ {
+ title: '告警标题',
+ dataIndex: 'alarmTitle',
+ ellipsis: true
+ },
+ {
+ title: '告警级别',
+ dataIndex: 'alarmLevel',
+ width: 90,
+ render: (level) => {
+ const color = levelColorMap[level] || '#86909C';
+ const label = priorityConfig[level]?.label || '未知';
+ return {label};
+ }
+ },
+ {
+ title: '告警时间',
+ dataIndex: 'alarmTime',
+ width: 170,
+ render: (t) => dayjs(t).format('YYYY-MM-DD HH:mm:ss')
+ },
+ {
+ title: '设备名称',
+ dataIndex: 'deviceName',
+ ellipsis: true,
+ width: 200
+ },
+ {
+ title: '处理状态',
+ dataIndex: 'handleStatus',
+ width: 100,
+ render: (s) => {
+ const map = { 1: '待处理', 2: '处理中', 3: '已关闭', 4: '已忽略' };
+ let tagColor = 'default';
+ if (s === 1) tagColor = 'orange';
+ if (s === 2) tagColor = 'blue';
+ if (s === 3) tagColor = 'green';
+ return {map[s] || '-'};
+ }
+ }
+ ]}
+ />
+
+
>