diff --git a/src/api/device.ts b/src/api/device.ts index 63761d2..75ace55 100644 --- a/src/api/device.ts +++ b/src/api/device.ts @@ -393,6 +393,15 @@ export function getSingleRouteList(params) { }) } +//根据 任务获取规划点位 +export function getRouteByTask(params) { + return request({ + url: '/iot/workRecord/selectByTaskId', + method: 'get', + params + }) +} + diff --git a/src/components/Draggable.tsx b/src/components/Draggable.tsx index 7748819..7dc1c18 100644 --- a/src/components/Draggable.tsx +++ b/src/components/Draggable.tsx @@ -29,7 +29,7 @@ const DraggableBox: React.FC = ({ ref={nodeRef} className={clsx( 'fixed select-none z-[9999] bg-white shadow-xl rounded-lg overflow-hidden', - 'border-[8px] border-slate-200 top-[8px] left-[8px] w-[700px] h-[580px] ' // 整体8px外边框 + 'border-[8px] border-slate-200 top-[8px] right-[8px] w-[700px] h-[580px] ' // 整体8px外边框 )} > {/* 拖拽标题栏 + 关闭按钮 */} diff --git a/src/components/devices/RobotTaskPage.tsx b/src/components/devices/RobotTaskPage.tsx index a4a7b19..3df1cee 100644 --- a/src/components/devices/RobotTaskPage.tsx +++ b/src/components/devices/RobotTaskPage.tsx @@ -168,23 +168,19 @@ export default function RobotTaskPage() { // 监听任务列表和设备列表变化,自动连接正在执行中的机器人 useEffect(() => { if (!taskPoolList || !devices) return; - console.log('🔄 检测到任务列表或设备列表变化,开始检查正在执行中的任务', taskPoolList, devices); // 查找正在执行中的任务 const runningTask = taskPoolList.find(item => ['EXECUTING', 'PAUSE'].includes(item.taskStaus)); - console.log('🔄 检测到任务列表或设备列表变化,开始检查正在执行中的任务runningTask', runningTask); if (!runningTask) return; // 找到对应的设备 const targetDevice = devices.find(d => d.serialNumber === runningTask.deviceId || d.serialNumber === runningTask.deviceId); - console.log('🔄 检测到任务列表或设备列表变化,开始检查正在执行中的任务targetDevice', targetDevice); if (!targetDevice) return; // 判断是否是新设备(避免重复连接) const isSameDevice = executingRobot?.serialNumber === targetDevice.serialNumber; - console.log('🔄 检测到任务列表或设备列表变化,开始检查正在执行中的任务isSameDevice', isSameDevice); if (isSameDevice) return; @@ -422,7 +418,7 @@ export default function RobotTaskPage() { fetchTaskList(); fetchTaskPoolList(); fetchTaskHistoryList(); - //controllerRef.current?.connectDevice(selectedRobotForExecute); + controllerRef.current?.connectDevice(selectedRobotForExecute); setShowVideo(true); // 连接成功后自动打开视频 } else { @@ -1592,7 +1588,7 @@ export default function RobotTaskPage() { - {showVideo && executingRobot && ( + {showVideo && executingRobot && execute && (