diff --git a/src/components/Map.jsx b/src/components/Map.jsx
index 33e1232..984df0b 100644
--- a/src/components/Map.jsx
+++ b/src/components/Map.jsx
@@ -828,20 +828,42 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
}
const yellowCircleImg = useMemo(() => createYellowCircleDataUrl(30), []);
+ // 监听 drawRealTime 变化,每次开始执行任务时重置为定位模式
+ useEffect(() =>{
+ if (drawRealTime) {
+ // 开始执行任务时:重置为定位模式,清空之前的轨迹数据
+ tracePointRef.current.setMode(TPMode.LOCATION);
+ isNavigationModeRef.current = false;
+ lastFinishPointRef.current = null;
+
+ // 清空导航相关的实体
+ const viewer = viewerRef.current;
+ if (viewer) {
+ if (navLineRef.current) {
+ viewer.entities.remove(navLineRef.current);
+ navLineRef.current = null;
+ }
+ if (followCarEntityRef.current) {
+ viewer.entities.remove(followCarEntityRef.current);
+ followCarEntityRef.current = null;
+ }
+ viewer.scene.requestRender();
+ }
+ }
+ }, [drawRealTime]);
+
// 处理完成点
useEffect(() => {
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;
}
return;
}
-
-
const point = { lng: finishPoint.lng, lat: finishPoint.lat };
// 如果是定位模式且还没有导航模式,则切换到导航模式
@@ -850,7 +872,6 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
isNavigationModeRef.current = true;
}
-
tracePointRef.current.upsert(point, TPAction.ADD);
lastFinishPointRef.current = finishPoint;
@@ -858,7 +879,6 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
updateTraceLine();
// 更新或添加跟随小车
-
}, [finishPoint, drawRealTime]);
// 更新跟随小车
@@ -987,9 +1007,10 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
viewer.scene.requestRender();
};
- // 清空规划航线
- useEffect(() => {
- if (ifClearPlanLine) {
+ // 清空规划航线(使用上一次的 ifClearPlanLine 作为比较,避免重复触发)
+ const prevIfClearPlanLine = useRef(0);
+ useEffect(() =>{
+ if (ifClearPlanLine !== prevIfClearPlanLine.current && ifClearPlanLine) {
const viewer = viewerRef.current;
if (viewer) {
if (planLineRef.current) {
@@ -998,13 +1019,16 @@ export default function CesiumMap({ ifClear, ifClearPlanLine, ifClearNavLine, fi
}
viewer.scene.requestRender();
}
+ prevIfClearPlanLine.current = ifClearPlanLine;
}
}, [ifClearPlanLine]);
// 清空实时轨迹
+ const prevIfClearNavLine = useRef(0);
useEffect(() => {
- if (ifClearNavLine) {
+ if (ifClearNavLine !== prevIfClearNavLine.current &&ifClearNavLine) {
updateTraceLine(true);
+ prevIfClearNavLine.current = ifClearNavLine;
}
}, [ifClearNavLine]);
diff --git a/src/components/devices/DeviceStatusPage.tsx b/src/components/devices/DeviceStatusPage.tsx
index 0788878..2f0158e 100644
--- a/src/components/devices/DeviceStatusPage.tsx
+++ b/src/components/devices/DeviceStatusPage.tsx
@@ -877,8 +877,8 @@ export default function DeviceStatusPage({
{fix2(runningStatus?.leftCurrent)} A
{fix2(runningStatus?.rightCurrent)} A
- {fix2(runningStatus?.leftMeasureSpeed)} m/s
- {fix2(runningStatus?.rightMeasureSpeed)} m/s
+ {fix2(runningStatus?.leftMeasureSpeed)} rpm
+ {fix2(runningStatus?.rightMeasureSpeed)} rpm
{fix2(runningStatus?.leftMotorTemp)} ℃
{fix2(runningStatus?.rightMotorTemp)} ℃
{fix2(runningStatus?.chipTemp)} ℃
diff --git a/src/components/devices/RobotTaskPage.tsx b/src/components/devices/RobotTaskPage.tsx
index 7822cda..f46437c 100644
--- a/src/components/devices/RobotTaskPage.tsx
+++ b/src/components/devices/RobotTaskPage.tsx
@@ -53,7 +53,6 @@ export default function RobotTaskPage() {
const [taskList, setTaskList] = useState([]);
const [arrivedPoint, setArrivedPoint] = useState(null);//完成点
-
// 设备数据
const [devices, setDevices] = useState([]);
@@ -80,7 +79,7 @@ export default function RobotTaskPage() {
const [taskHistoryList, setTaskHistoryList] = useState([]);
// 当前激活的Tab
- const [activeTab, setActiveTab] = useState('task'); // 'task' for 任务列表, 'pool' for 任务池, 'history' for 历史任务
+ const [activeTab, setActiveTab] = useState('pool'); // 'task' for 任务列表, 'pool' for 任务池, 'history' for 历史任务
// 任务池和历史任务筛选表单
const [poolFilterForm, setPoolFilterForm] = useState({
@@ -997,14 +996,15 @@ export default function RobotTaskPage() {
size="small"
style={{ padding: '0 12px' }}
items={[
- {
- key: 'task',
- label: '任务列表',
- },
{
key: 'pool',
label: '任务池',
},
+ {
+ key: 'task',
+ label: '任务执行计划',
+ },
+
{
key: 'history',
label: '历史任务',
@@ -1315,7 +1315,12 @@ export default function RobotTaskPage() {
}}
onClick={(e) => {
e.stopPropagation();
- setSelectedPathWork(route); // 点击后保存选中项
+ // 先清空再设置,确保每次点击都能触发 useEffect 的重绘
+ setSelectedPathWork(null);
+ // 在下一个 tick 中设置,确保 state 重置生效
+ setTimeout(() => {
+ setSelectedPathWork(route);
+ }, 0);
}}
onMouseEnter={e => {
// 只有未选中的项,悬浮才变色
@@ -1497,7 +1502,7 @@ export default function RobotTaskPage() {
-
+
);
}
diff --git a/src/lib/TracePoint/tracePoint.js b/src/lib/TracePoint/tracePoint.js
index 0b9873d..d704886 100644
--- a/src/lib/TracePoint/tracePoint.js
+++ b/src/lib/TracePoint/tracePoint.js
@@ -104,6 +104,7 @@ class TracePoint {
this.#queue.clear(); /* 清空队列 */
this.#tracePoint = []; /* 清空轨迹点数组 */
this.#completePointIndex = 0; /* 重置完成点索引 */
+ this.#mode = TPMode.LOCATION; /* 重置为定位模式 */
this.#lock.release(); /* 释放锁 */
}