diff --git a/src/components/alerts/AlarmHistory.tsx b/src/components/alerts/AlarmHistory.tsx index a4b121a..8ab52ab 100644 --- a/src/components/alerts/AlarmHistory.tsx +++ b/src/components/alerts/AlarmHistory.tsx @@ -1,33 +1,34 @@ import React, { useState, useEffect } from 'react'; import { - Card, Table, Tag, Badge, Space, Button, - Modal, Descriptions, Form, Select, Input, Pagination, message + Card, Table, Tag, Space, Button, + Drawer, Descriptions, Form, Select, Pagination, message } from 'antd'; -import { EyeOutlined, SearchOutlined } from '@ant-design/icons'; +import { EyeOutlined, NotificationOutlined } from '@ant-design/icons'; import dayjs from 'dayjs'; -// 引入你的告警接口 +// 接口 import { getAlarmList, getAlarmDetail } from '../../api/alarmApi.js'; const { Option } = Select; -const { Search } = Input; -// 级别 + 状态映射(和主页面保持一致) +// 配置 const levelColor = { 1: '#F53F3F', 2: '#FF7D00', 3: '#F7BA1E', 4: '#165DFF' }; const levelText = { 1: '严重', 2: '重要', 3: '一般', 4: '提示' }; const statusText = { 0: '待处理', 1: '处理中', 2: '已关闭' }; +const statusColor = { 0: '#F7BA1E', 1: '#165DFF', 2: '#00B42A' }; const AlarmHistory = () => { const [form] = Form.useForm(); - // 弹窗 - const [detailVisible, setDetailVisible] = useState(false); + // 抽屉 + const [drawerVisible, setDrawerVisible] = useState(false); const [currentAlarm, setCurrentAlarm] = useState(null); + const [detailLoading, setDetailLoading] = useState(false); - // 列表 + 分页 + // 列表 const [loading, setLoading] = useState(false); const [alarmList, setAlarmList] = useState([]); const [total, setTotal] = useState(0); @@ -36,69 +37,64 @@ const AlarmHistory = () => { // 查询条件 const [queryParams, setQueryParams] = useState({ - deviceName: '', alarmLevel: '', handleStatus: '', - timeRange: 'all' }); - // 获取告警历史列表 + // 获取列表 const fetchList = async () => { setLoading(true); try { - const res = await getAlarmList({ - pageNum, - pageSize, - ...queryParams - }); - if (res.code === 200) { + const res = await getAlarmList({ pageNum, pageSize, ...queryParams }); + if (res.code === 0) { setAlarmList(res.rows || []); setTotal(res.total || 0); } } catch (err) { - message.error('加载历史记录失败'); + message.error('加载失败'); } finally { setLoading(false); } }; - // 获取详情 + // 查看详情(打开抽屉) const showDetail = async (id) => { + setDetailLoading(true); try { const res = await getAlarmDetail(id); if (res.code === 200) { setCurrentAlarm(res.data); - setDetailVisible(true); + setDrawerVisible(true); + } else { + message.error('获取详情失败'); } } catch (err) { - message.error('获取详情失败'); + message.error('请求异常'); + } finally { + setDetailLoading(false); } }; // 搜索 const handleSearch = (values) => { - setQueryParams({ ...values }); + setQueryParams(values); setPageNum(1); }; - // 加载 useEffect(() => { fetchList(); }, [pageNum, pageSize, queryParams]); // 表格列 const columns = [ + { title: '告警编号', dataIndex: 'alarmNo', width: 180 }, { title: '告警时间', - dataIndex: 'createTime', + dataIndex: 'alarmTime', width: 190, - sorter: true - }, - { - title: '设备名称', - dataIndex: 'deviceName', - ellipsis: true + render: (t) => t ? dayjs(t).format('YYYY-MM-DD HH:mm:ss') : '-' }, + { title: '设备名称', dataIndex: 'deviceName', ellipsis: true }, { title: '告警级别', width: 100, @@ -108,24 +104,22 @@ const AlarmHistory = () => { ) }, - { - title: '告警内容', - dataIndex: 'content', - ellipsis: true - }, + { title: '告警标题', dataIndex: 'alarmTitle', ellipsis: true, width: 180 }, + { title: '告警内容', dataIndex: 'alarmContent', ellipsis: true }, { title: '处理状态', - width: 100, + width: 110, render: (r) => ( - + + + {statusText[r.handleStatus]} + ) }, { title: '操作', width: 120, + fixed: 'right', render: (_, r) => ( + + + + + + + + + + {/* 统计卡片 */} + + + + + +
+ +
+ + +
告警总数
+
+ {statData.total || 0} +
+ +
+
+ + + + + + +
+ +
+ + +
严重告警
+
+ {statData.levelStats?.[1] || 0} +
+ +
+
+ + + + + + +
+ +
+ + +
待处理
+
+ {statData.pending || 0} +
+ +
+
+ + + + + + +
+ +
+ + +
处理中
+
+ {statData.processing || 0} +
+ +
+
+ + + + + + +
+ +
+ + +
已关闭
+
+ {statData.closed || 0} +
+ +
+
+ +
+ + {/* 表格 */} + + + + + + +
+ setPageNum(p)} + showSizeChanger={false} showQuickJumper size="small" + /> +
+ + + + + {/* 三个图表 */} + + + + + + + + + + + + + + + + + + + {/* 告警详情抽屉 —— 按设计稿完整实现 */} + setDrawerVisible(false)} + width={420} + destroyOnClose + > + + {currentAlarm && ( + <> + {/* 告警头部 */} +
+
+ +
+
+
+ {currentAlarm.alarmTitle} + + {levelText[currentAlarm.alarmLevel]} + +
+
告警编号:{currentAlarm.alarmNo}
+
+
+ + {/* 告警基础信息 */} + + {currentAlarm.deviceName || '-'} + {currentAlarm.deviceType || '-'} + {dayjs(currentAlarm.alarmTime).format('YYYY-MM-DD HH:mm:ss')} + + {statusText[currentAlarm.handleStatus]} + + {currentAlarm.handleUserName || '-'} + + + {/* 告警描述 */} + +
{currentAlarm.alarmContent || '-'}
+
+ + {/* 根因分析 */} + +
{currentAlarm.rootCause || '-'}
+
+ + {/* 推荐处理措施 */} + +
{currentAlarm.handleSuggestion || '-'}
+
+ + {/* 通知与订阅 */} + + +
- - - + + 短信 + + + + + + + {/**/} + 钉钉 + + + + + + + {/**/} + 邮件 + - - - {/* 统计卡片 —— 完全匹配后端接口 */} - - - - - -
- -
- - -
告警总数
-
- {statData.total || 0} -
- - - - + {/* 底部按钮 */} + + + )} + + - - - - -
- -
- - -
严重告警
-
- {statData.levelStats?.[1] || 0} -
- - - - - - - - - -
- -
- - -
待处理
-
- {statData.pending || 0} -
- - - - - - - - - -
- -
- - -
处理中
-
- {statData.processing || 0} -
- - - - - - - - - -
- -
- - -
已关闭
-
- {statData.closed || 0} -
- - - - - - - {/* 表格 */} - - - - -
- -
- setPageNum(p)} - showSizeChanger={false} showQuickJumper size="small" - /> -
- - - - - {/* 三个图表 */} - - - - - - - - - - - - - - - - - - - - {/* 右侧详情 */} - {detailVisible && currentAlarm && ( -
- - setDetailVisible(false)} />} style={{ borderRadius: 8 }}> - -
-
- -
-
-
- {currentAlarm.content} - - {levelText[currentAlarm.alarmLevel]} - -
-
告警编号:AL{currentAlarm.id}
-
-
- - -
设备ID
{currentAlarm.deviceId}
-
状态
{statusText[currentAlarm.handleStatus]} -
发生时间
{currentAlarm.createTime}
- - - - - - - )} - ); } diff --git a/src/components/alerts/AlarmStatistics.tsx b/src/components/alerts/AlarmStatistics.tsx index 6439146..e414524 100644 --- a/src/components/alerts/AlarmStatistics.tsx +++ b/src/components/alerts/AlarmStatistics.tsx @@ -1,125 +1,165 @@ -import React, { useEffect, useRef } from 'react'; +import React, { useEffect, useRef, useState } from 'react'; import { Card, Row, Col, Space } from 'antd'; -import { AreaChartOutlined } from '@ant-design/icons'; +import { + BellOutlined, + ExclamationCircleOutlined, + ClockCircleOutlined, + CheckCircleOutlined +} from '@ant-design/icons'; import * as echarts from 'echarts'; -const AntdCard = Card as any; +// 接口引入 +import { getAlarmStatistics } from '../../api/alarmApi.js'; const AlarmStatistics = () => { - // 图表 ref const barChartRef = useRef(null); const pieChartRef = useRef(null); + const [statData, setStatData] = useState({ + total: 0, + levelStats: {}, + pending: 0, + processing: 0, + closed: 0, + }); + + // 获取统计(修复:接口 code = 0 才是成功) + const fetchStat = async () => { + try { + const res = await getAlarmStatistics(); + if (res.code === 200) { + setStatData(res.data || {}); + } + } catch (err) { } + }; + // 柱状图 useEffect(() => { if (!barChartRef.current) return; - const barChart = echarts.init(barChartRef.current); - barChart.setOption({ - title: { text: '近7天告警趋势' }, - xAxis: { - type: 'category', - data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日'] - }, + const chart = echarts.init(barChartRef.current); + + const option = { + title: { text: '近7天告警趋势', textStyle: { fontSize: 14 } }, + xAxis: { type: 'category', data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日'] }, yAxis: { type: 'value' }, - series: [ - { - data: [5, 8, 12, 9, 15, 7, 12], - type: 'bar', - itemStyle: { color: '#1677ff' } - } - ] - }); - - const resizeFn = () => barChart.resize(); - window.addEventListener('resize', resizeFn); - - return () => { - barChart.dispose(); - window.removeEventListener('resize', resizeFn); + series: [{ + data: [5, 8, 12, 9, 15, 7, statData.total || 2], + type: 'bar', + itemStyle: { color: '#165DFF', borderRadius: 4 } + }] }; - }, []); + + chart.setOption(option); + const resize = () => chart.resize(); + window.addEventListener('resize', resize); + return () => { + chart.dispose(); + window.removeEventListener('resize', resize); + }; + }, [statData]); // 饼图 useEffect(() => { if (!pieChartRef.current) return; - const pieChart = echarts.init(pieChartRef.current); - pieChart.setOption({ + const chart = echarts.init(pieChartRef.current); + + const pieData = [ + { value: statData.levelStats?.[1] || 0, name: '严重告警' }, + { value: statData.levelStats?.[2] || 0, name: '重要告警' }, + { value: statData.levelStats?.[3] || 0, name: '一般告警' }, + { value: statData.levelStats?.[4] || 0, name: '提示告警' }, + ].filter(i => i.value > 0); + + const option = { title: { text: '告警级别分布' }, tooltip: { trigger: 'item' }, - series: [ - { - type: 'pie', - radius: '50%', - data: [ - { value: 15, name: '严重告警' }, - { value: 30, name: '警告告警' }, - { value: 25, name: '提示告警' } - ] - } - ] - }); - - const resizeFn = () => pieChart.resize(); - window.addEventListener('resize', resizeFn); - - return () => { - pieChart.dispose(); - window.removeEventListener('resize', resizeFn); + legend: { bottom: 0 }, + series: [{ + type: 'pie', + radius: ['40%', '70%'], + data: pieData.length ? pieData : [{ value: 1, name: '暂无数据' }], + color: ['#F53F3F', '#FF7D00', '#F7BA1E', '#165DFF'], + }] }; + + chart.setOption(option); + const resize = () => chart.resize(); + window.addEventListener('resize', resize); + return () => { + chart.dispose(); + window.removeEventListener('resize', resize); + }; + }, [statData]); + + useEffect(() => { + fetchStat(); }, []); return ( -
- {/* 顶部统计卡片 保留你原来的图标样式 */} - - -
- -
- +
+ + +
+ +
+
-
今日告警
-
12
+
告警总数
+
{statData.total || 0}
- - -
- + +
+ +
+
-
本周告警
-
45
+
严重告警
+
{statData.levelStats?.[1] || 0}
- - -
- + +
+ +
+
-
本月告警
-
128
+
待处理
+
{statData.pending || 0}
+
+
+ + + + +
+ +
+
+
已关闭
+
{statData.closed || 0}
- + - {/* 两个图表 左右各一半 并排显示 不空洞 */} - - -
- +
+ +
+ -
- -
- + +
+ +
+