dianliang/school_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
许允枞 2025-03-03 14:14:30 +08:00
parent 89c33aefc2
commit 745d8a0dce
5 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java
View File

@ -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" +

2
ruoyi-admin/src/main/resources/config/ueditor/config.json
View File

@ -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名称 */

58
ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
View File

@ -121,39 +121,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<insert id="insertBatchDictData">
insert into sys_dict_data(
<if test="dictDatas != null and dictDatas.size() > 0">
<foreach collection="dictDatas" item="dictData" separator=",">
<if test="dictData.dictSort != null">dict_sort,</if>
<if test="dictData.dictLabel != null and dictData.dictLabel != ''">dict_label,</if>
<if test="dictData.dictValue != null and dictData.dictValue != ''">dict_value,</if>
<if test="dictData.dictType != null and dictData.dictType != ''">dict_type,</if>
<if test="dictData.cssClass != null and dictData.cssClass != ''">css_class,</if>
<if test="dictData.listClass != null and dictData.listClass != ''">list_class,</if>
<if test="dictData.isDefault != null and dictData.isDefault != ''">is_default,</if>
<if test="dictData.status != null">status,</if>
<if test="dictData.remark != null and dictData.remark != ''">remark,</if>
<if test="dictData.createBy != null and dictData.createBy != ''">create_by,</if>
create_time
</foreach>
</if>
)
values
<foreach collection="dictDatas" item="dictData" separator=",">
(
<if test="dictData.dictSort != null">#{dictData.dictSort},</if>
<if test="dictData.dictLabel != null and dictData.dictLabel != ''">#{dictData.dictLabel},</if>
<if test="dictData.dictValue != null and dictData.dictValue != ''">#{dictData.dictValue},</if>
<if test="dictData.dictType != null and dictData.dictType != ''">#{dictData.dictType},</if>
<if test="dictData.cssClass != null and dictData.cssClass != ''">#{dictData.cssClass},</if>
<if test="dictData.listClass != null and dictData.listClass != ''">#{dictData.listClass},</if>
<if test="dictData.isDefault != null and dictData.isDefault != ''">#{dictData.isDefault},</if>
<if test="dictData.status != null">#{dictData.status},</if>
<if test="dictData.remark != null and dictData.remark != ''">#{dictData.remark},</if>
<if test="dictData.createBy != null and dictData.createBy != ''">#{dictData.createBy},</if>
sysdate()
)
</foreach>
</insert>
insert into sys_dict_data(
dict_sort,
dict_label,
dict_value,
dict_type,
create_time
)
values
<foreach collection="dictDatas" item="dictData" separator=",">
(
<if test="dictData.dictSort != null">#{dictData.dictSort},</if>
<if test="dictData.dictLabel != null and dictData.dictLabel != ''">#{dictData.dictLabel},</if>
<if test="dictData.dictValue != null and dictData.dictValue != ''">#{dictData.dictValue},</if>
<if test="dictData.dictType != null and dictData.dictType != ''">#{dictData.dictType},</if>
<if test="dictData.cssClass != null and dictData.cssClass != ''">#{dictData.cssClass},</if>
<if test="dictData.listClass != null and dictData.listClass != ''">#{dictData.listClass},</if>
<if test="dictData.isDefault != null and dictData.isDefault != ''">#{dictData.isDefault},</if>
<if test="dictData.status != null">#{dictData.status},</if>
<if test="dictData.remark != null and dictData.remark != ''">#{dictData.remark},</if>
<if test="dictData.createBy != null and dictData.createBy != ''">#{dictData.createBy},</if>
sysdate()
)
</foreach>
</insert>
</mapper>

11
ruoyi-ui/src/views/officialWebsite/about.vue
View File

@ -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 => {

20
ruoyi-ui/src/views/officialWebsite/platform.vue
View File

@ -14,12 +14,12 @@
<!-- <div class="left"><img src="../../assets/gw/home.png" alt="">-->
<!-- <p><a href="/gw">首页</a><i class="el-icon-arrow-right"></i> <span href="">中心概况</span></p>-->
<!-- </div>-->
<div class="right">
<div class="nav-item" v-for="(item, index) in nav" v-bind:class="[index === currentActive ? 'active' : '']"
@click="getCurrentActive(index)">
{{ item.categoryName }}
</div>
</div>
<!-- <div class="right">-->
<!-- <div class="nav-item" v-for="(item, index) in nav" v-bind:class="[index === currentActive ? 'active' : '']"-->
<!-- @click="getCurrentActive(index)">-->
<!-- {{ item.categoryName }}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
@ -31,11 +31,11 @@
<img src="../../assets/images/l_img.png" alt="">
</div>
<!-- main -->
<div v-for="(item, index) in nav " :key=index @click="goDeatail(item)">
<!-- <div v-for="(item, index) in nav " :key=index @click="goDeatail(item)">-->
<div class="about-conts-item1">
<div class="neirong" v-html="pageContext"></div>
</div>
</div>
<!-- </div>-->
<!-- 专业平台介绍-->
<!-- <div class="ayptjs" v-show="currentActive == 0">-->
<!-- <div class="ayptjs">-->
@ -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()
})
},