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 8f6bfce..504238a 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 6af1038..7220a27 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 @@