diff --git a/src/pages/RealTimeMonitor.tsx b/src/pages/RealTimeMonitor.tsx
index 1600b2c..2c37876 100644
--- a/src/pages/RealTimeMonitor.tsx
+++ b/src/pages/RealTimeMonitor.tsx
@@ -35,7 +35,7 @@ import {
getSiteDevice, getRobotRouteList,
getDeviceTastPool, getSiteDeviceTaskHistory,
excuetRoute, cancelRoute, pauseRoute, recoverRoute,
- getRouteByTask, getTaskPath,
+ getRouteByTask, getTaskPath, getSingleRouteList,
getSiteUAVList, getWayLine, createWaylineTask, getUAVState,
postFlightCommmand, getFlightTaskDetail
} from '../api/device';
@@ -276,22 +276,33 @@ const RealTimeMonitorPage = () => {
}
};
+ // 加载路线详情(预设路径点击执行时)
// 加载路线详情(预设路径点击执行时)
const fetchRouteDetailAndShow = async (routeId, routeData) => {
try {
- // 先直接用 routeData 展示预定路线
- if (routeData?.points?.length) {
- const pts = routeData.points;
- const mapPoints = pts.map(p => ({
+ // 参考机器人任务界面:优先用路由自带点展示;否则按 ID 获取预设路径详情(区域 + 路线)
+ let path = [];
+ let mode = "";
+ if (routeId) {
+ const res = await getSingleRouteList({ id: routeId });
+ if (res?.code === 200 && res?.data) {
+ mode = res.data.mode;
+ path = res.data.jsonData?.path || [];
+ }
+ }
+ const mapPoints = (path || [])
+ .map(p => ({
lng: Number(p.lng ?? p.lon ?? p.longitude ?? p[0]),
lat: Number(p.lat ?? p.latitude ?? p[1]),
- }));
+ }))
+ .filter(p => !isNaN(p.lng) && !isNaN(p.lat) && Math.abs(p.lng) < 180 && Math.abs(p.lat) < 90 && p.lng !== 0 && p.lat !== 0);
+ console.log('[RTMonitor] fetchRouteDetailAndShow:', routeId, mapPoints);
+ if (mapPoints.length) {
setPoints(mapPoints);
setPolyPoints(mapPoints);
- setRouteMode(routeData.mode || '');
- setClearPlanLine(c => c + 1);
- }
+ setRouteMode(mode || '');
+ }
} catch (err) {
console.error('[RTMonitor] 展示路线失败', err);
}
@@ -404,6 +415,7 @@ const RealTimeMonitorPage = () => {
// ---- 逆变器/模拟设备:仅地图定位,不打开抽屉 ----
if (isMockDevice) {
+ setClearPlanLine(c => c + 1)
setDeviceDrawerOpen(false);
setMqttDrone(null);
return;
@@ -1136,7 +1148,9 @@ const RealTimeMonitorPage = () => {
}
width={560}
open={deviceDrawerOpen}
- onClose={() => { setDeviceDrawerOpen(false); setMqttDrone(null); }}
+ onClose={() => {
+ ; setDeviceDrawerOpen(false); setMqttDrone(null);
+ }}
destroyOnClose
extra={(selectedDevice?.gateway_sn || selectedDevice?.type === 'plane') ? null : } onClick={() => { fetchTaskPoolList(selectedDeviceSn); }}>}
>
@@ -1416,7 +1430,7 @@ const RealTimeMonitorPage = () => {
}
disabled={!selectedDevice || selectedDevice.onlineStatus !== 1}
@@ -1426,7 +1440,7 @@ const RealTimeMonitorPage = () => {
}}
style={{ flexShrink: 0 }}
>
- {t('devices.execute')}
+