From ace4d1c6ce6050471a5ace93cc027b81a7b6c8fa Mon Sep 17 00:00:00 2001
From: menghao <1584479611@qq.com>
Date: Fri, 27 Feb 2026 15:05:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E7=BB=9F=E4=B8=80=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=8C=B9=E9=85=8D=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/PlatformLibController.java   |  3 ++-
 ruoyi-ui/src/views/cesiumMap/index.vue                    |  3 ---
 ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue          |  2 +-
 ruoyi-ui/src/views/childRoom/BottomTimeline.vue           |  2 +-
 ruoyi-ui/src/views/childRoom/LeftMenu.vue                 | 15 ++++++---------
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java
index 5354071..596e28a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java
@@ -77,7 +77,8 @@ public class PlatformLibController extends BaseController
         // 判断前端是否有文件传过来
         if (file != null && !file.isEmpty())
         {
-            String fileName = FileUploadUtils.upload(RuoYiConfig.getProfile(), file);
+            // 与通用上传一致：存到 profile/upload/年/月/日/ 下，统一存储路径
+            String fileName = FileUploadUtils.upload(RuoYiConfig.getUploadPath(), file);
             // 把这个路径存入实体类的 iconUrl 属性，对应数据库 icon_url 字段
             platformLib.setIconUrl(fileName);
         }
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index 1069cec..4ab397a 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -472,9 +472,6 @@ export default {
       routeLabelVisible: {},
       // 航线飞机标牌样式：routeId -> { fontSize, fontColor }
       routeLabelStyles: {},
-      // 航线上锁状态：routeId -> true 上锁（不可编辑）/ false 或未设 可编辑
-      routeLocked: {},
-      // 航线上锁状态由父组件通过 prop routeLocked 传入，与右侧列表锁图标同步
       // 从平台右键进入的航线绘制：{ platformInfo: { platformId, platform }, mode: 'before'|'after' }
       platformRouteDrawing: null,
       // 航线平台自定义样式缓存：routeId -> { labelFontSize, labelFontColor, platformSize, platformColor }
diff --git a/ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue b/ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue
index 9eede47..3b255b1 100644
--- a/ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue
+++ b/ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue
@@ -53,7 +53,7 @@ export default {
   },
   props: {
     roomId: {
-      type: Number,
+      type: [Number, String],
       default: null
     }
   },
diff --git a/ruoyi-ui/src/views/childRoom/BottomTimeline.vue b/ruoyi-ui/src/views/childRoom/BottomTimeline.vue
index e2fe34f..580997a 100644
--- a/ruoyi-ui/src/views/childRoom/BottomTimeline.vue
+++ b/ruoyi-ui/src/views/childRoom/BottomTimeline.vue
@@ -199,7 +199,7 @@ export default {
   name: 'BottomTimeline',
   props: {
     roomId: {
-      type: Number,
+      type: [Number, String],
       default: null
     }
   },
diff --git a/ruoyi-ui/src/views/childRoom/LeftMenu.vue b/ruoyi-ui/src/views/childRoom/LeftMenu.vue
index 64b0af7..62b0775 100644
--- a/ruoyi-ui/src/views/childRoom/LeftMenu.vue
+++ b/ruoyi-ui/src/views/childRoom/LeftMenu.vue
@@ -16,7 +16,11 @@
       <draggable
         v-model="localMenuItems"
         class="menu-icons"
-        :options="dragOptions"
+        :animation="200"
+        ghost-class="ghost-item"
+        chosen-class="chosen-item"
+        drag-class="dragging-item"
+        handle=".menu-item"
         :disabled="!isEditMode"
         @end="onDragEnd"
         @wheel.native="handleWheel"
@@ -121,14 +125,7 @@ export default {
       showDeleteDialog: false,
       itemToDelete: null,
       showIconSelectDialog: false,
-      dragOptions: {
-        animation: 200,
-        ghostClass: 'ghost-item',
-        chosenClass: 'chosen-item',
-        dragClass: 'dragging-item',
-        handle: '.menu-item',
-        delay: 0
-      }
+      // 拖拽配置已直接通过 draggable 组件的 props 传入（animation、ghost-class 等）
     }
   },
   watch: {