From 4dfb38be60861c2b8a4a41d8fe349af89a236d17 Mon Sep 17 00:00:00 2001
From: xudan <staysky25@outlook.com>
Date: Thu, 4 Sep 2025 16:50:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=EF=BC=8C=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BA=93=E4=BD=8D=E7=9B=B8=E5=85=B3=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E5=92=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/context-menu.vue      |  55 ++++++-------
 src/services/context-menu.service.ts | 112 ++++++---------------------
 2 files changed, 54 insertions(+), 113 deletions(-)

diff --git a/src/components/context-menu.vue b/src/components/context-menu.vue
index 755dd8e..e679ee6 100644
--- a/src/components/context-menu.vue
+++ b/src/components/context-menu.vue
@@ -17,8 +17,14 @@
         <div class="storage-info">
           <div class="storage-name">{{ location.name }}</div>
           <div class="storage-status">
-            <span class="status-indicator" :class="location.status"></span>
-            <span class="status-text">{{ getStatusText(location) }}</span>
+            <div class="status-row">
+              <span class="status-indicator occupied" :class="{ active: location.isOccupied }"></span>
+              <span class="status-text">{{ location.isOccupied ? '已占用' : '未占用' }}</span>
+            </div>
+            <div class="status-row">
+              <span class="status-indicator locked" :class="{ active: location.isLocked }"></span>
+              <span class="status-text">{{ location.isLocked ? '已锁定' : '未锁定' }}</span>
+            </div>
           </div>
         </div>
       </div>
