diff --git a/src/apis/robot/type.ts b/src/apis/robot/type.ts
index c559172..e503a28 100644
--- a/src/apis/robot/type.ts
+++ b/src/apis/robot/type.ts
@@ -25,7 +25,6 @@ export type RobotPen = Pen & {
isFault?: boolean;
isCharging?: boolean; // 是否充电中
isCarrying?: boolean; // 是否载货
- isNotAcceptingOrders?: boolean; // 是否不接单
path?: { x: number; y: number }[];
angle?: number;
};
@@ -48,7 +47,6 @@ export interface RobotInfo {
isLoading?: 0 | 1; // 载货状态:1载货,0空载(实时数据透传)
isCharging?: boolean; // 是否充电中
isCarrying?: boolean; // 是否载货
- isNotAcceptingOrders?: boolean; // 是否不接单
}
export interface RobotDetail extends RobotInfo {
@@ -72,7 +70,6 @@ export interface RobotRealtimeInfo extends RobotInfo {
isFault?: boolean; // 是否故障
isCharging?: boolean; // 是否充电中
isCarrying?: boolean; // 是否载货
- isNotAcceptingOrders?: boolean; // 是否不接单
}
// AMR Redis状态接口 - 更新为实际返回的数据结构
diff --git a/src/components/context-menu/robot-menu.vue b/src/components/context-menu/robot-menu.vue
index e84be59..441cd01 100644
--- a/src/components/context-menu/robot-menu.vue
+++ b/src/components/context-menu/robot-menu.vue
@@ -18,7 +18,7 @@
diff --git a/src/pages/movement-supervision.vue b/src/pages/movement-supervision.vue
index 74a48c5..d2ab786 100644
--- a/src/pages/movement-supervision.vue
+++ b/src/pages/movement-supervision.vue
@@ -153,7 +153,7 @@ const monitorScene = async () => {
isFault,
isCharging = 0,
isCarrying = 0,
- isNotAcceptingOrders = 1,
+ canOrder,
...rest
} = data;
@@ -162,7 +162,7 @@ const monitorScene = async () => {
...rest,
isCharging: isCharging as any,
isCarrying: isCarrying as any,
- isNotAcceptingOrders: isNotAcceptingOrders as any,
+ canOrder: canOrder as any,
});
// 2. 准备图元(pen)的更新负载对象,将多个更新合并
@@ -184,7 +184,7 @@ const monitorScene = async () => {
if (isFault !== undefined) robotState.isFault = isFault;
if (isCharging !== undefined) robotState.isCharging = isCharging;
if (isCarrying !== undefined) robotState.isCarrying = isCarrying;
- if (isNotAcceptingOrders !== undefined) robotState.isNotAcceptingOrders = isNotAcceptingOrders;
+ if (canOrder !== undefined) robotState.canOrder = canOrder;
// 将合并后的状态赋给 payload
if (Object.keys(robotState).length > 0) {
diff --git a/src/services/editor.service.ts b/src/services/editor.service.ts
index d05153b..421c080 100644
--- a/src/services/editor.service.ts
+++ b/src/services/editor.service.ts
@@ -1337,11 +1337,11 @@ export class EditorService extends Meta2d {
const r2 = this.getRobotById(pen.id || '');
const toBool = (v: any) => v === true || v === 1 || v === '1';
const isCarrying = toBool(r1?.isCarrying ?? r2?.isCarrying);
- const isNotAcceptingOrders = toBool(r1?.isNotAcceptingOrders ?? r2?.isNotAcceptingOrders);
+ const canOrder = toBool(r1?.canOrder ?? r2?.canOrder);
const isCharging = toBool(r1?.isCharging ?? r2?.isCharging);
if (isCarrying) return cargoIcon;
- if (isNotAcceptingOrders) return notAcceptingOrdersIcon;
+ if (!canOrder) return notAcceptingOrdersIcon;
if (isCharging) return chargingIcon;
return null;
}