diff --git a/src/apis/robot/type.ts b/src/apis/robot/type.ts index e503a28..e61567c 100644 --- a/src/apis/robot/type.ts +++ b/src/apis/robot/type.ts @@ -24,7 +24,7 @@ export type RobotPen = Pen & { isWaring?: boolean; isFault?: boolean; isCharging?: boolean; // 是否充电中 - isCarrying?: boolean; // 是否载货 + isLoading?: 0 | 1; // 是否载货 path?: { x: number; y: number }[]; angle?: number; }; @@ -46,7 +46,6 @@ export interface RobotInfo { targetPoint?: string; // 目标点位(名称) isLoading?: 0 | 1; // 载货状态:1载货,0空载(实时数据透传) isCharging?: boolean; // 是否充电中 - isCarrying?: boolean; // 是否载货 } export interface RobotDetail extends RobotInfo { @@ -69,7 +68,7 @@ export interface RobotRealtimeInfo extends RobotInfo { isWaring?: boolean; // 是否告警 isFault?: boolean; // 是否故障 isCharging?: boolean; // 是否充电中 - isCarrying?: boolean; // 是否载货 + isLoading?: 0 | 1; // 是否载货 } // AMR Redis状态接口 - 更新为实际返回的数据结构 diff --git a/src/components/context-menu/robot-menu.vue b/src/components/context-menu/robot-menu.vue index 441cd01..5812dcc 100644 --- a/src/components/context-menu/robot-menu.vue +++ b/src/components/context-menu/robot-menu.vue @@ -17,7 +17,7 @@ {{ getRobotStatusText((robotInfo.state as any) || 'offline') }}
- 载货中 + 载货中 不接单 充电中
diff --git a/src/hooks/useRobotRenderer.ts b/src/hooks/useRobotRenderer.ts index cd5625e..fe878c6 100644 --- a/src/hooks/useRobotRenderer.ts +++ b/src/hooks/useRobotRenderer.ts @@ -32,7 +32,7 @@ export function useRobotRenderer(editorService: ShallowRef 0) { diff --git a/src/services/editor/editor-robot.service.ts b/src/services/editor/editor-robot.service.ts index 92dffb0..0140ba4 100644 --- a/src/services/editor/editor-robot.service.ts +++ b/src/services/editor/editor-robot.service.ts @@ -442,11 +442,11 @@ export class EditorRobotService { const r1: any = pen.robot ?? {}; const r2 = this.getRobotById(pen.id || ''); const toBool = (v: any) => v === true || v === 1 || v === '1'; - const isCarrying = toBool(r1?.isCarrying ?? r2?.isCarrying); + const isLoading = toBool(r1?.isLoading ?? r2?.isLoading); const canOrder = toBool(r1?.canOrder ?? r2?.canOrder); const isCharging = toBool(r1?.isCharging ?? r2?.isCharging); - if (isCarrying) return cargoIcon; + if (isLoading) return cargoIcon; if (!canOrder) return notAcceptingOrdersIcon; if (isCharging) return chargingIcon; return null;