设备状态界面机器人实时轨迹

This commit is contained in:
mmc
2026-06-15 13:57:41 +08:00
parent 3fd82e2fd9
commit 1b0890eaab
6 changed files with 22 additions and 10 deletions

View File

@@ -29,7 +29,7 @@ const DraggableBox: React.FC<Props> = ({
ref={nodeRef}
className={clsx(
'fixed select-none z-[9999] bg-white shadow-xl rounded-lg overflow-hidden',
'border-[8px] border-slate-200 top-[8px] left-[8px] w-[600px] h-[300px]' // 整体8px外边框
'border-[8px] border-slate-200 top-[8px] left-[8px] w-[700px] h-[580px] ' // 整体8px外边框
)}
>
{/* 拖拽标题栏 + 关闭按钮 */}

View File

@@ -829,7 +829,7 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
const yellowCircleImg = useMemo(() => createYellowCircleDataUrl(30), []);
// 监听 drawRealTime 变化,每次开始执行任务时重置为定位模式
useEffect(() =>{
useEffect(() => {
if (drawRealTime) {
// 开始执行任务时:重置为定位模式,清空之前的轨迹数据
tracePointRef.current.setMode(TPMode.LOCATION);
@@ -857,7 +857,7 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
if (!finishPoint || !finishPoint.lng || !finishPoint.lat || !drawRealTime) {
// 没有 finishPoint 时,移除跟随小车
const viewer = viewerRef.current;
if (viewer &&followCarEntityRef.current) {
if (viewer && followCarEntityRef.current) {
viewer.entities.remove(followCarEntityRef.current);
followCarEntityRef.current = null;
}
@@ -1009,7 +1009,7 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
};
// 清空规划航线(使用上一次的 ifClearPlanLine 作为比较,避免重复触发)
const prevIfClearPlanLine = useRef(0);
useEffect(() =>{
useEffect(() => {
if (ifClearPlanLine !== prevIfClearPlanLine.current && ifClearPlanLine) {
const viewer = viewerRef.current;
if (viewer) {
@@ -1026,7 +1026,7 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
// 清空实时轨迹
const prevIfClearNavLine = useRef(0);
useEffect(() => {
if (ifClearNavLine !== prevIfClearNavLine.current &&ifClearNavLine) {
if (ifClearNavLine !== prevIfClearNavLine.current && ifClearNavLine) {
updateTraceLine(true);
prevIfClearNavLine.current = ifClearNavLine;
}
@@ -1482,7 +1482,7 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
// ====================================
// 无人机模式:保持原来的逻辑
// ====================================
if (isDroneMode) {
if (isDroneMode || from == "deviceStatus") {
// 轨迹点去抖动(防止重复点)
const last = realtimeLastPointRef.current;
let shouldAdd = true;
@@ -1521,7 +1521,7 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
}
// 无人机图标
const img = planeImg;
const img = realtimeType === 'plane' || realtimeType === 'drone' ? planeImg : carImg;
const imgWidth = 70;
const imgHeight = 70;
@@ -1532,6 +1532,9 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
rotation = Cesium.Math.toRadians(headingDeg);
}
//rotation = Cesium.Math.toRadians(-3.17);
if (!realtimeCarEntityRef.current) {
realtimeCarEntityRef.current = viewer.entities.add({
position: position,

View File

@@ -21,7 +21,7 @@ import DroneLivePlayer from '../VolcRtcPlayer.jsx';
import DroneVideoPlayer from './DroneVideoPlayer';
import AgoraTextTest from '../AgoraRtc.tsx';
import { useWebRTCPlayer } from '../useWebRTCStream.tsx';
import VideoPlayer from '../VideoPlayer.tsx.tsx';
import VideoPlayer from '../VideoPlayer.tsx';
import CesiumMap from '../Map.jsx';
import { getUAVState, getSiteDevice, getSiteUAVList, getsinglePlan, getRobotTaskList, getDeviceTotalData, updateDeviceAliasApi } from '@/api/device.ts';
import dayjs from 'dayjs';

View File

@@ -159,6 +159,7 @@ export default function DeviceStatusPage({
setPersistentDroneData(prevData => {
const newData = { ...prevData };
// 无人机特有字段
if (host.battery?.capacity_percent !== undefined) {
newData.capacity_percent = host.battery.capacity_percent;
@@ -359,7 +360,7 @@ export default function DeviceStatusPage({
return {
lon: robotLon,
lat: robotLat,
//heading: runningStatus.yaw || wsDeviceInfo.yaw || 0,
heading: runningStatus.pitch || wsDeviceInfo.pitch || 0,
};
}
@@ -746,6 +747,7 @@ export default function DeviceStatusPage({
finishPoint={arrivedPoint}
ifClearNavLine={clearNavLine}
ifClearPlanLine={clearPlanLine}
from="deviceStatus"
/>
</Card>
</Col>

View File

@@ -22,6 +22,7 @@ export function MowerAllView({ serialNumber, robotVideo, error, ready }) {
border: '1px solid #eae4e4',
flexShrink: 0,// 禁止压缩
borderRadius: 8,
overflow: "hidden"
}}>
<VideoPlayer
deviceId={serialNumber}
@@ -41,6 +42,8 @@ export function MowerAllView({ serialNumber, robotVideo, error, ready }) {
border: '1px solid #eae4e4',
flexShrink: 0,// 禁止压缩
borderRadius: 8,
overflow: "hidden"
}}>
<VideoPlayer
deviceId={serialNumber}
@@ -57,11 +60,13 @@ export function MowerAllView({ serialNumber, robotVideo, error, ready }) {
<div style={{
flex: 1,
//width: 360,
//height: 240,
height: 240,
position: 'relative',
border: '1px solid #eae4e4',
//flexShrink: 0,// 禁止压缩
borderRadius: 8,
overflow: "hidden"
}}>
<VideoPlayer
deviceId={serialNumber}
@@ -84,6 +89,8 @@ export function MowerAllView({ serialNumber, robotVideo, error, ready }) {
border: '1px solid #eae4e4',
flexShrink: 0,// 禁止压缩
borderRadius: 8,
overflow: "hidden"
}}>
<VideoPlayer
deviceId={serialNumber}