From b8a6a053cb6dbaba842a390c08dc5bca701459aa Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Mon, 15 Jun 2026 14:21:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=20=E4=B9=9F=E5=8F=AF=E4=B9=9F=E8=BF=9E=E6=8E=A5ws?= =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=96=AD=E5=93=AA=E4=B8=AA=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E5=9C=A8=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/devices/RobotTaskPage.tsx | 37 ++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/components/devices/RobotTaskPage.tsx b/src/components/devices/RobotTaskPage.tsx index 801bd69..a4a7b19 100644 --- a/src/components/devices/RobotTaskPage.tsx +++ b/src/components/devices/RobotTaskPage.tsx @@ -163,7 +163,40 @@ export default function RobotTaskPage() { controllerRef.current = null; }; - }, []) + }, []); + + // 监听任务列表和设备列表变化,自动连接正在执行中的机器人 + 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; + + // 切换设备 + console.log('🔄 检测到正在执行任务的新设备,开始连接', targetDevice); + setExecute(true); + setExecutingRobot(targetDevice); + setClearNavLine(v => v + 1); // 清空地图轨迹 + controllerRef.current?.connectDevice(targetDevice); + setShowVideo(true); + + }, [devices, taskPoolList, executingRobot]); const realtimePosition = useMemo(() => { @@ -389,7 +422,7 @@ export default function RobotTaskPage() { fetchTaskList(); fetchTaskPoolList(); fetchTaskHistoryList(); - controllerRef.current?.connectDevice(selectedRobotForExecute); + //controllerRef.current?.connectDevice(selectedRobotForExecute); setShowVideo(true); // 连接成功后自动打开视频 } else {