diff --git a/src/api/workOrder.ts b/src/api/workOrder.ts
index ef5f147..416a4f5 100644
--- a/src/api/workOrder.ts
+++ b/src/api/workOrder.ts
@@ -28,7 +28,7 @@ export function addWorkOrder(data) {
export function updateWorkOrder(data) {
return request({
url: `/iot/ioTworkOrder`,
- method: 'post',
+ method: 'put',
data
});
}
diff --git a/src/components/alerts/AlarmOverview.tsx b/src/components/alerts/AlarmOverview.tsx
index 024dad1..bef85d9 100644
--- a/src/components/alerts/AlarmOverview.tsx
+++ b/src/components/alerts/AlarmOverview.tsx
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import {
Card, Row, Col, Select, DatePicker, Input, Button, Space, Table, Tag,
- Typography, message, Pagination, Spin, Drawer, Descriptions, Switch, Form
+ Typography, message, Pagination, Spin, Drawer, Descriptions, Switch, Form, Modal
} from 'antd';
import {
BellOutlined, ClockCircleOutlined, CheckCircleOutlined, ExclamationCircleOutlined,
@@ -17,38 +17,18 @@ import {
getAlarmDetail,
getAlarmStatistics,
handleAlarm,
- exportAlarm
+ exportAlarm,
+ updateAlarm
} from '../../api/alarmApi.js';
import { UniversalBarChart, UniversalLineChart, UniversalPieChart } from '../recharts.jsx';
import { addWorkOrder } from '@/api/workOrder.js';
+import { alarmLevelConfig, alarmTypeMap, handleStatusMap } from '../../constants.js';
const { RangePicker } = DatePicker;
const { Text } = Typography;
const { Option } = Select;
// ====================== 你提供的枚举 ======================
-const alarmTypeMap = {
- 1: '设备故障',
- 2: '数据异常',
- 3: '通信中断',
- 4: '性能告警',
- 5: '安全告警',
- 6: '环境告警'
-};
-
-const alarmLevelConfig = {
- 1: { description: '严重', color: '#FF4D4F' },
- 2: { description: '重要', color: '#FA8C16' },
- 3: { description: '一般', color: '#FADB14' },
- 4: { description: '提示', color: '#1890FF' }
-};
-
-const handleStatusMap = {
- 1: '待处理',
- 2: '处理中',
- 3: '已关闭',
- 4: '已忽略'
-};
// 颜色映射(从枚举自动生成)
const levelColor = Object.keys(alarmLevelConfig).reduce((map, key) => {
@@ -73,6 +53,9 @@ export default function AlarmCenterPage() {
const [pageSize] = useState(10);
const [messageApi, contextHolder] = message.useMessage();
+ const [editModalVisible, setEditModalVisible] = useState(false);
+ const [editForm] = Form.useForm();
+
// 查询条件
const [queryParams, setQueryParams] = useState({
@@ -173,6 +156,30 @@ export default function AlarmCenterPage() {
URL.revokeObjectURL(url);
});
};
+ // 打开修改告警弹窗
+ const openEditModal = (record) => {
+ editForm.setFieldsValue({
+ id: record.id,
+ alarmTitle: record.alarmTitle,
+ alarmContent: record.alarmContent,
+ alarmLevel: record.alarmLevel,
+ alarmType: record.alarmType,
+ });
+ setEditModalVisible(true);
+ };
+ // 提交修改告警
+ const handleUpdateAlarm = async (values) => {
+ try {
+ await updateAlarm(values);
+ messageApi.success('修改成功');
+ setEditModalVisible(false);
+ fetchList(); // 刷新列表
+ fetchStat(); // 刷新统计
+ } catch (err) {
+ messageApi.error('修改失败');
+ console.error(err);
+ }
+ };
// 加载
useEffect(() => {
@@ -249,7 +256,12 @@ export default function AlarmCenterPage() {
width: 100,
fixed: 'right',
render: (_, record) => (
-
+
+
+ {/* 新增修改按钮 */}
+
+
+
)
}
];
@@ -756,6 +768,76 @@ export default function AlarmCenterPage() {
)}
+ {/* ====================== 修改告警弹窗 ====================== */}
+ setEditModalVisible(false)}
+ footer={null}
+ width={520}
+ destroyOnClose
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
diff --git a/src/constants.ts b/src/constants.ts
index c085089..13b6e18 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -16,3 +16,27 @@ export const sourceTypeMap = {
6: '人工',
7: '告警'
};
+
+export const alarmTypeMap = {
+ 1: '设备故障',
+ 2: '数据异常',
+ 3: '通信中断',
+ 4: '性能告警',
+ 5: '安全告警',
+ 6: '环境告警'
+};
+
+export const alarmLevelConfig = {
+ 1: { description: '严重', color: '#FF4D4F' },
+ 2: { description: '重要', color: '#FA8C16' },
+ 3: { description: '一般', color: '#FADB14' },
+ 4: { description: '提示', color: '#1890FF' }
+};
+
+export const handleStatusMap = {
+ 1: '待处理',
+ 2: '处理中',
+ 3: '已关闭',
+ 4: '已忽略'
+};
+
diff --git a/src/pages/WorkOrder.tsx b/src/pages/WorkOrder.tsx
index 71eb897..d02b1c1 100644
--- a/src/pages/WorkOrder.tsx
+++ b/src/pages/WorkOrder.tsx
@@ -118,13 +118,25 @@ const WorkOrderPage = () => {
{ title: 'AI建议生成', value: 7, unit: '单', subValue: '', subText: '今日自动生成', icon: , bg: '#f9f0ff' },
];
- // 图表模拟数据
- const pieData = [
- { type: '待处理', value: 12 },
- { type: '执行中', value: 9 },
- { type: '已完成', value: 126 },
- { type: '已挂起', value: 4 },
- ];
+ const getOrderStatusPieData = () => {
+ const statusMap = {
+ 1: '待处理',
+ 2: '已派发',
+ 3: '执行中',
+ 4: '已完成',
+ 5: '已挂起',
+ };
+ const countMap: Record = {};
+
+ workOrderList.forEach((item: any) => {
+ const label = statusMap[item.orderStatus] || '其他';
+ countMap[label] = (countMap[label] || 0) + 1;
+ });
+
+ return Object.entries(countMap).map(([type, value]) => ({ type, value }));
+ };
+
+ const pieData = getOrderStatusPieData();
const alarmTrendData = [
{ date: '05-18', value: 5 },
@@ -540,9 +552,17 @@ const WorkOrderPage = () => {
工单状态分布} style={{ ...cardStyle, height: 380 }}>