From 22561d62a93a2e2aa2bd421739ef719b13a60c0e Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Tue, 14 Jul 2026 17:32:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=91=8A=E8=AD=A6=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workOrder.ts | 3 +- src/components/alerts/AlarmOverview.tsx | 81 +- src/index.css | 8 + src/pages/WorkOrder.tsx | 1129 +++++++++++++---------- 4 files changed, 715 insertions(+), 506 deletions(-) diff --git a/src/api/workOrder.ts b/src/api/workOrder.ts index 9a2fa0f..800d500 100644 --- a/src/api/workOrder.ts +++ b/src/api/workOrder.ts @@ -1,10 +1,11 @@ import request from './request'; //获取工单列表 -export function getWorkOrderApi() { +export function getWorkOrderApi(params) { return request({ url: `/iot/ioTworkOrder/list`, method: 'get', + params }); } //获取工单详情 diff --git a/src/components/alerts/AlarmOverview.tsx b/src/components/alerts/AlarmOverview.tsx index 42fce1a..aa68550 100644 --- a/src/components/alerts/AlarmOverview.tsx +++ b/src/components/alerts/AlarmOverview.tsx @@ -364,34 +364,29 @@ export default function AlarmCenterPage() { // 规整成图表一维数组 return Object.entries(groupMap).map(([date, obj]) => ({ date, - severe: obj['1'] || 0, // 严重 - important: obj['2'] || 0, // 重要 - normal: obj['3'] || 0, // 一般 - tip: obj['4'] || 0 // 提示 + severe: obj['ERROR'] || 0, // 严重 + important: obj['WARNING'] || 0, // 重要 + normal: obj['INFO'] || 0, // 一般 })); }; const pieData = [ { - name: '严重', - value: statData.levelStats?.[1] || 0, + name: '错误', + value: statData.levelStats?.["ERROR"] || 0, color: '#FF4D4F', }, { - name: '重要', - value: statData.levelStats?.[2] || 0, + name: '警告', + value: statData.levelStats?.['WARNING'] || 0, color: '#FA8C16', }, { - name: '一般', - value: statData.levelStats?.[3] || 0, + name: '信息', + value: statData.levelStats?.['INFO'] || 0, color: '#FADB14', }, - { - name: '提示', - value: statData.levelStats?.[4] || 0, - color: '#1890FF', - }, + ].filter(i => i.value > 0); const fetchTodayAndYesterdayStat = async () => { const today = dayjs().format('YYYY-MM-DD'); @@ -508,7 +503,7 @@ export default function AlarmCenterPage() { title: '严重告警', value: todayData.levelStats?.[1] || 0, trend: (() => { - const now = todayData.levelStats?.[1] ?? 0; + const now = todayData.levelStats?.["ERROR"] ?? 0; const last = yesterdayData.levelStats?.[1] ?? 0; if (last === 0) return '较昨日 无变化'; const rateNum = ((now - last) / last) * 100; @@ -516,13 +511,13 @@ export default function AlarmCenterPage() { return rateNum > 0 ? `较昨日 +${rateStr}% ↑` : rateNum < 0 ? `较昨日 ${rateStr}% ↓` : '较昨日 0%'; })(), trendColor: (() => { - const now = todayData.levelStats?.[1] ?? 0; - const last = yesterdayData.levelStats?.[1] ?? 0; + const now = todayData.levelStats?.["ERROR"] ?? 0; + const last = yesterdayData.levelStats?.["ERROR"] ?? 0; if (last === 0) return '#86909C'; const rateNum = ((now - last) / last) * 100; return rateNum > 0 ? '#FF4D4F' : rateNum < 0 ? '#00B42A' : '#86909C'; })(), - subText: `昨日 ${yesterdayData.levelStats?.[1] || 0}`, + subText: `昨日 ${yesterdayData.levelStats?.["ERROR"] || 0}`, icon: , color: '#FF4D4F', bg: '#FFF1F0' @@ -617,20 +612,14 @@ export default function AlarmCenterPage() { - +
告警级别
setQueryParams({ ...queryParams, handleStatus: v })} options={[ - { value: '', label: '全部' }, { value: 1, label: '待处理' }, { value: 2, label: '处理中' }, { value: 3, label: '已关闭' }, - { value: 4, label: '已忽略' }, ]} /> @@ -654,7 +642,12 @@ export default function AlarmCenterPage() { placeholder="设备ID" value={queryParams.deviceId} onChange={e => setQueryParams({ ...queryParams, deviceId: e.target.value })} - style={{ width: 160 }} + style={{ width: 280 }} + allowClear + onBlur={(e) => { + const trimVal = e.target.value.trim(); // 只清除首尾空格 + setQueryParams({ ...queryParams, deviceId: trimVal }); + }} /> @@ -669,6 +662,13 @@ export default function AlarmCenterPage() { startTime: arr[0].format('YYYY-MM-DD HH:mm:ss'), endTime: arr[1].format('YYYY-MM-DD HH:mm:ss') }); + } else { + // 点击清空按钮 / 无选择,清空时间参数 + setQueryParams({ + ...queryParams, + startTime: '', + endTime: '' + }); } }} /> @@ -736,29 +736,24 @@ export default function AlarmCenterPage() { backgroundColor="transparent" series={[ { - key: 'severe', - name: '严重', + key: 'ERROR', + name: '错误', color: '#FF4D4F', strokeWidth: 2, }, { - key: 'important', - name: '重要', + key: 'WARNING', + name: '警告', color: '#FA8C16', strokeWidth: 2, }, { - key: 'normal', - name: '一般', + key: 'INFO', + name: '信息', color: '#FADB14', strokeWidth: 2, }, - { - key: 'tip', - name: '提示', - color: '#1890FF', - strokeWidth: 2, - }, + ]} />
diff --git a/src/index.css b/src/index.css index ef931f9..2c7d8fb 100644 --- a/src/index.css +++ b/src/index.css @@ -146,6 +146,14 @@ h4, .ant-typography h4 { font-size: clamp(1rem, 1.5vw, 1.25rem) !important; } overflow: auto !important; /* 超出高度时显示滚动条 */ } + /* 选中行高亮 */ + .compact-table .table-active-row { + background-color: #e6f7ff !important; + } + .compact-table tbody tr:hover { + background-color: #f0f7ff !important; + } + diff --git a/src/pages/WorkOrder.tsx b/src/pages/WorkOrder.tsx index 94e27be..38b6503 100644 --- a/src/pages/WorkOrder.tsx +++ b/src/pages/WorkOrder.tsx @@ -45,7 +45,7 @@ import { orderTypeConfig, sourceTypeMap } from '../constants'; import { useSelector } from 'react-redux'; import { RootState } from '../store'; import { getUser } from '../api/user'; -import utils, { getWorkOrderTypeText, workOrderTypeOptions } from '../lib/utils'; +import utils, { errorLevelOptions, getWorkOrderTypeText, workOrderTypeOptions } from '../lib/utils'; const { Option } = Select; const { Search } = Input; @@ -64,9 +64,8 @@ const priorityConfig = { const orderStatusConfig = { 1: { label: '待处理', textColor: '#1890ff' }, 2: { label: '执行中', textColor: '#1890ff' }, - 3: { label: '挂起', textColor: '#faad14' }, - 4: { label: '已完成', textColor: '#52c41a' }, - 5: { label: '处理中', textColor: '#722ed1' } + 4: { label: '挂起', textColor: '#faad14' }, + 3: { label: '已完成', textColor: '#52c41a' }, }; const WorkOrderPage = () => { @@ -98,6 +97,30 @@ const WorkOrderPage = () => { const { stationId } = useSelector((state: RootState) => state.station); const [deviceAll, setDevicesAll] = useState([]); + // 查询表单状态 + const [queryForm] = Form.useForm(); + + // 优先级选项 + const priorityOptions = [ + { value: 1, label: '高' }, + { value: 2, label: '中' }, + { value: 3, label: '低' } + ]; + + // 状态选项 + const statusOptions = [ + { value: 1, label: '待处理' }, + { value: 2, label: '执行中' }, + { value: 3, label: '已完成' }, + { value: 4, label: '已挂起' } + ]; + + // 分页状态 + const [pagination, setPagination] = useState({ + current: 1, + pageSize: 10, + }); + @@ -264,10 +287,9 @@ const WorkOrderPage = () => { const getOrderStatusPieData = () => { const statusMap = { 1: '待处理', - 2: '已派发', - 3: '执行中', - 4: '已完成', - 5: '已挂起', + 2: '执行中', + 3: '已完成', + 4: '已挂起', }; const countMap: Record = {}; @@ -291,10 +313,16 @@ const WorkOrderPage = () => { { date: '05-24', value: 11 }, ]; - const getWorkOrderList = async () => { + const getWorkOrderList = async (params = {}) => { setLoading(true); try { - const res = await getWorkOrderApi(); + const queryParams = { + ...params, + pageNum: pagination.current, + pageSize: pagination.pageSize + }; + + const res = await getWorkOrderApi(queryParams); if (res.code == 0) { setWorkOrderList(res.rows || []); setWorkOrderTotal(res.total || 0); @@ -311,6 +339,74 @@ const WorkOrderPage = () => { setLoading(false); } }; + + // 分页变化处理 + const handlePageChange = (page, pageSize) => { + setPagination({ current: page, pageSize: pageSize || pagination.pageSize }); + // 使用当前查询条件重新请求 + const values = queryForm.getFieldsValue(); + const params: any = {}; + + if (values.orderType) { + params.orderType = values.orderType; + } + if (values.priorityLevel) { + params.priorityLevel = values.priorityLevel; + } + if (values.timeRange && values.timeRange.length === 2) { + // 开始时间正常取 + params.startTime = values.timeRange[0].format('YYYY-MM-DD 00:00:00'); + // 结束时间强制补 23:59:59 + params.endTime = values.timeRange[1].format('YYYY-MM-DD 23:59:59'); + } + if (values.orderStatus && values.orderStatus !== 'all') { + params.orderStatus = values.orderStatus; + } + if (values.keyword) { + params.keyword = values.keyword; + } + + getWorkOrderList(params); + }; + + // 处理查询 + const handleQuery = async () => { + // 查询时重置到第一页 + setPagination({ ...pagination, current: 1 }); + + const values = queryForm.getFieldsValue(); + console.log('查询表单值:', values); + const params: any = {}; + + if (values.orderType) { + params.orderType = values.orderType; + } + if (values.priorityLevel) { + params.priorityLevel = values.priorityLevel; + } + if (values.timeRange && values.timeRange.length === 2) { + // 开始时间正常取 + params.startTime = values.timeRange[0].format('YYYY-MM-DD 00:00:00'); + // 结束时间强制补 23:59:59 + params.endTime = values.timeRange[1].format('YYYY-MM-DD 23:59:59'); + } + if (values.orderStatus && values.orderStatus !== 'all') { + params.orderStatus = values.orderStatus; + } + if (values.keyword) { + params.keyword = values.keyword; + } + + await getWorkOrderList(params); + }; + + // 处理重置 + const handleReset = () => { + queryForm.resetFields(); + // 重置时也重置到第一页 + setPagination({ ...pagination, current: 1 }); + getWorkOrderList(); + }; // 打开完成工单弹窗 const openCompleteModal = () => { if (!selectedRowKey) return messageApi.warning('请先选择工单'); @@ -331,7 +427,7 @@ const WorkOrderPage = () => { ...currentDetail, id: values.id, orderNo: currentDetail?.orderNo, - orderStatus: 4, // 已完成 + orderStatus: 3, // 已完成 actualStartTime: currentDetail?.actualStartTime || now, actualEndTime: now, handleResult: values.handleResult, @@ -530,7 +626,7 @@ const WorkOrderPage = () => { width: 80, render: (p) => ( - {priorityConfig[p]?.label} + {p} ) }, @@ -574,8 +670,16 @@ const WorkOrderPage = () => { }; return ( -
+ <> + +
+ - {/* 顶部标题和页签 */} -
- 工单任务管理 - -
+ {/* 顶部标题和页签 */} +
+ 工单任务管理 + +
- {/* 统计卡片 */} - - {stats.map((item, index) => ( - - -
-
-
{item.title}
-
-
{item.value}
- {item.unit && {item.unit}} -
- {/*
+ {/* 统计卡片 */} + + {stats.map((item, index) => ( + + +
+
+
{item.title}
+
+
{item.value}
+ {item.unit && {item.unit}} +
+ {/*
{item.subText} {item?.subValue}
*/} +
+
+ {item.icon} +
-
- {item.icon} -
+
+ + ))} +
+ + {/* 筛选栏 */} + +
+ + + + + + + + + + } size="small" /> + + + + + + + +
+
+ + + {/* 左侧:列表 + 底部图表 */} + + + 工单列表 + (共 {workOrderTotal} 条) + {selectedRowKeys.length > 0 && ( + <> + + + + + + + )} + + } + bodyStyle={{ padding: 0 }} + style={{ ...cardStyle, marginBottom: 8 }} + > + + record.id === selectedRowKey ? 'table-active-row' : ''} + onRow={(record) => ({ + onClick: () => handleRowSelect(record) + })} + /> +
+
- - ))} - - {/* 筛选栏 */} - - -
- 工单类型 - -
-
- 优先级 - {/**/} -
- -
- 时间范围 - -
-
- 状态 - -
-
- 关键词 - } size="small" /> -
- - - - - - - - - - - {/* 左侧:列表 + 底部图表 */} - - - 工单列表 - (共 {workOrderTotal} 条) - {selectedRowKeys.length > 0 && ( - <> - - - - - - - )} - - } - bodyStyle={{ padding: 0 }} - style={{ ...cardStyle, marginBottom: 8 }} - > - -
({ - onClick: () => handleRowSelect(record) - })} - /> -
- -
- - - - - 工单状态分布} style={{ ...cardStyle, height: 380 }}> -
- -
-
总数
-
{workOrderTotal}
+ +
+ 工单状态分布} style={{ ...cardStyle, height: 380 }}> +
+ +
+
总数
+
{workOrderTotal}
+
- -
- - - 任务排班 / 日历视图} - extra={} - style={{ ...cardStyle, height: 380 }} bodyStyle={{ padding: '16px' }}> -
- -
-
-
-
- {['08:00', '10:00', '12:00', '14:00', '16:00', '18:00'].map(t => ( -
{t}
+ + +
+ 任务排班 / 日历视图} + extra={} + style={{ ...cardStyle, height: 380 }} bodyStyle={{ padding: '16px' }}> +
+ +
+
+
+
+ {['08:00', '10:00', '12:00', '14:00', '16:00', '18:00'].map(t => ( +
{t}
+ ))} +
+ {['李工', '王工', '赵工', '陈工'].map((name, idx) => ( +
+
{name}
+
+ {idx === 0 &&
INV-05 告警排查
08:30 - 12:00
} + {idx === 1 &&
B-12 热斑复检
13:30 - 15:00
} + {idx === 1 &&
无人机巡检
16:00-18:00
} + {idx === 2 &&
组件清洗 C-05
09:00 - 12:00
} + {idx === 2 &&
清洗效果复检
15:00 - 17:00
} + {idx === 3 &&
周界摄像头修复
10:00 - 12:30
} + {idx === 3 &&
设备巡检
15:30 - 17:30
} +
+
))}
- {['李工', '王工', '赵工', '陈工'].map((name, idx) => ( -
-
{name}
-
- {idx === 0 &&
INV-05 告警排查
08:30 - 12:00
} - {idx === 1 &&
B-12 热斑复检
13:30 - 15:00
} - {idx === 1 &&
无人机巡检
16:00-18:00
} - {idx === 2 &&
组件清洗 C-05
09:00 - 12:00
} - {idx === 2 &&
清洗效果复检
15:00 - 17:00
} - {idx === 3 &&
周界摄像头修复
10:00 - 12:30
} - {idx === 3 &&
设备巡检
15:30 - 17:30
} -
-
- ))} - -
- - - + + + + - {/* 右侧:详情 + AI + 告警 */} - - -
- 工单详情 - 工单编号: {currentDetail?.orderNo || '--'} -
- -
-
- {currentDetail?.orderTitle || '暂无标题'} - {currentDetail?.priorityLevel && ( - - {currentDetail.priorityLevel} - - )} + {/* 右侧:详情 + AI + 告警 */} +
+ +
+ 工单详情 + 工单编号: {currentDetail?.orderNo || '--'}
- -
来源:{sourceTypeMap[currentDetail?.sourceType] || '--'} - 工单类型:{getWorkOrderTypeText(currentDetail?.orderType)} - 执行开始时间: - - {currentDetail?.actualStartTime} - +
+
+ {currentDetail?.orderTitle || '暂无标题'} + {currentDetail?.priorityLevel && ( + + {currentDetail.priorityLevel} + + )} +
+ + +
来源:{sourceTypeMap[currentDetail?.sourceType] || '--'} + 工单类型:{getWorkOrderTypeText(currentDetail?.orderType)} + 执行开始时间: + + {currentDetail?.actualStartTime} + + + 关联设备:{currentDetail?.deviceName || '无'} + 关联区域:{currentDetail?.siteName || '无'} + + 当前状态: + {orderStatusConfig[currentDetail?.orderStatus]?.label || '--'} + + + 任务描述: +
{currentDetail?.taskDescription || '暂无描述'}
+ + + + +
+
+
+
= 3 ? '80%' : (currentDetail?.orderStatus === 2 ? '66%' : '33%'), height: '100%', background: '#00B42A' }}>
+
+ {(() => { + const status = currentDetail?.orderStatus; + // 流程节点 + const steps = [ + { label: '已创建', step: 1 }, + { label: '执行中', step: 2 }, + { label: '已挂起', step: 3 }, + { label: '已完成', step: 4 }, + ]; + + // 判断节点是否激活 + const getStepActive = (item) => { + // 已完成:全部节点激活 + if (status === 3) return true; + // 已挂起:点亮 已创建、执行中、已挂起 + if (status === 4) return item.step <= 3; + // 执行中:点亮前2个 + if (status === 2) return item.step <= 2; + // 待处理:只点亮第一个 + if (status === 1) return item.step === 1; + return false; + }; + + // 是否挂起状态(进度条灰色) + const isSuspend = status === 4; + + // 进度条宽度 4个节点3段,每段33.33% + let progressWidth = '0%'; + if (status === 1) progressWidth = '0%'; + if (status === 2) progressWidth = '33.33%'; + if (status === 3) progressWidth = '80%'; + if (status === 4) progressWidth = '33.33%'; + + return ( +
+
+ {/* 底层灰色轨道 */} +
+ {/* 进度填充 */} +
+ + {steps.map(item => { + const active = getStepActive(item); + // 已完成状态全部显示对勾 + const isAllFinish = status === 3; + // 仅挂起状态下第三个节点显示暂停图标 + const isSuspendDot = status === 4 && item.step === 3; + + return ( +
+
+ {isAllFinish ? ( + + ) : isSuspendDot ? ( + + ) : ( + item.step + )} +
+
+ {item.label} +
+
+ ); + })} +
+
+ ); + })()} +
+
+ + +
+ - 关联设备:{currentDetail?.deviceName || '无'} - 关联区域:{currentDetail?.siteName || '无'} - - 当前状态: - {orderStatusConfig[currentDetail?.orderStatus]?.label || '--'} + + + + + + + AI 建议与关联信息} + style={{ ...cardStyle, marginTop: 8 }} bodyStyle={{ padding: '16px' }}> + + +
+
+ +
+
建议携带
+
红外热像设备
+
- - 任务描述: -
{currentDetail?.taskDescription || '暂无描述'}
+ +
+
+ +
+
优先复检组件
+
B-12-03 / B-12-05
+
+ + +
+
+ +
+
预计影响发电
+
2.1%
+
- -
-
-
-
= 3 ? '100%' : (currentDetail?.orderStatus === 2 ? '66%' : '33%'), height: '100%', background: '#00B42A' }}>
-
- {[ - { label: '已创建', step: 1, active: currentDetail?.orderStatus >= 1 }, - { label: '已派发', step: 2, active: currentDetail?.orderStatus >= 2 }, - { label: '执行中', step: 3, active: currentDetail?.orderStatus >= 2 }, - { label: '已完成', step: 4, active: currentDetail?.orderStatus >= 4 }, - ].map(item => ( -
-
- {item.active ? : item.step} -
-
{item?.label}
+ +
+
关联告警趋势 (近 7 天)
+ + + +
+
关联告警列表 (近 3 条)
+
- ))} +
+ {[ + { title: 'INV-05 逆变器告警', time: '05-24 10:24', status: 'error' }, + { title: 'B-12 区块热斑告警', time: '05-24 09:56', status: 'warning' }, + { title: 'B-12 组件温度异常', time: '05-24 09:32', status: 'warning' }, + ].map((item, idx) => ( +
+
+ {item.title} + {item.time} +
+ ))} +
+ + + + + + + {/* 修改工单弹窗 */} + setEditModalVisible(false)} footer={null} width={520}> +
+ + + + + + + + + + + + + + + + +
+ + {/* 执行工单弹窗 */} + setDispatchModalVisible(false)} footer={null} width={550}> +
+ + +
+ {selectedRowKeys.length > 0 ? ( + workOrderList + .filter(item => selectedRowKeys.includes(item.id)) + .map(item => ( +
+ • {item.orderTitle} ({item.orderNo}) +
+ )) + ) : ( +
• {currentDetail?.orderTitle} ({currentDetail?.orderNo})
+ )}
- - - -
- - - - - - - - - AI 建议与关联信息} - style={{ ...cardStyle, marginTop: 8 }} bodyStyle={{ padding: '16px' }}> - - -
-
- -
-
建议携带
-
红外热像设备
-
- - -
-
- -
-
优先复检组件
-
B-12-03 / B-12-05
-
- - -
-
- -
-
预计影响发电
-
2.1%
-
- - - - - -
关联告警趋势 (近 7 天)
- - - -
-
关联告警列表 (近 3 条)
- -
-
- {[ - { title: 'INV-05 逆变器告警', time: '05-24 10:24', status: 'error' }, - { title: 'B-12 区块热斑告警', time: '05-24 09:56', status: 'warning' }, - { title: 'B-12 组件温度异常', time: '05-24 09:32', status: 'warning' }, - ].map((item, idx) => ( -
-
- {item.title} - {item.time} -
- ))} -
- - - - - - - {/* 修改工单弹窗 */} - setEditModalVisible(false)} footer={null} width={520}> - - - - - - - - - - - - - - - - - - - - {/* 执行工单弹窗 */} - setDispatchModalVisible(false)} footer={null} width={550}> -
- - -
- {selectedRowKeys.length > 0 ? ( - workOrderList - .filter(item => selectedRowKeys.includes(item.id)) - .map(item => ( -
- • {item.orderTitle} ({item.orderNo}) -
- )) - ) : ( -
• {currentDetail?.orderTitle} ({currentDetail?.orderNo})
- )} -
-
- - {/* { ]} />*/} - { + const label = option.children || ""; + return label.toLowerCase().includes(inputValue.toLowerCase()); + }} + > + {/* 机器人设备分组 */} + + {deviceAll + .filter(item => item.serialNumber) + .map(device => ( + + ))} + + + {/* 无人机分组 */} + + {deviceAll + .filter(item => item.device_sn) + .map(device => ( + + ))} + + + + + - {/* 机器人设备分组 */} - - {deviceAll - .filter(item => item.serialNumber) - .map(device => ( - - ))} - + + + + + + + +
- {/* 无人机分组 */} - - {deviceAll - .filter(item => item.device_sn) - .map(device => ( - - ))} - - - + {/* 完成工单弹窗 */} + setCompleteModalVisible(false)} footer={null} width={500}> +
+ + + + + + + + + + + +
+ + - - - - - - - - - - {/* 完成工单弹窗 */} - setCompleteModalVisible(false)} footer={null} width={500}> -
- - - - - - - - - - - -
- ); };