diff --git a/src/components/context-menu/storage-menu.vue b/src/components/context-menu/storage-menu.vue
index e6a77ea..f53a95b 100644
--- a/src/components/context-menu/storage-menu.vue
+++ b/src/components/context-menu/storage-menu.vue
@@ -51,36 +51,36 @@
             <div class="sub-menu-title">{{ selectedLocation.name }} - 操作</div>
           </div>
           <div class="sub-menu-actions">
-            <div class="menu-item" @click="handleStorageAction('occupy', '占用')">
-              <span class="action-icon">📦</span>
+            <div v-if="!selectedLocation.isOccupied" class="menu-item" @click="handleStorageAction('occupy', '占用')">
               <span>占用</span>
             </div>
-            <div class="menu-item" @click="handleStorageAction('release', '释放')">
-              <span class="action-icon">📤</span>
+            <div v-if="selectedLocation.isOccupied" class="menu-item" @click="handleStorageAction('release', '释放')">
               <span>释放</span>
             </div>
-            <div class="menu-item" @click="handleStorageAction('lock', '锁定')">
-              <span class="action-icon">🔒</span>
+            <div v-if="!selectedLocation.isLocked" class="menu-item" @click="handleStorageAction('lock', '锁定')">
               <span>锁定</span>
             </div>
-            <div class="menu-item" @click="handleStorageAction('unlock', '解锁')">
-              <span class="action-icon">🔓</span>
+            <div v-if="selectedLocation.isLocked" class="menu-item" @click="handleStorageAction('unlock', '解锁')">
               <span>解锁</span>
             </div>
-            <div class="menu-item" @click="handleStorageAction('enable', '启用')">
-              <span class="action-icon">✅</span>
+            <div v-if="selectedLocation.isDisabled" class="menu-item" @click="handleStorageAction('enable', '启用')">
               <span>启用</span>
             </div>
-            <div class="menu-item" @click="handleStorageAction('disable', '禁用')">
-              <span class="action-icon">❌</span>
+            <div v-if="!selectedLocation.isDisabled" class="menu-item" @click="handleStorageAction('disable', '禁用')">
               <span>禁用</span>
             </div>
-            <div class="menu-item" @click="handleStorageAction('set_empty_tray', '设为空托盘')">
-              <span class="action-icon">📋</span>
+            <div
+              v-if="!selectedLocation.isEmptyTray"
+              class="menu-item"
+              @click="handleStorageAction('set_empty_tray', '设为空托盘')"
+            >
               <span>设为空托盘</span>
             </div>
-            <div class="menu-item" @click="handleStorageAction('clear_empty_tray', '清除空托盘')">
-              <span class="action-icon">🗑️</span>
+            <div
+              v-if="selectedLocation.isEmptyTray"
+              class="menu-item"
+              @click="handleStorageAction('clear_empty_tray', '清除空托盘')"
+            >
               <span>清除空托盘</span>
             </div>
           </div>
diff --git a/src/services/context-menu/menu-config.service.ts b/src/services/context-menu/menu-config.service.ts
index 2610dae..e722359 100644
--- a/src/services/context-menu/menu-config.service.ts
+++ b/src/services/context-menu/menu-config.service.ts
@@ -66,8 +66,10 @@ export function getMenuConfig(
     }
 
     case 'area':
-      // 区域类型
-      return getAreaMenuConfig(data);
+      // 区域类型 - 根据要求，不显示菜单
+      return {
+        menuType: 'default' as const,
+      };
 
     default:
       // 对于默认情况，我们不希望显示任何菜单，
@@ -78,30 +80,6 @@ export function getMenuConfig(
   }
 }
 
-/**
- * 获取区域菜单配置
- * @param data 事件数据
- * @returns 区域菜单配置
- */
-function getAreaMenuConfig(data: ParsedEventData): AreaMenuConfig {
-  console.log(`处理区域类型，区域ID: ${data.id}`);
-
-  if (data.id && data.name) {
-    return {
-      menuType: 'area' as const,
-      areaInfo: {
-        id: data.id,
-        name: data.name,
-        type: '区域',
-      },
-    };
-  }
-
-  return {
-    menuType: 'default' as const,
-  };
-}
-
 /**
  * 处理右键菜单的核心逻辑 - 统一处理函数
  * @param parsedData 解析后的事件数据
diff --git a/src/services/storage-location.service.ts b/src/services/storage-location.service.ts
index 68349b6..d6d21f8 100644
--- a/src/services/storage-location.service.ts
+++ b/src/services/storage-location.service.ts
@@ -99,8 +99,8 @@ const DEFAULT_STORAGE_CONFIG: StorageLocationConfig = {
   },
 };
 
-// 提供给绘制层快速查询的全局状态映射：pointId -> (layerName -> { occupied, locked, disabled })
-export type StorageState = { occupied?: boolean; locked?: boolean; disabled?: boolean };
+// 提供给绘制层快速查询的全局状态映射：pointId -> (layerName -> { occupied, locked, disabled, isEmptyTray })
+export type StorageState = { occupied?: boolean; locked?: boolean; disabled?: boolean; isEmptyTray?: boolean };
 export const storageStateMap = reactive(new Map<string, Map<string, StorageState>>());
 
 /**
@@ -310,7 +310,8 @@ export class StorageLocationService {
           !currentLocation ||
           currentLocation.is_occupied !== newLocation.is_occupied ||
           currentLocation.is_locked !== newLocation.is_locked ||
-          currentLocation.is_disabled !== newLocation.is_disabled
+          currentLocation.is_disabled !== newLocation.is_disabled ||
+          currentLocation.is_empty_tray !== newLocation.is_empty_tray
         ) {
           return true;
         }
@@ -344,7 +345,8 @@ export class StorageLocationService {
           !currentLocation ||
           currentLocation.is_occupied !== newLocation.is_occupied ||
           currentLocation.is_locked !== newLocation.is_locked ||
-          currentLocation.is_disabled !== newLocation.is_disabled
+          currentLocation.is_disabled !== newLocation.is_disabled ||
+          currentLocation.is_empty_tray !== newLocation.is_empty_tray
         ) {
           changedPointIds.add(pointId);
           break;
@@ -397,6 +399,7 @@ export class StorageLocationService {
             occupied: loc.is_occupied,
             locked: loc.is_locked,
             disabled: loc.is_disabled,
+            isEmptyTray: loc.is_empty_tray,
           });
         });
         storageStateMap.set(pointId, inner);
@@ -448,6 +451,7 @@ export class StorageLocationService {
             occupied: new_status.is_occupied,
             locked: new_status.is_locked,
             disabled: new_status.is_disabled,
+            isEmptyTray: new_status.is_empty_tray,
           });
           storageStateMap.set(pointId, inner);