diff --git a/yudao-admin-vue3/src/assets/imgs/liebiao.png b/yudao-admin-vue3/src/assets/imgs/liebiao.png new file mode 100644 index 0000000..49c5948 Binary files /dev/null and b/yudao-admin-vue3/src/assets/imgs/liebiao.png differ diff --git a/yudao-admin-vue3/src/assets/imgs/tubiao.png b/yudao-admin-vue3/src/assets/imgs/tubiao.png new file mode 100644 index 0000000..7b76ca4 Binary files /dev/null and b/yudao-admin-vue3/src/assets/imgs/tubiao.png differ diff --git a/yudao-admin-vue3/src/views/infra/file/index.vue b/yudao-admin-vue3/src/views/infra/file/index.vue index f2c18c9..16ef83c 100644 --- a/yudao-admin-vue3/src/views/infra/file/index.vue +++ b/yudao-admin-vue3/src/views/infra/file/index.vue @@ -34,14 +34,6 @@
- @@ -63,12 +55,15 @@ 上传文件 + + + - - - + + + - + +
+ +
+
+ 图表 +
+
+
+ + + @@ -169,6 +167,8 @@ const dialogVisibles = ref(false) // 弹窗的是否展示 const dialogTitles = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 + const panduan = ref('1') + const tubiaoData = ref([]); const formData = ref({ id: undefined, sort: undefined, @@ -210,17 +210,37 @@ try { const data = await FileApi.getFilePage(queryParams) list.value = data.list + tubiaoData.value = data.list + console.log('111111',tubiaoData) total.value = data.total } finally { loading.value = false } } + interface FileDataVO { + id: string + configId: string + path: string + name: string + url: string + type: string + picType: string + size: string + createTime: Date + } + + const tubiao = () => { + panduan.value = '2' + } + + const liebiao = () => { + panduan.value = '1' + } //新增分类 const createType = () => { dialogVisibles.value = true dialogTitles.value = '新增分类' - } /** 添加分类菜单 */ @@ -291,7 +311,6 @@ const getTypeList = async () => { const data = await DictDataApi.getTypeList() typeMenu.value = data - console.log('1111111111', typeMenu) } @@ -373,4 +392,29 @@ overflow-y: auto; /* 允许内容区域滚动 */ } - \ No newline at end of file + + + /* 图片容器样式 */ + .image-container { + display: flex; + flex-wrap: wrap; + gap: 10px; /* 设置图片之间的间距 */ + justify-content: flex-start; /* 如果图片少于5张,会平均分布 */ + max-width: 1000px; /* 设置外部容器的最大宽度 */ + margin: 0 auto; /* 居中显示 */ + } + + /* 每张图片占用的宽度,使每行显示5张 */ + .image-item { + width: calc(20% - 8px); /* 宽度设为容器的20%,减去间距 */ + } + + /* 设置图片的最大宽度 */ + .image-item img { + width: 100%; + height: auto; + border-radius: 8px; /* 图片边缘圆角(可选) */ + } + + + diff --git a/yudao-admin-vue3/src/views/infra/file/updateForm.vue b/yudao-admin-vue3/src/views/infra/file/updateForm.vue index eb3d1a7..b434df8 100644 --- a/yudao-admin-vue3/src/views/infra/file/updateForm.vue +++ b/yudao-admin-vue3/src/views/infra/file/updateForm.vue @@ -92,8 +92,6 @@ const open = async (type: string, ids: number, picTypes: number) => { formLoading.value = true id.value = ids picType.value = picTypes - console.log('11111',ids) - console.log('2222',picType.value) formLoading.value = false } } diff --git a/yudao-framework/yudao-spring-boot-starter-websocket/src/main/java/cn/iocoder/yudao/framework/websocket/core/sender/redis/RedisWebSocketMessageConsumer.java b/yudao-framework/yudao-spring-boot-starter-websocket/src/main/java/cn/iocoder/yudao/framework/websocket/core/sender/redis/RedisWebSocketMessageConsumer.java index abce006..6323423 100644 --- a/yudao-framework/yudao-spring-boot-starter-websocket/src/main/java/cn/iocoder/yudao/framework/websocket/core/sender/redis/RedisWebSocketMessageConsumer.java +++ b/yudao-framework/yudao-spring-boot-starter-websocket/src/main/java/cn/iocoder/yudao/framework/websocket/core/sender/redis/RedisWebSocketMessageConsumer.java @@ -18,6 +18,8 @@ public class RedisWebSocketMessageConsumer extends AbstractRedisChannelMessageLi redisWebSocketMessageSender.send(message.getSessionId(), message.getUserType(), message.getUserId(), message.getMessageType(), message.getMessageContent()); + System.out.println("11111111111111111111 : " + message.toString()); + } } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java index 52f930c..0f60f06 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java @@ -165,7 +165,7 @@ public class KeFuMessageServiceImpl implements KeFuMessageService { @Async public void sendAsyncMessageToMembers(Long userId, String messageType, Object content) { - webSocketSenderApi.sendObject(UserTypeEnum.MEMBER.getValue(), userId, messageType, content); + webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), userId, messageType, content); } @Async @@ -175,7 +175,7 @@ public class KeFuMessageServiceImpl implements KeFuMessageService { @Async public void sendAsyncMessageToAdmins(String messageType, Object content) { - webSocketSenderApi.sendObject(UserTypeEnum.MEMBER.getValue(), messageType, content); + webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), messageType, content); } @Override