From 745d8a0dcec8bf5827e560b54a37e4416bd919b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Mon, 3 Mar 2025 14:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/UeditorController.java | 6 +- .../main/resources/config/ueditor/config.json | 2 +- .../mapper/system/SysDictDataMapper.xml | 58 ++++++++----------- ruoyi-ui/src/views/officialWebsite/about.vue | 11 ++-- .../src/views/officialWebsite/platform.vue | 20 +++---- 5 files changed, 44 insertions(+), 53 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java index c5b4d03..5cb828a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java @@ -105,16 +105,16 @@ public class UeditorController { " \"imageManagerActionName\": \"listimage\",\n" + " \"snapscreenPathFormat\": \"image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" + " \"scrawlPathFormat\": \"image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" + - " \"scrawlMaxSize\": 2048000,\n" + + " \"scrawlMaxSize\": 104857600,\n" + " \"imageInsertAlign\": \"none\",\n" + " \"catcherPathFormat\": \"image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" + - " \"catcherMaxSize\": 2048000,\n" + + " \"catcherMaxSize\": 104857600,\n" + " \"snapscreenUrlPrefix\": \"\",\n" + " \"imagePathFormat\": \"image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" + " \"imageManagerUrlPrefix\": \"https://meevexp.oberyun.com/hgdWebsite\",\n" + " \"scrawlUrlPrefix\": \"\",\n" + " \"scrawlFieldName\": \"upfile\",\n" + - " \"imageMaxSize\": 2048000,\n" + + " \"imageMaxSize\": 104857600,\n" + " \"imageAllowFiles\": [\n" + " \".png\",\n" + " \".jpg\",\n" + diff --git a/ruoyi-admin/src/main/resources/config/ueditor/config.json b/ruoyi-admin/src/main/resources/config/ueditor/config.json index 5d542bc..fa45d34 100644 --- a/ruoyi-admin/src/main/resources/config/ueditor/config.json +++ b/ruoyi-admin/src/main/resources/config/ueditor/config.json @@ -37,7 +37,7 @@ "catcherFieldName": "source", /* 提交的图片列表表单名称 */ "catcherPathFormat": "image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */ "catcherUrlPrefix": "", /* 图片访问路径前缀 */ - "catcherMaxSize": 2048000, /* 上传大小限制，单位B */ + "catcherMaxSize": 104857600, /* 上传大小限制，单位B */ "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */ /* 上传视频配置 */ "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */ diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index ccb09e4..67d582a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -121,39 +121,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - insert into sys_dict_data( - - - dict_sort, - dict_label, - dict_value, - dict_type, - css_class, - list_class, - is_default, - status, - remark, - create_by, - create_time - - - ) - values - - ( - #{dictData.dictSort}, - #{dictData.dictLabel}, - #{dictData.dictValue}, - #{dictData.dictType}, - #{dictData.cssClass}, - #{dictData.listClass}, - #{dictData.isDefault}, - #{dictData.status}, - #{dictData.remark}, - #{dictData.createBy}, - sysdate() - ) - - + insert into sys_dict_data( + dict_sort, + dict_label, + dict_value, + dict_type, + create_time + ) + values + + ( + #{dictData.dictSort}, + #{dictData.dictLabel}, + #{dictData.dictValue}, + #{dictData.dictType}, + #{dictData.cssClass}, + #{dictData.listClass}, + #{dictData.isDefault}, + #{dictData.status}, + #{dictData.remark}, + #{dictData.createBy}, + sysdate() + ) + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/officialWebsite/about.vue b/ruoyi-ui/src/views/officialWebsite/about.vue index ab407e2..dd0f3b7 100644 --- a/ruoyi-ui/src/views/officialWebsite/about.vue +++ b/ruoyi-ui/src/views/officialWebsite/about.vue @@ -136,11 +136,12 @@ export default { return } this.currentActive = value - if (value === 1) { - this.getContentByCategoryId(this.nav[value].id) - } else { - this.getContent() - } + this.getContent() + // if (value === 1) { + // this.getContentByCategoryId(this.nav[value].id) + // } else { + // + // } }, getContentByCategoryId(id) { getListById(id).then(res => { diff --git a/ruoyi-ui/src/views/officialWebsite/platform.vue b/ruoyi-ui/src/views/officialWebsite/platform.vue index 5e00a38..4c81ad0 100644 --- a/ruoyi-ui/src/views/officialWebsite/platform.vue +++ b/ruoyi-ui/src/views/officialWebsite/platform.vue @@ -14,12 +14,12 @@ -
-
- {{ item.categoryName }} -
-
+ + + + + + @@ -31,11 +31,11 @@ -
+
-
+ @@ -176,7 +176,7 @@ export default { // }) }, getContentDetail() { - this.routeParam.categoryId = this.nav[this.currentActive].id + // this.routeParam.categoryId = this.nav[this.currentActive].id getPageData(this.routeParam).then(response => { this.pageContext = response.data.list[0].contentDetail }) @@ -184,7 +184,7 @@ export default { initPageData() { getCategoryByParentId(this.routeParam.categoryId).then(res => { this.nav = res.data - this.categoryId = res.data[0].id + this.categoryId = this.routeParam.categoryId this.getContentDetail() }) },