Browse Source

图片上传路径统一,控制台类型不匹配报错修复

mh
menghao 1 month ago
parent
commit
ace4d1c6ce
  1. 3
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java
  2. 3
      ruoyi-ui/src/views/cesiumMap/index.vue
  3. 2
      ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue
  4. 2
      ruoyi-ui/src/views/childRoom/BottomTimeline.vue
  5. 15
      ruoyi-ui/src/views/childRoom/LeftMenu.vue

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

3
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 }

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

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

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

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

15
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 animationghost-class
}
},
watch: {

Loading…
Cancel
Save