From 3065abf7ddcba60dc4841ab239833714182d067a Mon Sep 17 00:00:00 2001
From: xudan <staysky25@outlook.com>
Date: Mon, 29 Sep 2025 11:09:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=BA=BA=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E6=8E=A5=E5=8D=95=E5=B1=9E=E6=80=A7=E5=B9=B6?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BA=E5=8F=AF=E6=8E=A5=E5=8D=95=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=EF=BC=8C=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/robot/type.ts                     | 3 ---
 src/components/context-menu/robot-menu.vue | 2 +-
 src/pages/movement-supervision.vue         | 6 +++---
 src/services/editor.service.ts             | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

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 @@
           </div>
           <div class="robot-extra-statuses">
             <span v-if="robotInfo.isCarrying" class="extra-status-tag">载货中</span>
-            <span v-if="robotInfo.isNotAcceptingOrders" 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>
         </div>
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;
   }