@@ -108,23 +114,11 @@ const getStorageItemClass = (location: StorageLocationInfo) => {
 
 // 获取库位提示信息
 const getStorageTooltip = (location: StorageLocationInfo) => {
-  const status = getStatusText(location);
-  return `${location.name} - ${status}`;
+  const occupiedText = location.isOccupied ? '已占用' : '未占用';
+  const lockedText = location.isLocked ? '已锁定' : '未锁定';
+  return `${location.name} - 占用: ${occupiedText}, 锁定: ${lockedText}`;
 };
 
-// 获取状态文本
-const getStatusText = (location: StorageLocationInfo) => {
-  switch (location.status) {
-    case 'occupied':
-      return '已占用';
-    case 'locked':
-      return '已锁定';
-    case 'available':
-      return '可用';
-    default:
-      return '未知';
-  }
-};
 </script>
 
 <style scoped>
@@ -212,10 +206,16 @@ const getStatusText = (location: StorageLocationInfo) => {
 }
 
 .storage-status {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  font-size: 12px;
+}
+
+.status-row {
   display: flex;
   align-items: center;
   gap: 6px;
-  font-size: 12px;
 }
 
 .status-indicator {
@@ -223,26 +223,29 @@ const getStatusText = (location: StorageLocationInfo) => {
   height: 8px;
   border-radius: 50%;
   display: inline-block;
-}
-
-.status-indicator.available {
-  background-color: #52c41a;
+  background-color: #d9d9d9; /* 默认灰色 */
+  transition: background-color 0.2s;
 }
 
 .status-indicator.occupied {
-  background-color: #ff4d4f;
+  background-color: #d9d9d9; /* 默认灰色 */
+}
+
+.status-indicator.occupied.active {
+  background-color: #ff4d4f; /* 占用时红色 */
 }
 
 .status-indicator.locked {
-  background-color: #faad14;
+  background-color: #d9d9d9; /* 默认灰色 */
 }
 
-.status-indicator.unknown {
-  background-color: #d9d9d9;
+.status-indicator.locked.active {
+  background-color: #faad14; /* 锁定时橙色 */
 }
 
 .status-text {
   color: #666;
+  font-size: 11px;
 }
 
 /* 库位状态样式 */
diff --git a/src/services/context-menu.service.ts b/src/services/context-menu.service.ts
index bfb6165..93e7bf8 100644
--- a/src/services/context-menu.service.ts
+++ b/src/services/context-menu.service.ts
@@ -130,13 +130,16 @@ export function parsePenData(penData: Record<string, unknown>): ParsedEventData
     
     console.log('解析后的数据:', { id, name, tags, storageLocation });
     
-    // 根据tags判断类型
-    if (tags.includes('storage-background')) {
-      console.log('识别为storage-background类型');
-      // 库位背景区域 - 需要查找该点关联的所有库位
+    // 根据tags判断类型 - 统一处理库位相关区域
+    if (tags.includes('storage-background') || tags.includes('storage-location')) {
+      const isBackground = tags.includes('storage-background');
+      
+      console.log(`识别为库位相关类型: ${isBackground ? 'storage-background' : 'storage-location'}`);
+      
+      // 库位背景区域或单个库位区域 - 都查找该点关联的所有库位
       const pointId = tags.find((tag: string) => tag.startsWith('point-'))?.replace('point-', '');
       return {
-        type: 'storage-background',
+        type: 'storage-background', // 统一使用storage-background类型
         id,
         name,
         pointId,
@@ -148,23 +151,6 @@ export function parsePenData(penData: Record<string, unknown>): ParsedEventData
       };
     }
     
-    if (tags.includes('storage-location')) {
-      console.log('识别为storage-location类型');
-      // 库位区域 - 使用storageLocation中的详细信息
-      const pointId = tags.find((tag: string) => tag.startsWith('point-'))?.replace('point-', '');
-      return {
-        type: 'storage',
-        id,
-        name: storageLocation?.locationName || name,
-        pointId,
-        storageId: id,
-        tags,
-        target: document.elementFromPoint(position.x, position.y) as HTMLElement,
-        position,
-        pen,
-      };
-    }
-    
     if (tags.includes('point')) {
       // 点区域
       return {
@@ -402,8 +388,8 @@ export function isClickInsideMenu(event: MouseEvent, isMenuVisible: boolean): bo
 export function getMenuConfig(type: string, data: ParsedEventData, storageLocationService?: any) {
   switch (type) {
     case 'storage-background': {
-      // 库位背景区域：显示该点关联的所有库位信息
-      console.log(`处理storage-background类型，点ID: ${data.pointId}`);
+      // 库位背景区域或单个库位区域：显示该点关联的所有库位信息
+      console.log(`处理库位相关类型，点ID: ${data.pointId}`);
       const allStorageLocations = getStorageLocationsForPoint(data, storageLocationService);
       console.log(`找到 ${allStorageLocations.length} 个库位:`, allStorageLocations);
       return {
@@ -411,18 +397,26 @@ export function getMenuConfig(type: string, data: ParsedEventData, storageLocati
         storageLocations: allStorageLocations,
       };
     }
-    case 'storage':
-      // 单个库位区域
+    case 'storage': {
+      // 单个库位区域 - 也使用storage-background类型统一处理
+      console.log(`处理单个库位类型，点ID: ${data.pointId}`);
+      const singleStorageLocations = getStorageLocationsForPoint(data, storageLocationService);
+      console.log(`找到 ${singleStorageLocations.length} 个库位:`, singleStorageLocations);
       return {
-        menuType: 'storage' as const,
-        storageLocations: [getStorageLocationInfo(data)],
+        menuType: 'storage-background' as const,
+        storageLocations: singleStorageLocations,
       };
-    case 'point':
+    }
+    case 'point': {
       // 点区域：显示该点关联的库位信息
+      console.log(`处理点区域类型，点ID: ${data.pointId}`);
+      const pointStorageLocations = getStorageLocationsForPoint(data, storageLocationService);
+      console.log(`找到 ${pointStorageLocations.length} 个库位:`, pointStorageLocations);
       return {
-        menuType: 'storage' as const,
-        storageLocations: getStorageLocationsForPoint(data, storageLocationService),
+        menuType: 'storage-background' as const,
+        storageLocations: pointStorageLocations,
       };
+    }
     default:
       return {
         menuType: 'default' as const,
@@ -431,62 +425,6 @@ export function getMenuConfig(type: string, data: ParsedEventData, storageLocati
   }
 }
 
-/**
- * 获取单个库位信息
- * @param data 事件数据
- * @returns 库位信息
- */
-function getStorageLocationInfo(data: ParsedEventData): StorageLocationInfo {
-  const pen = data.pen as Record<string, unknown>;
-  
-  // 优先使用storageLocation中的数据
-  if (pen?.storageLocation) {
-    const storageLocation = pen.storageLocation as {
-      locationName: string;
-      occupied: boolean;
-      locked: boolean;
-    };
-    const { locationName, occupied, locked } = storageLocation;
-    
-    let status: StorageLocationInfo['status'] = 'unknown';
-    if (locked) {
-      status = 'locked';
-    } else if (occupied) {
-      status = 'occupied';
-    } else {
-      status = 'available';
-    }
-
-    return {
-      id: data.id || data.storageId || 'unknown',
-      name: locationName || data.name || '未知库位',
-      isOccupied: occupied,
-      isLocked: locked,
-      status,
-    };
-  }
-  
-  // 回退到pen的其他属性
-  const isLocked = pen?.locked === 1;
-  const isOccupied = pen?.occupied === 1 || pen?.status === 'occupied';
-  
-  let status: StorageLocationInfo['status'] = 'unknown';
-  if (isLocked) {
-    status = 'locked';
-  } else if (isOccupied) {
-    status = 'occupied';
-  } else {
-    status = 'available';
-  }
-
-  return {
-    id: data.id || data.storageId || 'unknown',
-    name: data.name || '未知库位',
-    isOccupied,
-    isLocked,
-    status,
-  };
-}
 
 /**
  * 查找指定点ID的所有库位信息