Merge branch 'mh' of http://124.70.32.114:3100/woka/cesium-map-object into ctw

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);
         }

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 }

ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue

@@ -53,7 +53,7 @@ export default {
   },
   props: {
     roomId: {
-      type: Number,
+      type: [Number, String],
       default: null
     }
   },

ruoyi-ui/src/views/childRoom/BottomTimeline.vue

@@ -199,7 +199,7 @@ export default {
   name: 'BottomTimeline',
   props: {
     roomId: {
-      type: Number,
+      type: [Number, String],
       default: null
     }
   },

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: {
+      // 拖拽配置已直接通过 draggable 组件的 props 传入（animation、ghost-class 等）
-        animation: 200,
-        ghostClass: 'ghost-item',
-        chosenClass: 'chosen-item',
-        dragClass: 'dragging-item',
-        handle: '.menu-item',
-        delay: 0
-      }
     }
   },
   watch: {