From 8387c1e372806c4c9ccde09c41c0d741787678e0 Mon Sep 17 00:00:00 2001 From: zhengziru Date: Tue, 6 Aug 2024 17:45:35 +0800 Subject: [PATCH] commit --- .../basic/ActivityBasicScopeController.java | 2 +- .../change/MemberChangeManageController.java | 6 +++--- .../trainSignUp/models/TrainSignUpType.java | 2 +- src/main/resources/views/layouts/platform.html | 12 +++++------- .../views/mobile/healthCheckup/checkUp.html | 17 ++++++++++++++++- src/main/resources/views/mobile/home.html | 2 +- src/main/resources/views/mobile/login.html | 16 +++++++++------- .../trainSingUp/manage/trainSignUpType.html | 2 ++ 8 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java index d49e793..1ba9ad8 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java @@ -308,7 +308,7 @@ public class ActivityBasicScopeController { COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' - AND TABLE_SCHEMA = 'zhgh_jiangnan' + AND TABLE_SCHEMA = 'zhgh_hrbnu' """); List sqlDataList = activityBasicScopeService.listMap(sql); // sqlDataList.forEach(v -> v.put("DATA_TYPE", new String((byte[]) v.get("DATA_TYPE")))); diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java b/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java index 0d2b463..6641dd4 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java @@ -475,9 +475,9 @@ public class MemberChangeManageController { if (!ShiroUtil.hasAnyRoles("sysadmin,A06,flwyh01")) { cnd.and("u.unionid", "=", Vi.getUnionId()); } - for (String s : sqlCnd) { - cnd.and(new Static(s)); - } +// for (String s : sqlCnd) { +// cnd.and(new Static(s)); +// } cnd.groupBy("u.loginname"); cnd.asc("u.loginname"); sql.setCondition(cnd); diff --git a/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpType.java b/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpType.java index f00e0f0..5dc42d0 100644 --- a/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpType.java +++ b/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpType.java @@ -53,7 +53,7 @@ public class TrainSignUpType extends BaseModel implements Serializable { @Column @Comment("本人纳入总人数") @ColDefine(type = ColType.BOOLEAN) - @Default("1") + @Default(value = "1") private Boolean selfAddFamily; @Many(field = "typeId") diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html index 835b80e..306be40 100644 --- a/src/main/resources/views/layouts/platform.html +++ b/src/main/resources/views/layouts/platform.html @@ -211,14 +211,12 @@ {{selectEntranceModule ? selectEntranceModule.moduleName : '应用中心'}} + + + 切换应用 - - @@ -454,9 +452,9 @@ }, methods: { toggleMenuPopover() { - setTimeout(() => { + /*setTimeout(() => { this.menuPopover = !this.menuPopover - }, 300) + }, 300)*/ }, goSetAppCenter() { diff --git a/src/main/resources/views/mobile/healthCheckup/checkUp.html b/src/main/resources/views/mobile/healthCheckup/checkUp.html index 049134a..53803fc 100644 --- a/src/main/resources/views/mobile/healthCheckup/checkUp.html +++ b/src/main/resources/views/mobile/healthCheckup/checkUp.html @@ -111,6 +111,14 @@ layout("/mobile/platform.html"){ /*margin-top: 30px;*/ } + .right_content { + width: calc(100% - 150px); + padding-left: 20px; + padding-right: 10px; + position: relative; + height: 100px + } +
@@ -134,8 +142,15 @@ layout("/mobile/platform.html"){ diff --git a/src/main/resources/views/mobile/home.html b/src/main/resources/views/mobile/home.html index 8777978..66a4a67 100644 --- a/src/main/resources/views/mobile/home.html +++ b/src/main/resources/views/mobile/home.html @@ -36,7 +36,7 @@ layout("/mobile/platform.html"){ } .menu_item { - width: calc(100% / 4); + width: calc(100% / 3); display: flex; align-items: center; justify-content: center; diff --git a/src/main/resources/views/mobile/login.html b/src/main/resources/views/mobile/login.html index c9fedd9..9576c97 100644 --- a/src/main/resources/views/mobile/login.html +++ b/src/main/resources/views/mobile/login.html @@ -26,11 +26,11 @@ layout("/mobile/platform.html"){ .content { min-height: 380px; width: 80%; - position: absolute; left: 0; right: 0; - bottom: 100px; - margin: auto; + margin: 50px auto auto auto; + position: relative; + z-index: 2; } .header_v { @@ -74,12 +74,14 @@ layout("/mobile/platform.html"){ } .logo { - height: 320px; - margin-bottom: 20px; + height: 300px; + position: relative; /* 如果之前使用了绝对定位，改为相对定位 */ + z-index: 1; /* 确保logo在content下方 */ } .logo img { - width: 300px; + width: 100%; + height: 100%; } .verify-img-panel { @@ -105,7 +107,7 @@ layout("/mobile/platform.html"){

Welcome

 - 欢迎登录智慧工会手机平台 + 欢迎登录智慧工会移动服务平台
diff --git a/src/main/resources/views/platform/trainSingUp/manage/trainSignUpType.html b/src/main/resources/views/platform/trainSingUp/manage/trainSignUpType.html index 12f1867..af2af7b 100644 --- a/src/main/resources/views/platform/trainSingUp/manage/trainSignUpType.html +++ b/src/main/resources/views/platform/trainSingUp/manage/trainSignUpType.html @@ -208,6 +208,7 @@ layout("/layouts/platform.html"){ trainMobileSignColumnList: [{isRequired: false}], isBringFamily: false, isAddFamily: null, + selfAddFamily: true, }, rules: { lxname: [{required: true, message: '请输入类型名称', trigger: ['change', 'blur']}], @@ -298,6 +299,7 @@ layout("/layouts/platform.html"){ this.formData = { trainMobileSignColumnList: [{isRequired: false}], isBringFamily: false, + selfAddFamily: true, } this.$refs.guava.edit() if (this.$refs["addForm"])