From 6f3e1ae47c517752562714b85ed8e87b4fd458f0 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Thu, 16 Oct 2025 10:47:25 +0800 Subject: [PATCH] commit --- .../app/sys/controller/SysHomeController.java | 6 ++- .../components/plugins/sysUpload/index.vue | 2 + .../resources/views/layouts/v4/home/act.js | 4 +- .../resources/views/layouts/v4/home/entry.js | 23 ++++++++++- .../resources/views/layouts/v4/home/jcdt.js | 33 ++++++++++++++-- .../views/platform/sys/data/user/pull.html | 2 +- .../views/platform/sys/data/user/update.html | 26 ++++++------- .../views/platform/sys/user/index.html | 6 +-- .../declare/apply/index.html | 2 +- .../declare/branchunion/index.html | 26 ++++++------- .../declare/mine/index.html | 4 +- .../declare/schoolprincipal/index.html | 26 ++++++------- .../declare/schoolunion/index.html | 26 ++++++------- .../reimbursement/apply/index.html | 2 +- .../reimbursement/branchunion/index.html | 26 ++++++------- .../reimbursement/mine/index.html | 4 +- .../reimbursement/schoolprincipal/index.html | 26 ++++++------- .../reimbursement/schoolunion/index.html | 26 ++++++------- .../activity/fitnesswalk/bindingRecord.html | 6 +-- .../activity/workscollection/read/index.html | 4 +- .../platform/zhgh/benefit/userList/index.html | 4 +- .../zhgh/benefit/userSelectionList/index.html | 4 +- .../cadreTraining/collect/index.html | 8 ++-- .../cadreTraining/schoolAudit/index.html | 8 ++-- .../schoolAudit/index.html | 4 +- .../enrollmentRegistration/summary/index.html | 4 +- .../exerciseCard/query/index.html | 8 ++-- .../healthCheckup/listMange/index.html | 2 +- .../healthCheckup/statisticsSingle/index.html | 2 +- .../honor/honorLevelSummary/index.html | 2 +- .../honor/unionSummary/index.html | 2 +- .../dayofficework/integral/detail/index.html | 4 +- .../dayofficework/integral/manage/index.html | 4 +- .../outlayReimburse/schoolCnAudit/index.html | 2 +- .../outlayReimburse/schoolKjAudit/index.html | 2 +- .../outlayReimburse/schoolZxAudit/index.html | 2 +- .../outlay/outlayReimburse/summary/index.html | 2 +- .../zhgh/dayofficework/qsv/quiz/rank.html | 4 +- .../unionReimburse/apply/index.html | 2 +- .../unionReimburse/collect/index.html | 8 ++-- .../unionReimburse/mine/index.html | 8 ++-- .../unionReimburse/review/index.html | 8 ++-- .../workershome/declaration/mine.html | 2 +- .../declaration/organizationAudit.html | 4 +- .../workershome/declaration/schoolAudit.html | 4 +- .../workershome/declaration/statistics.html | 4 +- .../dayofficework/workershome/info/info.html | 4 +- .../dayofficework/workershome/info/mine.html | 2 +- .../workershome/info/schoolAudit.html | 4 +- .../delegationOnePush/index.html | 4 +- .../delegationTwoPush/index.html | 4 +- .../executiveCommitteeMember/index.html | 2 +- .../preparatoryGroupPush/index.html | 4 +- .../material/write/index.html | 2 +- .../meeting/statistics/index.html | 4 +- .../meeting/write/index.html | 2 +- .../proposal/query/comprehensive/index.html | 8 ++-- .../democratic/suggestionBox/query/index.html | 8 ++-- .../democratic/suggestionBox/write/index.html | 2 +- .../democratic/suggestionBox/xgh/index.html | 8 ++-- .../delegate/manage/index.html | 8 ++-- .../delegate/push/zcAudit.html | 4 +- .../teachercongress/delegate/read/index.html | 8 ++-- .../prepare/quotaAllocation/index.html | 2 +- .../workercongress/delegate/manage/index.html | 8 ++-- .../workercongress/delegate/read/index.html | 8 ++-- .../difficulthelp/apply/index.html | 2 +- .../branchunionapproval/index.html | 26 ++++++------- .../difficulthelp/mine/index.html | 4 +- .../difficulthelp/reading/index.html | 4 +- .../schoolunionapproval/index.html | 24 ++++++------ .../staffbenefit/dsznfmtx/apply/index.html | 2 +- .../staffbenefit/dsznfmtx/collect/index.html | 8 ++-- .../dsznfmtx/schoolAudit/index.html | 8 ++-- .../dsznfmtx/unionAudit/index.html | 8 ++-- .../schoolAudit/index.html | 4 +- .../excellentRecuperation/summary/index.html | 4 +- .../maternityLeave/apply/index.html | 2 +- .../maternityLeave/collect/index.html | 8 ++-- .../maternityLeave/schoolAudit/index.html | 8 ++-- .../maternityLeave/unionAudit/index.html | 8 ++-- .../mutualInsurance/apply/index.html | 2 +- .../mutualInsurance/collect/index.html | 8 ++-- .../staffbenefit/recuperation/line/index.html | 2 +- .../staffmanage/childManage/manage/index.html | 8 ++-- .../member/apply/common/commonQuery.js | 4 +- .../member/apply/submit/index.html | 2 +- .../branch/verification/check/index.html | 4 +- .../member/change/common/commonQuery.js | 4 +- .../member/change/manage/index.html | 28 +++++++------- .../member/change/record/index.html | 30 +++++++-------- .../member/change/submit/index.html | 4 +- .../member/common/manage/memberManageQuery.js | 4 +- .../member/info/common/commonQuery.js | 4 +- .../member/info/history/index.html | 4 +- .../member/modelworker/manage/index.html | 4 +- .../school/verification/check/index.html | 6 +-- .../verification/check/schoolViewAndHandle.js | 2 +- .../verification/check/viewChangeTypeUser.js | 2 +- .../verification/manage/verificationQuery.js | 4 +- .../manage/verificationSetUserList.js | 4 +- .../manage/verificationShowSelectionUsers.js | 4 +- .../member/statistics/analysis/index.html | 4 +- .../member/statistics/summary/index.html | 4 +- .../zhgh/staffmanage/membercost/summary.html | 38 +++++++++---------- .../singleTeacher/ledger/index.html | 4 +- .../sourcechange/manage/index.html | 18 ++++----- .../specialstaff/manage/index.html | 26 ++++++------- .../staffmanage/thirtyTeach/manage/index.html | 4 +- .../thirtyTeach/summary/index.html | 4 +- .../zhgh/welfare/projectMange/filterUser.js | 4 +- .../welfare/selectionSituation/index.html | 4 +- .../zhgh/welfare/statistics/index.html | 2 +- .../zhgh/welfare/welfareUser/addUser.js | 4 +- .../zhgh/welfare/welfareUser/index.html | 4 +- .../staffbenefit/dsznfmtx/apply/index.html | 2 +- .../maternityLeave/apply/index.html | 2 +- .../member/apply/submit/index.html | 4 +- 118 files changed, 459 insertions(+), 407 deletions(-) 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"){