From 920944bfd94d87bfd0972a74997ef5ff0e2cbede Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Tue, 2 Jun 2026 15:42:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E9=97=B2=E9=9D=A2=E6=9D=BF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=92=8C=E8=B7=AF=E5=BE=84=E6=89=A7=E8=A1=8C=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device.ts | 11 +++++++++++ src/components/devices/DeviceOverviewPage.tsx | 9 +++++++-- src/components/devices/DeviceStatusPage.tsx | 5 +++-- src/components/devices/RobotTaskPage.tsx | 16 +++++++++++++++- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/api/device.ts b/src/api/device.ts index 2af912a..dd51da1 100644 --- a/src/api/device.ts +++ b/src/api/device.ts @@ -278,4 +278,15 @@ export function deleteDeviceTask(data) { }) } +//创建路径规划并且执行 + +export function excuetRoute(data) { + return request({ + url: `/iot/deviceTask/createDeviceTask`, + method: 'post', + data + + }) +} + diff --git a/src/components/devices/DeviceOverviewPage.tsx b/src/components/devices/DeviceOverviewPage.tsx index d32f069..ce9a7fc 100644 --- a/src/components/devices/DeviceOverviewPage.tsx +++ b/src/components/devices/DeviceOverviewPage.tsx @@ -105,10 +105,15 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS console.error('数据请求失败', err); } }; + const freePlaneData = useMemo(() => { + if (!planedevices) return; + const data = planedevices.filter(item => item.modeStatistics !== 'running').length || 0; + return data; + }, [planedevices]) useEffect(() => { fetchAllData(); - }, [userInfo, stationId]); + }, [stationId]); useEffect(() => { fetchTaskStats(); }, [devicesAll.length]); @@ -456,7 +461,7 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS } }; fetchUavState(); - }, [isUAV, selectedDevice]); + }, [selectedDevice]); return ( diff --git a/src/components/devices/DeviceStatusPage.tsx b/src/components/devices/DeviceStatusPage.tsx index ab4f925..94a036a 100644 --- a/src/components/devices/DeviceStatusPage.tsx +++ b/src/components/devices/DeviceStatusPage.tsx @@ -476,6 +476,7 @@ export default function DeviceStatusPage({ : 'robot', }; }, [device, isUAV, runningStatus, uavState, currentDroneData]); + console.log('DeviceStatusPage mapDevices:', mapDevices); const realtimeDevice = useMemo(() => { if (!device) return null; return { @@ -498,7 +499,7 @@ export default function DeviceStatusPage({ true, 'switchResult', ); - controllerRef.current.setIsControlled(false); + setIsControlled(false); setIsModalOpen(false); }; @@ -509,7 +510,7 @@ export default function DeviceStatusPage({ false, 'switchResult', ); - controllerRef.current.setIsControlled(true); + setIsControlled(true); setIsModalOpen(false); }; diff --git a/src/components/devices/RobotTaskPage.tsx b/src/components/devices/RobotTaskPage.tsx index 1783f36..59b61bd 100644 --- a/src/components/devices/RobotTaskPage.tsx +++ b/src/components/devices/RobotTaskPage.tsx @@ -178,6 +178,9 @@ export default function RobotTaskPage() { robot: null }); }; + const handleTaskexcuted = (route) => { + console.log('执行任务,路线数据:', route); + } const handleTaskCreated = () => { resetFiltersAndRefresh(); @@ -673,6 +676,17 @@ export default function RobotTaskPage() { ID: {route.id} + +