机器人任务模块 完善 等待测试 路径规划 执行取消恢复任务等
This commit is contained in:
@@ -651,7 +651,7 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 4 }}>
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
|
||||
<span style={{ color: '#52c41a' }}><ThunderboltOutlined /></span>
|
||||
<span style={{ fontSize: 12 }}>电量 {fix2(realtimeDevice?.capacity_percent || 100)}%</span>
|
||||
<span style={{ fontSize: 12 }}>电量 {fix2(realtimeDevice?.capacity_percent || realtimeDevice?.lastRunningStatus?.battery || 100)}%</span>
|
||||
</div>
|
||||
{realtimeDevice?.environment_temperature && (
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
|
||||
|
||||
@@ -213,10 +213,15 @@ export default function RobotTaskPage() {
|
||||
|
||||
if (res.code == 200) {
|
||||
utils.message.success('删除成功');
|
||||
|
||||
} else {
|
||||
utils.message.error(res.msg);
|
||||
}
|
||||
}).catch(() => message.error('删除失败')).finally(() => fetchTaskList());
|
||||
}).catch(() => message.error('删除失败')).finally(() => {
|
||||
fetchTaskList();
|
||||
fetchTaskPoolList();
|
||||
fetchTaskHistoryList();
|
||||
});
|
||||
}
|
||||
|
||||
// 清空所有筛选项并刷新任务列表
|
||||
@@ -274,7 +279,9 @@ export default function RobotTaskPage() {
|
||||
utils.message.success('任务执行成功');
|
||||
setExecuteModalVisible(false);
|
||||
setExecutingRobot(selectedRobotForExecute);
|
||||
//fetchTaskList(); // 刷新任务列表
|
||||
fetchTaskList();
|
||||
fetchTaskPoolList();
|
||||
fetchTaskHistoryList();
|
||||
controllerRef.current?.connectDevice(selectedRobotForExecute);
|
||||
} else {
|
||||
utils.message.error(res.msg || '任务执行失败');
|
||||
@@ -356,15 +363,16 @@ export default function RobotTaskPage() {
|
||||
const handleCancelTask = async (task) => {
|
||||
try {
|
||||
const params = {
|
||||
//id: task.id,
|
||||
deviceId: task.deviceId,
|
||||
//siteId: stationId,
|
||||
taskId: task.id,
|
||||
//deviceId: task.deviceId,
|
||||
siteId: stationId,
|
||||
orgId: task.orgId,
|
||||
};
|
||||
const res = await cancelRoute(params);
|
||||
if (res.code === 200) {
|
||||
utils.message.success('任务已取消');
|
||||
fetchTaskList();
|
||||
fetchTaskPoolList();
|
||||
fetchTaskHistoryList();
|
||||
} else {
|
||||
utils.message.error(res.msg || '取消失败');
|
||||
}
|
||||
@@ -378,15 +386,16 @@ export default function RobotTaskPage() {
|
||||
const handlePauseTask = async (task) => {
|
||||
try {
|
||||
const params = {
|
||||
id: task.id,
|
||||
deviceId: task.deviceId,
|
||||
taskId: task.id,
|
||||
orgId: task.orgId,
|
||||
//deviceId: task.deviceId,
|
||||
siteId: stationId,
|
||||
};
|
||||
const res = await pauseRoute(params);
|
||||
if (res.code === 200) {
|
||||
utils.message.success('任务已暂停');
|
||||
fetchTaskList();
|
||||
fetchTaskPoolList();
|
||||
fetchTaskHistoryList();
|
||||
} else {
|
||||
utils.message.error(res.msg || '暂停失败');
|
||||
}
|
||||
@@ -400,15 +409,15 @@ export default function RobotTaskPage() {
|
||||
const handleRecoverTask = async (task) => {
|
||||
try {
|
||||
const params = {
|
||||
id: task.id,
|
||||
deviceId: task.deviceId,
|
||||
taskId: task.id,
|
||||
orgId: task.orgId,
|
||||
siteId: stationId,
|
||||
};
|
||||
const res = await recoverRoute(params);
|
||||
if (res.code === 200) {
|
||||
utils.message.success('任务已恢复');
|
||||
fetchTaskList();
|
||||
fetchTaskPoolList();
|
||||
fetchTaskHistoryList();
|
||||
} else {
|
||||
utils.message.error(res.msg || '恢复失败');
|
||||
}
|
||||
@@ -456,9 +465,9 @@ export default function RobotTaskPage() {
|
||||
fixed: "left"
|
||||
},
|
||||
{
|
||||
title: '设备序列号',
|
||||
title: '设备',
|
||||
dataIndex: 'deviceAlias',
|
||||
width: 280,
|
||||
width: 320,
|
||||
render: (_, record) => {
|
||||
return record.deviceAlias ? record.deviceAlias : record.deviceId;
|
||||
}
|
||||
@@ -512,7 +521,7 @@ export default function RobotTaskPage() {
|
||||
|
||||
{
|
||||
title: '执行周期',
|
||||
width: 180,
|
||||
width: 320,
|
||||
render: (_, record) => {
|
||||
return `${record.startTime || ''} - ${record.finishTime || ''}`;
|
||||
}
|
||||
@@ -567,7 +576,7 @@ export default function RobotTaskPage() {
|
||||
{
|
||||
title: '设备',
|
||||
dataIndex: 'deviceId',
|
||||
width: 150,
|
||||
width: 320,
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
@@ -592,44 +601,46 @@ export default function RobotTaskPage() {
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
width: 50,
|
||||
width: 100, // 加宽一点
|
||||
fixed: 'right',
|
||||
render: (_, record) => (
|
||||
<Space size="small">
|
||||
{record.taskStaus === 'NEW' && (
|
||||
<Popconfirm
|
||||
title="确定要取消该任务吗?"
|
||||
onConfirm={() => handleCancelTask(record)}
|
||||
okText="确定"
|
||||
cancelText="取消"
|
||||
>
|
||||
<Button type="text" size="small" danger icon={<CloseOutlined />} // 这里加了取消图标
|
||||
>取消</Button>
|
||||
</Popconfirm>
|
||||
)}
|
||||
{record.taskStaus === 'EXECUTING' && (
|
||||
<Popconfirm
|
||||
title="确定要暂停该任务吗?"
|
||||
onConfirm={() => handlePauseTask(record)}
|
||||
okText="确定"
|
||||
cancelText="取消"
|
||||
>
|
||||
<Button type="text" size="small">暂停</Button>
|
||||
</Popconfirm>
|
||||
)}
|
||||
{record.taskStaus === 'PAUSE' && (
|
||||
<Popconfirm
|
||||
title="确定要恢复该任务吗?"
|
||||
onConfirm={() => handleRecoverTask(record)}
|
||||
okText="确定"
|
||||
cancelText="取消"
|
||||
>
|
||||
<Button type="text" size="small">恢复</Button>
|
||||
</Popconfirm>
|
||||
)}
|
||||
|
||||
<>
|
||||
{record.taskStaus === 'NEW' && (
|
||||
<Popconfirm
|
||||
title="确定要取消该任务吗?"
|
||||
onConfirm={() => handleCancelTask(record)}
|
||||
okText="确定" cancelText="取消"
|
||||
>
|
||||
<Button type="text" size="small" danger icon={<CloseOutlined />}>取消</Button>
|
||||
</Popconfirm>
|
||||
)}
|
||||
|
||||
{record.taskStaus === 'EXECUTING' && (
|
||||
<Popconfirm
|
||||
title="确定要暂停该任务吗?"
|
||||
onConfirm={() => handlePauseTask(record)}
|
||||
okText="确定" cancelText="取消"
|
||||
>
|
||||
<Button type="text" size="small">暂停</Button>
|
||||
</Popconfirm>
|
||||
)}
|
||||
|
||||
{record.taskStaus === 'PAUSE' && (
|
||||
<Popconfirm
|
||||
title="确定要恢复该任务吗?"
|
||||
onConfirm={() => handleRecoverTask(record)}
|
||||
okText="确定" cancelText="取消"
|
||||
>
|
||||
<Button type="text" size="small">恢复</Button>
|
||||
</Popconfirm>
|
||||
)}
|
||||
</>
|
||||
|
||||
</Space>
|
||||
)
|
||||
}
|
||||
},
|
||||
];
|
||||
|
||||
// 历史任务表格列
|
||||
@@ -638,7 +649,7 @@ export default function RobotTaskPage() {
|
||||
{
|
||||
title: '设备',
|
||||
dataIndex: 'deviceId',
|
||||
width: 250,
|
||||
width: 320,
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
@@ -1273,6 +1284,7 @@ export default function RobotTaskPage() {
|
||||
routeList={routeList}
|
||||
stationId={stationId}
|
||||
onTaskCreated={handleTaskCreated}
|
||||
userInfo={userInfo}
|
||||
/>
|
||||
|
||||
{/* 执行任务弹窗 */}
|
||||
@@ -1316,7 +1328,7 @@ export default function RobotTaskPage() {
|
||||
);
|
||||
}
|
||||
|
||||
const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskList, routeList, stationId, onTaskCreated }) => {
|
||||
const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskList, routeList, stationId, onTaskCreated, userInfo }) => {
|
||||
const [formData, setFormData] = useState({
|
||||
path: selectedPathWork || null,
|
||||
device: null,
|
||||
@@ -1402,6 +1414,7 @@ const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskL
|
||||
const finishTime = formData.excuteDayEndTime;
|
||||
const finalData = {
|
||||
deviceId: formData.device.serialNumber,
|
||||
orgId: userInfo.orgId,
|
||||
planName: formData.planName,
|
||||
routeId: formData.path.id,
|
||||
siteId: stationId,
|
||||
|
||||
Reference in New Issue
Block a user