From 2bcf1b3eddb7b9e309a5c34ba2717dc36e4ad6b0 Mon Sep 17 00:00:00 2001 From: zhangrui Date: Mon, 18 May 2026 10:31:03 +0800 Subject: [PATCH] =?UTF-8?q?bug=E6=95=B4=E6=94=B9=EF=BC=9A=E4=BA=B2?= =?UTF-8?q?=E5=AD=90=E6=B4=BB=E5=8A=A8=E3=80=81=E6=B4=BB=E5=8A=A8=E7=94=B3?= =?UTF-8?q?=E6=8A=A5=E3=80=81=E7=BB=8F=E8=B4=B9=E9=A2=84=E7=AE=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E8=B4=B9=E7=94=A8=E6=8A=A5=E9=94=80=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E6=96=B0=E9=97=BB=E6=8A=95=E7=A8=BF=E3=80=81?= =?UTF-8?q?=E8=81=8C=E5=B7=A5=E5=BB=BA=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms/impl/jshvc/SmsJshvcServiceImpl.java | 10 +- .../impl/FamilyActivityServiceImpl.java | 4 +- .../zhgh/activity/family/manage/index.html | 4 + .../dayofficework/article/write/index.html | 1 + .../buildHome/kpi/plan/index.html | 112 ++++++++ .../buildHome/kpi/plan/kpiForm.js | 254 +++++++++++++----- .../outlayManage/school/useDetail/index.html | 2 +- .../zhgh/dayofficework/site/apply/apply.js | 1 + 8 files changed, 310 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java b/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java index ed17870..1827742 100644 --- a/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java +++ b/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java @@ -27,11 +27,11 @@ import java.util.Map; @IocBean public class SmsJshvcServiceImpl implements SmsService { - private static final String APPID = "1430576717768122368"; - private static final String APP_SECRET = "19A0ACB03FBQHL4R4XQD"; - private static final String TOKEN_URL = "https://gateway.jshvc.edu.cn/token/gateway/accessToken"; - private static final String MSG_URL = "https://gateway.jshvc.edu.cn/mp/restful/v2/message/send"; - private static final String REDIS_KEY_MSG_ACCESS_TOKEN = "msg:token:"; + private static final String APPID = ""; + private static final String APP_SECRET = ""; + private static final String TOKEN_URL = ""; + private static final String MSG_URL = ""; + private static final String REDIS_KEY_MSG_ACCESS_TOKEN = ""; @Inject private RedisService redisService; diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java index 50fbbae..73f8c21 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java @@ -273,8 +273,8 @@ public class FamilyActivityServiceImpl extends BaseServiceImpl i dao().insert(familyUser); if (StrUtil.isNotBlank(familyUser.getActivityCourseId())) { - TrainSignUpActivityCourse fetch = dao().fetch(TrainSignUpActivityCourse.class, familyUser.getActivityCourseId()); - TrainSignUpUserCourse userCourse = new TrainSignUpUserCourse(); + FamilyActivityCourse fetch = dao().fetch(FamilyActivityCourse.class, familyUser.getActivityCourseId()); + FamilyUserCourse userCourse = new FamilyUserCourse(); userCourse.setActivityId(familyUser.getActivityId()); userCourse.setCourseId(familyUser.getCourseId()); userCourse.setUserId(familyUser.getUserId()); diff --git a/src/main/resources/views/platform/zhgh/activity/family/manage/index.html b/src/main/resources/views/platform/zhgh/activity/family/manage/index.html index 88ba9d2..a165d07 100644 --- a/src/main/resources/views/platform/zhgh/activity/family/manage/index.html +++ b/src/main/resources/views/platform/zhgh/activity/family/manage/index.html @@ -15,6 +15,10 @@ layout("/layouts/platform.html"){ .el-row--flex { align-items: center; } + + .header-left { + display: none !important; + }
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html index 9ed3f4e..4e86e24 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html @@ -77,6 +77,7 @@ layout("/layouts/platform.html"){ dicts: ["ARTICLE_ORIGIN"], computed: { origins() { + console.log(this.dict,'this.dict') if (this.dict?.type?.ARTICLE_ORIGIN && this.permission && this.permission.roles) { return this.dict.type.ARTICLE_ORIGIN.filter((item) => this.permission && this.permission.roles.includes(item.code)) } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/buildHome/kpi/plan/index.html b/src/main/resources/views/platform/zhgh/dayofficework/buildHome/kpi/plan/index.html index 3b52121..033a0b4 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/buildHome/kpi/plan/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/buildHome/kpi/plan/index.html @@ -52,6 +52,118 @@ layout("/layouts/platform.html"){
+ +