+
-
{alert.type}
+
{alert.alarmTitle}
- {alert.level}
+ {alert.alarmLevel}
-
{alert.time}
+
{alert.createTime}
);
})}
diff --git a/src/pages/WorkOrder.tsx b/src/pages/WorkOrder.tsx
index 1ac72fa..97448fe 100644
--- a/src/pages/WorkOrder.tsx
+++ b/src/pages/WorkOrder.tsx
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import {
Layout, Card, Row, Col, Button, Table, Tag, Select, Input, Typography, Space,
- Statistic, Modal, message, Empty, Drawer, Descriptions, Timeline, Divider, Form, Tabs, Progress, Badge, DatePicker, Pagination, Popconfirm
+ Statistic, Modal, message, Empty, Drawer, Descriptions, Timeline, Divider, Form, Tabs, Progress, Badge, DatePicker, Pagination, Popconfirm, Image
} from 'antd';
import {
CheckOutlined, ClockCircleOutlined, ControlOutlined,
@@ -243,9 +243,9 @@ const WorkOrderPage = () => {
if (item.orderStatus === 2 || item.orderStatus === 5) running++;
// 已完成工单计算处理时长
- if (item.orderStatus === 4 && item.actualStartTime && item.actualEndTime) {
+ if (item.orderStatus === 3 && item.createTime && item.actualEndTime) {
finishCount++;
- const costMin = dayjs(item.actualEndTime).diff(dayjs(item.actualStartTime), 'minute');
+ const costMin = dayjs(item.actualEndTime).diff(dayjs(item.createTime), 'minute');
totalCostHour += costMin / 60;
allFinishOrder.push(item);
}
@@ -437,7 +437,9 @@ const WorkOrderPage = () => {
const queryParams = {
...params,
pageNum: pagination.current,
- pageSize: pagination.pageSize
+ pageSize: pagination.pageSize,
+ siteId: stationId,
+
};
const res = await getWorkOrderApi(queryParams);
@@ -494,7 +496,9 @@ const WorkOrderPage = () => {
const values = queryForm.getFieldsValue();
console.log('查询表单值:', values);
- const params: any = {};
+ const params = {
+ siteId: stationId,
+ };
if (values.orderType) {
params.orderType = values.orderType;
@@ -1136,24 +1140,84 @@ const WorkOrderPage = () => {
@@ -1618,11 +1682,10 @@ const WorkOrderPage = () => {
dataIndex: 'handleStatus',
width: 100,
render: (s) => {
- const map = { 1: '待处理', 2: '处理中', 3: '已关闭', 4: '已忽略' };
+ const map = { 1: '待处理', 2: '已关闭', };
let tagColor = 'default';
if (s === 1) tagColor = 'orange';
- if (s === 2) tagColor = 'blue';
- if (s === 3) tagColor = 'green';
+ if (s === 2) tagColor = 'green';
return {map[s] || '-'};
}
}