机器人任务模块 任务列表新建任务 预设路线 筛选等 面板数据完成

This commit is contained in:
mmc
2026-05-29 16:21:19 +08:00
parent fb1b700779
commit 50940baa36
2 changed files with 258 additions and 51 deletions

View File

@@ -3,11 +3,13 @@ import {
Row, Col, Card, Button, Space, Table, Tag, Typography, Progress, Badge,
Tabs, Input, Switch, Divider, Tooltip, Timeline, Select, message, DatePicker,
Modal, InputNumber,
TimePicker
TimePicker,
Popconfirm
} from 'antd';
import {
PlusOutlined, ImportOutlined, NodeIndexOutlined,
SaveOutlined, PlayCircleOutlined, EyeOutlined
SaveOutlined, PlayCircleOutlined, EyeOutlined,
DeleteOutlined
} from '@ant-design/icons';
import {
Car, Navigation, Wind, Thermometer, Droplets, Satellite,
@@ -17,7 +19,8 @@ import {
import {
getRobotRouteList,
getPlaneDeviceListAll, saveDeviceTask, getRobotTaskList
getPlaneDeviceListAll, saveDeviceTask, getRobotTaskList,
deleteDeviceTask
} from '../../api/device';
import dayjs from 'dayjs';
import utils from '../../lib/utils';
@@ -38,8 +41,12 @@ export default function RobotTaskPage({ devices }) {
const cardStyle = { borderRadius: 12, border: 'none', boxShadow: '0 2px 12px rgba(0,0,0,0.04)' };
// 任务列表 独立筛选状态
const [listRobot, setListRobot] = useState(null);
const [listDateRange, setListDateRange] = useState(null);
// 统一用 form 管理筛选条件
const [filterForm, setFilterForm] = useState({
dateRange: null, // 时间范围
taskStatus: null, // 任务状态
robot: null // 机器人设备
});
const [taskList, setTaskList] = useState([]);
// 工作看板 独立筛选状态
@@ -60,14 +67,33 @@ export default function RobotTaskPage({ devices }) {
const [isTaskModalOpen, setIsTaskModalOpen] = useState(false);
const [selectedPathWork, setSelectedPathWork] = useState(null);
// 获取任务列表数据
// 获取任务列表数据
const fetchTaskList = async () => {
try {
getRobotTaskList({ siteId: String(stationId) }).then(res => {
if (res.code == 200) {
setTaskList(res.data);
}
}).catch(() => setTaskList([]));
const params = { siteId: String(stationId) };
// 时间范围
if (filterForm.dateRange && filterForm.dateRange.length === 2) {
params.startTime = filterForm.dateRange[0].format('YYYY-MM-DD');
params.endTime = filterForm.dateRange[1].format('YYYY-MM-DD');
}
// 设备
if (filterForm.robot?.serialNumber) {
params.deviceId = filterForm.robot.serialNumber;
}
// 状态
if (filterForm.taskStatus !== null && filterForm.taskStatus !== undefined) {
params.taskStaus = filterForm.taskStatus;
}
const res = await getRobotTaskList(params);
if (res.code == 200) {
setTaskList(res.data);
}
} catch (err) {
message.error('任务列表刷新失败');
}
@@ -85,12 +111,32 @@ export default function RobotTaskPage({ devices }) {
}).catch(() => setRouteList([]));
};
useEffect(() => {
if (devices?.length) {
setListRobot(devices[0]);
setBoardRobot(null);
}
}, [devices]);
const handleDelete = (id) => {
deleteDeviceTask({ id }).then(res => {
if (res.code == 200) {
utils.message.success('删除成功');
} else {
utils.message.error(res.msg);
}
}).catch(() => message.error('删除失败')).finally(() => fetchTaskList());
}
// 清空所有筛选项并刷新任务列表
// 清空所有筛选项并刷新 —— 现在超级简单!
const resetFiltersAndRefresh = () => {
setFilterForm({
dateRange: null,
taskStatus: null,
robot: null
});
};
const handleTaskCreated = () => {
resetFiltersAndRefresh();
};
useEffect(() => {
if (stationId) {
@@ -99,17 +145,122 @@ export default function RobotTaskPage({ devices }) {
}
}, [stationId]);
// 监听筛选条件变化
useEffect(() => {
if (stationId) {
fetchTaskList();
}
}, [filterForm, stationId]);
const taskColumns = [
{ title: '任务名称', dataIndex: 'workName', width: 200, ellipsis: true, fixed: "left" },
{ title: '设备名称', dataIndex: 'deviceName', width: 140 },
{ title: '执行人', dataIndex: 'userName', width: 100 },
{
title: '执行时间', dataIndex: 'createTime', width: 170,
render: t => t ? dayjs(t).format('YYYY-MM-DD HH:mm:ss') : '-'
title: '任务名称',
dataIndex: 'planName',
width: 160,
ellipsis: true,
fixed: "left"
},
{
title: '状态', dataIndex: 'status', width: 100,
render: (s) => <Tag color={s === 'success' ? 'success' : 'processing'}>{s === 'success' ? '完成' : '执行中'}</Tag>
title: '设备序列号',
dataIndex: 'deviceAlias',
width: 280,
render: (_, record) => {
return record.deviceAlias ? record.deviceAlias : record.deviceId;
}
},
{
title: '创建者',
dataIndex: 'createBy',
width: 100,
render: (text) => text
},
{
title: '创建时间',
dataIndex: 'createTime',
width: 170,
render: t => t ? dayjs(t).format('YYYY-MM-DD HH:mm:ss') : '-'
},
// 执行计划 + 周期时间
{
title: '执行计划',
width: 280,
render: (_, record) => {
const rule = record.deviceTaskPlanRules || {};
const { type, startDate, dayTime, days, dayOfMonth } = rule;
// 周映射
const weekMap = {
SUNDAY: '周日',
MONDAY: '周一',
TUESDAY: '周二',
WEDNESDAY: '周三',
THURSDAY: '周四',
FRIDAY: '周五',
SATURDAY: '周六'
};
switch (type) {
case 'DAY':
return `按天 | 开始日期${startDate || ''} ${dayTime || ''}`;
case 'WEEK':
const weekText = (days || []).map(d => weekMap[d]).join('、');
return `按周 | ${weekText} ${dayTime || ''}`;
case 'MONTH':
const monthText = (dayOfMonth || []).map(d => `${d}日`).join('、');
return `按月 | ${monthText} ${dayTime || ''}`;
default:
return '未知计划';
}
}
},
{
title: '执行周期',
width: 180,
render: (_, record) => {
return `${record.startTime || ''} - ${record.finishTime || ''}`;
}
},
{
title: '状态',
dataIndex: 'taskStaus',
width: 100,
render: (status, record) => {
const statusMap = {
'NEW': { color: 'default', text: '新建' },
'EXECUTING': { color: 'processing', text: '执行中' },
'PAUSE': { color: 'warning', text: '暂停中' },
'FINISH': { color: 'success', text: '执行成功' },
'FAILED': { color: 'error', text: '执行失败' }
};
const item = statusMap[status] || { color: 'default', text: record.taskStausTranslate || '未知' };
return <Tag color={item.color}>{item.text}</Tag>;
}
},
{
title: '操作',
width: 100,
fixed: 'right',
render: (_, record) => (
<Space>
<Popconfirm
title="确定要删除该任务吗?"
onConfirm={() => handleDelete(record.id)}
okText="确定"
cancelText="取消"
>
<Button
type="text"
danger
size="small"
icon={<DeleteOutlined />}
>
删除
</Button>
</Popconfirm>
</Space>
)
}
];
@@ -125,9 +276,9 @@ export default function RobotTaskPage({ devices }) {
};
const groupBoardData = () => {
const waitList = taskList.filter(item => item.status !== 'success');
const runList = taskList.filter(item => item.status === 'executing');
const finishList = taskList.filter(item => item.status === 'success');
const waitList = taskList.filter(item => item.taskStaus === 'NEW');
const runList = taskList.filter(item => ['EXECUTING', 'PAUSE'].includes(item.taskStaus));
const finishList = taskList.filter(item => ['FINISH', 'FAILED'].includes(item.taskStaus));
return { waitList, runList, finishList };
};
const { waitList, runList, finishList } = groupBoardData();
@@ -239,18 +390,51 @@ export default function RobotTaskPage({ devices }) {
title={
<div className="flex justify-between w-full items-center">
<span style={{ fontSize: 14, fontWeight: 700 }}>机器人任务列表</span>
<Space size={12}>
<RangePicker size="small" showTime format="YYYY-MM-DD HH:mm:ss" placeholder={['开始时间', '结束时间']} />
<Space size={8}>
<RangePicker
size="small"
format="YYYY-MM-DD"
placeholder={['开始日期', '结束日期']}
value={filterForm.dateRange}
onChange={(dates) => {
setFilterForm(prev => ({ ...prev, dateRange: dates }));
}}
/>
<Select
style={{ width: 180 }}
style={{ width: 150 }}
size="small"
placeholder="状态"
allowClear
options={[
{ label: '新建', value: 'NEW' },
{ label: '执行中', value: 'EXECUTING' },
{ label: '暂停中', value: 'PAUSE' },
{ label: '执行成功', value: 'FINISH' },
{ label: '执行失败', value: 'FAILED' },
]}
value={filterForm.taskStatus}
onChange={(val) => {
setFilterForm(prev => ({ ...prev, taskStatus: val }));
}}
/>
<Select
style={{ width: 150 }}
size="small"
placeholder="全部机器人"
allowClear
options={devices?.map(item => ({
value: item.device_sn || item.serialNumber,
value: item.serialNumber,
label: item.deviceAlias || item.deviceName
}))}
value={listRobot?.device_sn || listRobot?.serialNumber}
onChange={(val) => setListRobot(devices.find(i => (i.device_sn || i.serialNumber) === val))}
value={filterForm.robot?.serialNumber}
onChange={(val) => {
if (!val) {
setFilterForm(prev => ({ ...prev, robot: null }));
return;
}
const robot = devices.find(i => i.serialNumber === val);
setFilterForm(prev => ({ ...prev, robot: robot }));
}}
/>
{/* 🔥 新建任务按钮(加号) */}
@@ -450,10 +634,10 @@ export default function RobotTaskPage({ devices }) {
<Col span={8}>
<div style={{ background: '#F7F8FA', padding: 12, borderRadius: 8, height: 400 }}>
<Title level={5} style={{ fontSize: 14, marginBottom: 12 }}><Badge color="#86909C" text="待执行" /></Title>
{waitList.slice(0, 3).map((item, idx) => (
{waitList.map((item, idx) => (
<Card key={idx} size="small" style={{ marginBottom: 8, borderRadius: 6 }}>
<div style={{ fontWeight: 600 }}>{item.workName}</div>
<div style={{ fontSize: 12, color: '#86909C' }}>设备: {item.deviceName}</div>
<div style={{ fontWeight: 600 }}>{item.planName || item.workName}</div>
<div style={{ fontSize: 12, color: '#86909C' }}>设备: {item.deviceId}</div>
</Card>
))}
</div>
@@ -463,8 +647,10 @@ export default function RobotTaskPage({ devices }) {
<Title level={5} style={{ fontSize: 14, marginBottom: 12 }}><Badge color="#165DFF" text="进行中" /></Title>
{runList.map((item, idx) => (
<Card key={idx} size="small" style={{ marginBottom: 8, borderRadius: 6 }}>
<div style={{ fontWeight: 600 }}>{item.workName}</div>
<div style={{ fontSize: 12, color: '#165DFF' }}>正在执行...</div>
<div style={{ fontWeight: 600 }}>{item.planName || item.workName}</div>
<div style={{ fontSize: 12, color: '#165DFF' }}>
{item.taskStaus === 'EXECUTING' ? '正在执行...' : '已暂停'}
</div>
</Card>
))}
</div>
@@ -474,8 +660,10 @@ export default function RobotTaskPage({ devices }) {
<Title level={5} style={{ fontSize: 14, marginBottom: 12 }}><Badge color="#52C41A" text="已完成" /></Title>
{finishList.slice(0, 3).map((item, idx) => (
<Card key={idx} size="small" style={{ marginBottom: 8, borderRadius: 6 }}>
<div style={{ fontWeight: 600 }}>{item.workName}</div>
<div style={{ fontSize: 12, color: '#52C41A' }}>已完成</div>
<div style={{ fontWeight: 600 }}>{item.planName || item.workName}</div>
<div style={{ fontSize: 12, color: item.taskStaus === 'FAILED' ? '#F53F3F' : '#52C41A' }}>
{item.taskStaus === 'FAILED' ? '执行失败' : '执行成功'}
</div>
</Card>
))}
</div>
@@ -494,12 +682,13 @@ export default function RobotTaskPage({ devices }) {
handlGetTaskList={fetchTaskList}
routeList={routeList}
stationId={stationId}
onTaskCreated={handleTaskCreated}
/>
</div>
);
}
const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskList, routeList, stationId }) => {
const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskList, routeList, stationId, onTaskCreated }) => {
const [formData, setFormData] = useState({
path: selectedPathWork || null,
device: null,
@@ -560,13 +749,12 @@ const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskL
const handleCycleChange = (dates) => {
if (!dates || !dates[0] || !dates[1]) return;
setFormData({
...formData,
excuteDayStartTime: dates[0].format('YYYY-MM-DD'),
excuteDayEndTime: dates[1].format('YYYY-MM-DD')
});
setFormData(prev => ({
...prev,
excuteDayStartTime: dates[0].format('YYYY-MM-DD HH:mm:ss'),
excuteDayEndTime: dates[1].format('YYYY-MM-DD HH:mm:ss'),
}));
};
// ====================== 保存 ======================
const handleSave = () => {
const missingFields = [];
@@ -581,14 +769,17 @@ const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskL
return;
}
// 统一格式:年月日 时分秒
const startTime = formData.excuteDayStartTime;
const finishTime = formData.excuteDayEndTime;
const finalData = {
deviceId: formData.device.serialNumber,
planName: formData.planName,
routeId: formData.path.id,
siteId: stationId,
deviceTaskPlanRules: { type: formData.repeatPlan },
endTime: formData.excuteDayEndTime,
startTime: startTime,
finishTime: finishTime,
};
if (formData.repeatPlan === 'DAY') {
@@ -610,13 +801,16 @@ const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskL
dayTime: formData.dayTime
};
}
if (!finalData.deviceTaskPlanRules.dayTime) {
utils.message.error('请选择执行时间');
return;
}
saveDeviceTask(finalData).then(res => {
if (res.code === 200) {
utils.message.success('任务创建成功');
onClose();
handlGetTaskList();
onTaskCreated();
} else {
utils.message.error(res.data.msg || '创建失败');
}
@@ -765,6 +959,8 @@ const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskL
onChange={handleCycleChange}
className="w-full"
placeholder={['开始日期', '结束日期']}
showTime
format="YYYY-MM-DD HH:mm:ss"
/>
{/* 底部按钮 */}