From 91c01e249fdc9fd7f13738268f94bb6d64580fd1 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Wed, 28 Oct 2026 17:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BC=96=E8=BE=91=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=9C=E7=A2=8D=E7=89=A9=20=E9=9A=9C?= =?UTF-8?q?=E7=A2=8D=E7=89=A9=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9=E5=8D=8A?= =?UTF-8?q?=E5=BE=84=20=20=20=E8=BF=94=E8=88=AA=20=E5=88=86=E5=8C=BA=20?= =?UTF-8?q?=E9=9A=9C=E7=A2=8D=E7=89=A9=20=20=E6=94=AF=E6=8C=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemSetting/RuleConfigManagement.tsx | 16 +- src/components/devices/MapEditorPage.tsx | 833 ++++++++++++++++-- src/components/devices/deviceController.js | 3 + src/pages/TaskMonitorPage.tsx | 636 +++++++++++++ src/router/routes.tsx | 7 +- 5 files changed, 1394 insertions(+), 101 deletions(-) create mode 100644 src/pages/TaskMonitorPage.tsx diff --git a/src/components/SystemSetting/RuleConfigManagement.tsx b/src/components/SystemSetting/RuleConfigManagement.tsx index 811a694..c13e4fc 100644 --- a/src/components/SystemSetting/RuleConfigManagement.tsx +++ b/src/components/SystemSetting/RuleConfigManagement.tsx @@ -93,9 +93,15 @@ export default function RuleConfigManagement() { setLoading(true); try { const res = await selectRuleBySiteId({ siteId: stationId }); - const list = res?.data || res?.rows || []; - setRuleList(list); - setFilteredList(list); + if (res.code == 200) { + const list = res?.data || res?.rows || []; + setRuleList(list); + setFilteredList(list); + } else { + setRuleList([]); + setFilteredList([]); + } + } catch (err) { utils.message.error(t('systemSetting.operationFailed')); } finally { @@ -319,8 +325,8 @@ export default function RuleConfigManagement() { render: (val: any) => {val === 1 || val === true ? t('common.yes') : t('common.no')}, }, { - title: t('common.actions'), - key: 'action', + title: t('common.actions'), + key: 'action', width: 220, fixed: 'right' as const, render: (_: any, record: any) => ( diff --git a/src/components/devices/MapEditorPage.tsx b/src/components/devices/MapEditorPage.tsx index 2f36c82..f98d7d9 100644 --- a/src/components/devices/MapEditorPage.tsx +++ b/src/components/devices/MapEditorPage.tsx @@ -19,7 +19,7 @@ import { getSiteMapInfo, getStationRegions, saveRegion, deleteRegion } from '@/a import { wsManager } from '@/components/WebSocketManager.ts'; import envConfig from '../../../env'; -type EditorType = 'returnPoint' | 'restArea' | 'routeGen'; +type EditorType = 'returnPoint' | 'restArea' | 'routeGen' | 'obstaclePoint'; type RouteType = 'MOWING_TASK' | 'INSPECTION_TASK' | 'OTHER'; interface MarkedPoint { @@ -28,6 +28,7 @@ interface MarkedPoint { lat: number; name: string; deviceId?: string; + radius?: number; } interface ReturnTaskForm { @@ -53,6 +54,7 @@ export default function MapEditorPage() { const [returnPoints, setReturnPoints] = useState([]); const [restAreas, setRestAreas] = useState([]); const [routePoints, setRoutePoints] = useState([]); + const [obstaclePoints, setObstaclePoints] = useState([]); const [selectedRobotId, setSelectedRobotId] = useState(undefined); // 已选机器人的实时经纬度(来自 WebSocket) const [robotRealtimePos, setRobotRealtimePos] = useState<{ lng?: number; lat?: number } | null>(null); @@ -74,7 +76,12 @@ export default function MapEditorPage() { // 地图上返航点/分区叠加层的刷新标识 const [overlayRefreshKey, setOverlayRefreshKey] = useState(0); // 点击已配置列表后的地图聚焦/高亮 - const [focusOverlay, setFocusOverlay] = useState(null); + const [focusOverlay, setFocusOverlay] = useState({ + type: 'returnPoint', + index: "", + id: "", + nonce: Date.now(), + }); const [messageApi, contextHolder] = message.useMessage(); const mapRef = useRef(null); const [points, setPoints] = useState<{ lng: number; lat: number }[]>([]); @@ -86,12 +93,16 @@ export default function MapEditorPage() { const [regionList, setRegionList] = useState([]); // 已配置的返航点(从 /system/siteMapInfo/selectBySiteId 拉取的 restPoints) const [returnPointConfigList, setReturnPointConfigList] = useState([]); + + const [obstaclePointConfigList, setObstaclePointConfigList] = useState([]); // 站点地图信息主键 id,编辑/保存时需要带上 const [siteMapInfoId, setSiteMapInfoId] = useState(null); // 预设路径(供分区的 bindRoutes / defaultRoute 选择) const [presetRoutes, setPresetRoutes] = useState([]); const [selectedRouteId, setSelectedRouteId] = useState(null); + const [selectedObstaclePointId, setSelectedObstaclePointId] = useState(null); + // 分区保存弹窗 const [regionModalOpen, setRegionModalOpen] = useState(false); const [editingRegion, setEditingRegion] = useState(null); @@ -104,12 +115,13 @@ export default function MapEditorPage() { if (activeType === 'returnPoint') return returnPoints; if (activeType === 'restArea') return restAreas; if (activeType === 'routeGen') return routePoints; + if (activeType === 'obstaclePoint') return obstaclePoints; return []; - }, [activeType, returnPoints, restAreas, routePoints]); + }, [activeType, returnPoints, restAreas, routePoints, obstaclePoints]); // 传给Cesium地图渲染的点位 const drawingPoints = useMemo(() => { - return currentList.map(p => ({ id: p.id, lon: p.lon, lat: p.lat })); + return currentList.map(p => ({ id: p.id, lon: p.lon, lat: p.lat, radius: p.radius })); }, [currentList]); // 切换到非路径生成类型时清除预设路径预览 @@ -132,6 +144,35 @@ export default function MapEditorPage() { }; loadDevices(); }, [stationId]); + const getSiteMapInfoFn = () => { + getSiteMapInfo({ siteId: stationId }).then((res: any) => { + if (res?.code === 200 && res.data) { + setSiteMapInfoId(res.data.id ?? null); + setReturnPointConfigList(res?.data?.restPoints || []); + // 同时加载已保存的障碍物点(tempObstaclePoints),方便编辑 + const savedObstacles = (res?.data?.tempObstaclePoints || []).map((op: any) => ({ + id: genId(), + lon: Number(op.position?.lng ?? op.position?.lon ?? 0), + lat: Number(op.position?.lat ?? 0), + name: op.alias || '', + radius: Number(op.radius) || 2.0, + })); + setObstaclePointConfigList(savedObstacles); + + } else { + setSiteMapInfoId(null); + setReturnPointConfigList([]); + setObstaclePointConfigList([]); + + } + }).catch(() => { + setSiteMapInfoId(null); + setReturnPointConfigList([]); + setObstaclePointConfigList([]); + + }); + } + // 加载已配置的区域列表(分区)和站点地图信息(返航点),以及预设路径 useEffect(() => { @@ -147,18 +188,7 @@ export default function MapEditorPage() { }).catch(() => setRegionList([])); // 拉站点地图信息(返航点),返回的是一个对象,restPoints 在 data.restPoints 里 - getSiteMapInfo({ siteId: stationId }).then((res: any) => { - if (res?.code === 200 && res.data) { - setSiteMapInfoId(res.data.id ?? null); - setReturnPointConfigList(res?.data?.restPoints || []); - } else { - setSiteMapInfoId(null); - setReturnPointConfigList([]); - } - }).catch(() => { - setSiteMapInfoId(null); - setReturnPointConfigList([]); - }); + getSiteMapInfoFn(); // 拉预设路径 getRobotRouteList({ siteId: stationId }).then((res: any) => { @@ -249,6 +279,16 @@ export default function MapEditorPage() { name: `路径点-${prev.length + 1}`, }, ]); + } else { + console.log("dadsds ") + setObstaclePoints(prev => [ + ...prev, + { + ...point, + name: `障碍物点-${prev.length + 1}`, + radius: "" + }, + ]); } }, [activeType, selectedRobotId] @@ -272,6 +312,7 @@ export default function MapEditorPage() { if (activeType === 'returnPoint') setReturnPoints(prev => prev.slice(0, -1)); else if (activeType === 'restArea') setRestAreas(prev => prev.slice(0, -1)); else if (activeType === 'routeGen') setRoutePoints(prev => prev.slice(0, -1)); + else setObstaclePoints(prev => prev.slice(0, -1)); }; // ========== 清空当前类型全部点位 ========== @@ -284,6 +325,8 @@ export default function MapEditorPage() { setRestAreas([]); } else if (activeType === 'routeGen') { setRoutePoints([]); + } else { + setObstaclePoints([]); } setPoints([]); setPreviewPolyPoints([]); @@ -294,6 +337,7 @@ export default function MapEditorPage() { if (activeType === 'returnPoint') setReturnPoints(prev => prev.filter(p => p.id !== id)); else if (activeType === 'restArea') setRestAreas(prev => prev.filter(p => p.id !== id)); else if (activeType === 'routeGen') setRoutePoints(prev => prev.filter(p => p.id !== id)); + else setObstaclePoints(prev => prev.filter(p => p.id !== id)); }; // ========== 修改点位名称 ========== @@ -301,6 +345,7 @@ export default function MapEditorPage() { if (activeType === 'returnPoint') setReturnPoints(prev => prev.map(p => p.id === id ? { ...p, name } : p)); else if (activeType === 'restArea') setRestAreas(prev => prev.map(p => p.id === id ? { ...p, name } : p)); else if (activeType === 'routeGen') setRoutePoints(prev => prev.map(p => p.id === id ? { ...p, name } : p)); + else setObstaclePoints(prev => prev.map(p => p.id === id ? { ...p, name } : p)); }; // ========== 绑定机器人 ========== @@ -352,13 +397,33 @@ export default function MapEditorPage() { utils.message.success(t('devices.mapEditor.saveSuccess')); setOverlayRefreshKey(k => k + 1); // 保存后刷新返航点列表 - getSiteMapInfo({ siteId: stationId }).then((r: any) => { - if (r?.code == 200 && r.data) { - setSiteMapInfoId(r.data.id ?? null); - setReturnPointConfigList(r.data.restPoints || []); - console.log(r.data.restPoints, "已配置返航点列表"); - } - }); + getSiteMapInfoFn(); + } else { + utils.message.error(res?.msg || t('common.saveFail')); + } + }); + } else if (activeType === 'obstaclePoint') { + // 障碍物点:走 saveSiteMapInfo,用 tempObstaclePoints 字段 + console.log('[MapEditor] 保存障碍物点 currentList:', currentList); + const tempObstaclePoints = currentList.map(p => ({ + position: { lat: p.lat, lng: p.lon }, + radius: p.radius ?? 2.0, + alias: p.name, + })); + const payload: any = { + restPoints: [], + tempObstaclePoints, + siteId: stationId, + orgId: currentStation?.orgId, + }; + if (siteMapInfoId != null) payload.id = siteMapInfoId; + console.log(payload, "保存障碍物点 payload"); + saveSiteMapInfo(payload).then((res: any) => { + if (res?.code == 200) { + utils.message.success(t('devices.mapEditor.saveSuccess')); + setOverlayRefreshKey(k => k + 1); + setObstaclePoints([]); + getSiteMapInfoFn(); } else { utils.message.error(res?.msg || t('common.saveFail')); } @@ -464,7 +529,159 @@ export default function MapEditorPage() { }, }); }; + // ========== 修改已配置返航点名称 ========== + const handleUpdateReturnPointAlias = async ( + index: number, + alias: string + ) => { + console.log('[MapEditor] 修改返航点名称:', index, alias); + const updated = returnPointConfigList.map((p: any, i: number) => + i === index ? { ...p, alias } : p + ); + // 先更新界面 + setReturnPointConfigList(updated); + + const payload: any = { + restPoints: updated.map((p: any) => ({ + alias: p.alias || '', + position: p.position, + bindDeviceId: p.bindDeviceId || null, + })), + siteId: stationId, + orgId: currentStation?.orgId, + }; + + if (siteMapInfoId != null) { + payload.id = siteMapInfoId; + } + + try { + const res: any = await saveSiteMapInfo(payload); + + if (res?.code === 200) { + messageApi.success('返航点名称修改成功'); + setOverlayRefreshKey(k => k + 1); + getSiteMapInfoFn(); + } else { + messageApi.error(res?.msg || '返航点名称修改失败'); + getSiteMapInfoFn(); + } + } catch (error) { + console.error('更新返航点名称失败:', error); + messageApi.error('返航点名称修改失败'); + getSiteMapInfoFn(); + } + }; + + + // ========== 修改已配置障碍物点名称 ========== + const handleUpdateObstacleAlias = async ( + item: any, + alias: string + ) => { + const updated = obstaclePointConfigList.map((point: any) => + String(point.id) === String(item.id) + ? { ...point, name: alias } + : point + ); + + setObstaclePointConfigList(updated); + + const payload: any = { + tempObstaclePoints: updated.map((point: any) => ({ + position: { + lat: Number(point.lat ?? point.position?.lat ?? 0), + lng: Number( + point.lon ?? + point.position?.lng ?? + point.position?.lon ?? + 0 + ), + }, + radius: Number(point.radius) || 2, + alias: point.name || '', + })), + siteId: stationId, + orgId: currentStation?.orgId, + }; + + if (siteMapInfoId != null) { + payload.id = siteMapInfoId; + } + + try { + const res: any = await saveSiteMapInfo(payload); + + if (res?.code === 200) { + messageApi.success('障碍物点名称修改成功'); + setOverlayRefreshKey(k => k + 1); + getSiteMapInfoFn(); + } else { + messageApi.error(res?.msg || '障碍物点名称修改失败'); + getSiteMapInfoFn(); + } + } catch (error) { + console.error('更新障碍物点名称失败:', error); + messageApi.error('障碍物点名称修改失败'); + getSiteMapInfoFn(); + } + }; + + + // ========== 修改已配置分区名称 ========== + const handleUpdateRegionName = async ( + item: any, + regionName: string + ) => { + // 更新列表显示 + setRegionList(prev => + prev.map((region: any) => + String(region.id) === String(item.id) + ? { ...region, regionName } + : region + ) + ); + + const payload: any = { + ...item, + id: item.id, + regionName, + siteId: item.siteId ?? stationId, + type: item.type || 'region', + scope: item.scope || [], + status: item.status ?? 1, + defaultRoute: item.defaultRoute ?? null, + bindRoutes: item.bindRoutes || [], + }; + + try { + const res: any = await saveRegion(payload); + + if (res?.code === 200) { + messageApi.success('分区名称修改成功'); + setOverlayRefreshKey(k => k + 1); + + const r: any = await getStationRegions({ siteId: stationId }); + if (r?.code === 200) { + const list = r.data || r.rows || []; + setRegionList(Array.isArray(list) ? list : []); + } + } else { + messageApi.error(res?.msg || '分区名称修改失败'); + + // 保存失败时恢复服务端数据 + const r: any = await getStationRegions({ siteId: stationId }); + if (r?.code === 200) { + const list = r.data || r.rows || []; + setRegionList(Array.isArray(list) ? list : []); + } + } + } catch (error) { + console.error('更新分区名称失败:', error); + messageApi.error('分区名称修改失败'); + } + }; // ========== 修改已配置返航点的绑定设备 ========== const handleUpdateReturnPointBind = (index: number, bindDeviceId: string | undefined) => { const updated = returnPointConfigList.map((p: any, i: number) => @@ -508,12 +725,7 @@ export default function MapEditorPage() { messageApi.success(t('devices.mapEditor.bindUpdateSuccess')); setOverlayRefreshKey(k => k + 1); // 刷新以获取最新 id - getSiteMapInfo({ siteId: stationId }).then((r: any) => { - if (r?.code === 200 && r.data) { - setSiteMapInfoId(r.data.id ?? null); - setReturnPointConfigList(r.data.restPoints || []); - } - }); + getSiteMapInfoFn(); } else { messageApi.error(res?.msg || t('common.saveFail')); } @@ -523,6 +735,55 @@ export default function MapEditorPage() { }); }; + const handleObstacleRadiusChange = async ( + index: number, + radius: number + ) => { + console.log("nextList") + + const roundedRadius = Number(radius.toFixed(2)); + + const nextList = obstaclePointConfigList.map( + (item, idx) => + idx === index + ? { ...item, radius: roundedRadius } + : item + ); + const payload = { + id: siteMapInfoId, + tempObstaclePoints: nextList?.map((item) => ({ + radius: item.radius, + position: { + lat: item.lat, + lng: item.lon, + }, + + alias: item.name, + })), + siteId: stationId, + orgId: currentStation?.orgId, + } + const res: any = await saveSiteMapInfo(payload); + + if (res?.code === 200) { + messageApi.success('障碍物点半径修改成功'); + + getSiteMapInfoFn(); + setOverlayRefreshKey(k => k + 1); + + } else { + messageApi.error( + res?.msg || '障碍物点半径修改失败' + ); + } + + + console.log(nextList, "nextList") + + //setObstaclePointConfigList(nextList); + + // 使用 nextList 调用你现有的保存接口 + }; // ========== 点击预设路径在地图上预览(覆盖=框,单点=线) ========== const handlePreviewRoute = async (route: any) => { setSelectedRouteId(route.id); @@ -544,6 +805,66 @@ export default function MapEditorPage() { console.error('[MapEditor] preview route failed:', e); } }; + // 修改已配置障碍物点的半径 + const handleUpdateObstacleRadius = async ( + item: any, + radius: number + ) => { + try { + // 保留其他已配置障碍物点的数据,只修改当前项半径 + const tempObstaclePoints = obstaclePointConfigList.map( + (point: any) => ({ + position: { + lat: Number( + point.position?.lat ?? point.lat ?? 0 + ), + lng: Number( + point.position?.lng ?? + point.position?.lon ?? + point.lon ?? + 0 + ), + }, + radius: + String(point.id) === String(item.id) + ? radius + : Number(point.radius), + alias: point.alias ?? point.name ?? '', + }) + ); + + const payload: any = { + tempObstaclePoints, + siteId: stationId, + orgId: currentStation?.orgId, + }; + + // 更新站点地图信息时传入接口返回的主键 ID + if (siteMapInfoId != null) { + payload.id = siteMapInfoId; + } + + const res: any = await saveSiteMapInfo(payload); + + if (res?.code === 200) { + messageApi.success('障碍物点半径修改成功'); + + getSiteMapInfoFn(); + setOverlayRefreshKey(k => k + 1); + + } else { + messageApi.error( + res?.msg || '障碍物点半径修改失败' + ); + } + } catch (error) { + console.error( + '[MapEditor] update obstacle radius failed:', + error + ); + messageApi.error('障碍物点半径修改失败'); + } + }; // ========== 删除预设路径 ========== const handleDeletePresetRoute = (route: any) => { @@ -698,6 +1019,14 @@ export default function MapEditorPage() { > 分区 +