From 4d1b423ab7d7aec295b883db06027b4d15eeca88 Mon Sep 17 00:00:00 2001
From: xudan <staysky25@outlook.com>
Date: Tue, 2 Dec 2025 11:10:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor(robot):=20=E5=B0=86=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=BA=BA=E8=BD=BD=E8=B4=A7=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BB=8EisCarrying=E7=BB=9F=E4=B8=80=E4=B8=BAisLoading?=
 =?UTF-8?q?=E4=BB=A5=E4=BF=9D=E6=8C=81=E6=95=B0=E6=8D=AE=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/robot/type.ts                      | 5 ++---
 src/components/context-menu/robot-menu.vue  | 2 +-
 src/hooks/useRobotRenderer.ts               | 6 +++---
 src/services/editor/editor-robot.service.ts | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

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') }}
           </div>
           <div class="robot-extra-statuses">
-            <span v-if="robotInfo.isCarrying" class="extra-status-tag">载货中</span>
+            <span v-if="robotInfo.isLoading" class="extra-status-tag">载货中</span>
             <span v-if="!robotInfo.canOrder" class="extra-status-tag">不接单</span>
             <span v-if="robotInfo.isCharging" class="extra-status-tag">充电中</span>
           </div>
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<EditorService | undef
         isWaring,
         isFault,
         isCharging = 0,
-        isCarrying = 0,
+        isLoading = 0,
         canOrder,
         ...rest
       } = data;
@@ -41,7 +41,7 @@ export function useRobotRenderer(editorService: ShallowRef<EditorService | undef
       editor.updateRobot(id, {
         ...rest,
         isCharging: isCharging as any,
-        isCarrying: isCarrying as any,
+        isLoading: isLoading as any,
         canOrder: canOrder as any,
       });
 
@@ -61,7 +61,7 @@ export function useRobotRenderer(editorService: ShallowRef<EditorService | undef
       if (isWaring !== undefined) robotState.isWaring = isWaring;
       if (isFault !== undefined) robotState.isFault = isFault;
       if (isCharging !== undefined) robotState.isCharging = isCharging;
-      if (isCarrying !== undefined) robotState.isCarrying = isCarrying;
+      if (isLoading !== undefined) robotState.isLoading = isLoading;
       if (canOrder !== undefined) robotState.canOrder = canOrder;
 
       if (Object.keys(robotState).length > 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;