优化 map中实时车悬浮的提醒框子,优化已完成任务提醒哪个设备 优化页面 设备类型显示 和 在线状态显示 预设路线分组显示 优化路径规划中的问题
This commit is contained in:
@@ -17,7 +17,7 @@ import * as Cesium from 'cesium';
|
||||
import 'cesium/Build/Cesium/Widgets/widgets.css';
|
||||
|
||||
|
||||
const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine, finishPoint, drawRealTime, realtimePosition, realtimeType, pathPoints = [], devices = [], onCameraClick, focusLocation, points = [], markedPoints = [], onPathChange, from, onClearDraw, onMarkPoint, routeMode = '', polyPoints, mapLayer, activeType, overlayRefreshKey = 0, focusOverlay = null, onObstacleRadiusChange, obstacleShapes = [], onObstacleRectResize, siteMapInfoId, detectReportInfo }, ref) => {
|
||||
const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine, finishPoint, drawRealTime, realtimePosition, realtimeType, realtimeDevice, pathPoints = [], devices = [], onCameraClick, focusLocation, points = [], markedPoints = [], onPathChange, from, onClearDraw, onMarkPoint, routeMode = '', polyPoints, mapLayer, activeType, overlayRefreshKey = 0, focusOverlay = null, onObstacleRadiusChange, obstacleShapes = [], onObstacleRectResize, siteMapInfoId, detectReportInfo }, ref) => {
|
||||
const containerRef = useRef(null);
|
||||
const viewerRef = useRef(null);
|
||||
const tooltipRef = useRef(null);
|
||||
@@ -37,8 +37,13 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
|
||||
const onMarkPointRef = useRef(onMarkPoint); // 总是指向最新的 onMarkPoint,避免闭包滞后
|
||||
const onCameraClickRef = useRef(onCameraClick); // 同样处理,避免闭包滞后
|
||||
const lastHoverPositionRef = useRef(null);
|
||||
// 实时车辆图标(realtimeCarEntity)对应的设备信息,用于悬浮提示
|
||||
const realtimeDeviceRef = useRef(null);
|
||||
const { t } = useTranslation();
|
||||
|
||||
// 实时模式下车图标为独立实体,没有 properties.robot,这里记录其设备信息
|
||||
realtimeDeviceRef.current = realtimeDevice || (devices && devices[0]) || null;
|
||||
|
||||
// 场站已配置的返航点 / 分区叠加显示
|
||||
const stationId = useSelector((state) => state?.station?.stationId || state?.station?.currentStation?.id);
|
||||
const [stationOverlay, setStationOverlay] = useState({ returnPoints: [], regions: [], tempObstaclePoints: [] });
|
||||
@@ -1112,7 +1117,13 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
|
||||
function resolveDeviceStatus(device) {
|
||||
const fsRaw = device?.feStatus;
|
||||
const stRaw = device?.status;
|
||||
if (device?.onlineStatus == 0) return 'offline';
|
||||
//if (device?.onlineStatus == 0) return 'offline';
|
||||
if (stRaw !== undefined && stRaw !== null && stRaw !== '') {
|
||||
const st = Number(stRaw);
|
||||
if (st === 1) return 'working';
|
||||
if (st === 2) return 'idle';
|
||||
if (st === 3) return 'offline';
|
||||
}
|
||||
|
||||
// feStatus:0=离线,1=工作中,2=空闲
|
||||
if (fsRaw !== undefined && fsRaw !== null && fsRaw !== '') {
|
||||
@@ -1196,7 +1207,7 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
|
||||
<div>${t('systemSetting.status')}:
|
||||
<span style="display:inline-block;width:8px;height:8px;border-radius:50%;background:${status.color};margin-right:4px;"></span>
|
||||
<span style="color:${status.color};font-weight:bold">${status.text}</span>
|
||||
</div> `;
|
||||
</div>`;
|
||||
} else {
|
||||
tooltip.innerHTML = `
|
||||
<div style = "font-weight:600;margin-bottom:4px;" >📍 ${t('systemSetting.longitude')}:${lonStr}</div >
|
||||
@@ -1204,6 +1215,15 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
|
||||
`;
|
||||
}
|
||||
}
|
||||
// 判断拾取到的实体是否为实时车图标或其光圈(光圈实体没有 properties.robot,需单独识别)
|
||||
const isRealtimeCarPick = (picked) => {
|
||||
if (!Cesium.defined(picked) || !picked.id) return false;
|
||||
const target = picked.id;
|
||||
if (realtimeCarEntityRef.current && target === realtimeCarEntityRef.current) return true;
|
||||
const entityId = typeof target.id === 'string' ? target.id : '';
|
||||
return entityId.startsWith('realtime_car_halo');
|
||||
};
|
||||
|
||||
const handleFlyToDevice = () => {
|
||||
let validPositions = [];
|
||||
const viewer = viewerRef.current;
|
||||
@@ -2787,7 +2807,7 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
|
||||
device?.type === "plane" ? planeImg : // 飞机
|
||||
device?.type === "drone" ? planeImg : // 无人机
|
||||
device?.type === "mower" ? carImg : // 割草
|
||||
device?.type === "robot" ? droneInspectImg : // 巡检
|
||||
device?.type === "robot" ? carImg : // 巡检
|
||||
carImg; // 默认车
|
||||
|
||||
width =
|
||||
@@ -2954,11 +2974,14 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
|
||||
const pickedNow = viewer.scene.pick(hoverPos);
|
||||
const pickedReturnPointNow = (Cesium.defined(pickedNow) && pickedNow.id?.returnPointData) ? pickedNow.id.returnPointData : null;
|
||||
const pickedRobotNow = (Cesium.defined(pickedNow) && pickedNow.id?.properties?.robot) ? pickedNow.id.properties.robot.getValue() : null;
|
||||
// 实时车图标及其光圈(无 properties.robot)悬浮时,用当前实时设备信息补全
|
||||
const pickedIsRealtimeCarNow = isRealtimeCarPick(pickedNow);
|
||||
const robotNow = pickedRobotNow || (pickedIsRealtimeCarNow ? realtimeDeviceRef.current : null);
|
||||
if (pickedReturnPointNow) {
|
||||
showReturnPointTooltip(tooltipRef.current, hoverPos, pickedReturnPointNow);
|
||||
} else if (pickedRobotNow) {
|
||||
} else if (robotNow) {
|
||||
const hoverLngLat = getCursorLngLat(viewer, hoverPos);
|
||||
showCoordinateTooltip(tooltipRef.current, hoverPos, t, hoverLngLat.lon, hoverLngLat.lat, pickedRobotNow);
|
||||
showCoordinateTooltip(tooltipRef.current, hoverPos, t, hoverLngLat.lon, hoverLngLat.lat, robotNow);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3122,13 +3145,18 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
|
||||
const picked = viewer.scene.pick(movement.endPosition);
|
||||
const pickedReturnPoint = (Cesium.defined(picked) && picked.id?.returnPointData) ? picked.id.returnPointData : null;
|
||||
const pickedRobot = (Cesium.defined(picked) && picked.id?.properties?.robot) ? picked.id.properties.robot.getValue() : null;
|
||||
// 实时模式下的车图标及光圈是独立实体(无 properties.robot),用当前实时设备信息补全悬浮提示
|
||||
const pickedIsRealtimeCar = isRealtimeCarPick(picked);
|
||||
|
||||
// 返航点优先显示「别名 + 绑定机器」,设备显示设备信息,空白区域隐藏
|
||||
if (pickedReturnPoint) {
|
||||
lastHoverPositionRef.current = movement.endPosition;
|
||||
showReturnPointTooltip(tooltipRef.current, movement.endPosition, pickedReturnPoint);
|
||||
} else if (pickedRobot) {
|
||||
} else if (pickedRobot || (pickedIsRealtimeCar && realtimeDeviceRef.current)) {
|
||||
lastHoverPositionRef.current = movement.endPosition;
|
||||
const robot = pickedRobot || realtimeDeviceRef.current;
|
||||
const { lon, lat } = getCursorLngLat(viewer, movement.endPosition);
|
||||
showCoordinateTooltip(tooltipRef.current, movement.endPosition, t, lon, lat, pickedRobot);
|
||||
showCoordinateTooltip(tooltipRef.current, movement.endPosition, t, lon, lat, robot);
|
||||
} else {
|
||||
lastHoverPositionRef.current = null;
|
||||
tooltipRef.current.style.display = "none";
|
||||
|
||||
Reference in New Issue
Block a user