diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java index 61ac3aef..1c586cb1 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java @@ -150,7 +150,8 @@ public class SysHomeController { ); List menus = sysUserService.getMenus(SecurityUtil.getUserId()); List allMenuIds = menus.stream().map(Sys_menu::getId).toList(); - List sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); + //List sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); + List sysMenus = list.stream().sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); return Result.success(sysMenus); } @@ -166,7 +167,8 @@ public class SysHomeController { ); List menus = sysUserService.getMenus(SecurityUtil.getUserId()); List allMenuIds = menus.stream().map(Sys_menu::getId).toList(); - List sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); + //List sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); + List sysMenus = list.stream().sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); return Result.success(sysMenus); } diff --git a/src/main/resources/static/components/plugins/sysUpload/index.vue b/src/main/resources/static/components/plugins/sysUpload/index.vue index e8a9d3f8..853fb2aa 100644 --- a/src/main/resources/static/components/plugins/sysUpload/index.vue +++ b/src/main/resources/static/components/plugins/sysUpload/index.vue @@ -205,6 +205,8 @@ module.exports = { } if (fileAccept) { tips = tips + `只能上传${fileAccept}文件；` + } else { + tips = tips + '不限格式；' } if (fileSize) { tips = tips + `单个文件大小不能超过${fileSize / 1024 / 1024}M；` diff --git a/src/main/resources/views/layouts/v4/home/act.js b/src/main/resources/views/layouts/v4/home/act.js index 395799a7..e9340a25 100644 --- a/src/main/resources/views/layouts/v4/home/act.js +++ b/src/main/resources/views/layouts/v4/home/act.js @@ -141,10 +141,10 @@ const act = { padding: 40px 0; } - .section-act .section-act-title span:hover { + /*.section-act .section-act-title span:hover { color: var(--color-primary); cursor: pointer; - } + }*/ /deep/ .section-act .section-act-title span::before { content: ''; diff --git a/src/main/resources/views/layouts/v4/home/entry.js b/src/main/resources/views/layouts/v4/home/entry.js index 3fe51d93..4abb5a3a 100644 --- a/src/main/resources/views/layouts/v4/home/entry.js +++ b/src/main/resources/views/layouts/v4/home/entry.js @@ -2,7 +2,7 @@ const entry = { template: /*language=HTML*/ `
- 常用入口 + 常用入口
@@ -144,6 +144,27 @@ const entry = { padding: 40px 0; } + /deep/ .entry-title span::before { + content: ''; + width: 24px; + height: 11px; + background: url(https://www.ncu.edu.cn/images/titl.svg) no-repeat center; + background-size: 24px 11px; + display: inline-block; + margin-right: 0; + vertical-align: middle; + } + + /deep/ .entry-title span::after { + content: ''; + width: 24px; + height: 11px; + background: url(https://www.ncu.edu.cn/images/titr.svg) no-repeat center; + background-size: 24px 11px; + display: inline-block; + margin-left: 0; + vertical-align: middle; + } .entry-container { width: 80%; diff --git a/src/main/resources/views/layouts/v4/home/jcdt.js b/src/main/resources/views/layouts/v4/home/jcdt.js index 569f9ea6..72252340 100644 --- a/src/main/resources/views/layouts/v4/home/jcdt.js +++ b/src/main/resources/views/layouts/v4/home/jcdt.js @@ -3,11 +3,11 @@ const jcdt = {
- 基层动态 + 基层动态
-
+
{{item.date}}
{{item.title}}
@@ -29,7 +29,12 @@ const jcdt = { default: [] } }, - methods: {}, + methods: { + onLink(item) { + if(!item.url) return + window.open(item.url) + }, + }, style: /*language=CSS*/ ` .jcdt-wrapper { width: 100%; @@ -54,6 +59,28 @@ const jcdt = { text-align: center; padding: 40px 0; } + + /deep/ .jcdt-container .jcdt-title span::before { + content: ''; + width: 24px; + height: 11px; + background: url(https://www.ncu.edu.cn/images/titl.svg) no-repeat center; + background-size: 24px 11px; + display: inline-block; + margin-right: 0; + vertical-align: middle; + } + + /deep/ .jcdt-container .jcdt-title span::after { + content: ''; + width: 24px; + height: 11px; + background: url(https://www.ncu.edu.cn/images/titr.svg) no-repeat center; + background-size: 24px 11px; + display: inline-block; + margin-left: 0; + vertical-align: middle; + } .jcdt-list { display: grid; diff --git a/src/main/resources/views/platform/sys/data/user/pull.html b/src/main/resources/views/platform/sys/data/user/pull.html index 413ea24a..9e2a2e37 100644 --- a/src/main/resources/views/platform/sys/data/user/pull.html +++ b/src/main/resources/views/platform/sys/data/user/pull.html @@ -38,7 +38,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/sys/data/user/update.html b/src/main/resources/views/platform/sys/data/user/update.html index c5f13e57..f5ae31ea 100644 --- a/src/main/resources/views/platform/sys/data/user/update.html +++ b/src/main/resources/views/platform/sys/data/user/update.html @@ -7,11 +7,11 @@ layout("/layouts/platform.html"){ width: 100%; margin-bottom: 10px; } - + .pullTimeRadioGroup .el-radio.is-bordered + .el-radio.is-bordered { margin-left: 0; } - + .condition-builder { border: 1px solid #dcdfe6; border-radius: 4px; @@ -32,7 +32,7 @@ layout("/layouts/platform.html"){ - + @@ -47,7 +47,7 @@ layout("/layouts/platform.html"){ - + 更新【码表】数据 @@ -87,11 +87,11 @@ layout("/layouts/platform.html"){ - + - + @@ -105,7 +105,7 @@ layout("/layouts/platform.html"){ - + @@ -114,10 +114,10 @@ layout("/layouts/platform.html"){ - + - +
@@ -133,7 +133,7 @@ layout("/layouts/platform.html"){