From 16f2dda95867df5da5469bed22530679e09de76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A3=E4=BA=9B=E8=8A=B1=E5=84=BF?= <1156921458@qq.com> Date: Fri, 12 Sep 2025 11:45:24 +0800 Subject: [PATCH] .. --- .../huimin/service/HuiminService.java | 7 --- ...TeacherCongressDelegateReadController.java | 7 +++ ...TeacherCongressDelegateReadController.java | 21 ------- .../controller/HuiminManageController.java | 6 +- .../controller/HuiminMineController.java | 48 ++++++++++++++ .../huimin/models/Huimin.java | 2 +- .../huimin/service/HuiminService.java | 7 +++ .../service/impl/HuiminServiceImpl.java | 6 +- .../static/assets/platform/css/h5.css | 6 ++ .../assets/platform/js/util/commonUtil.js | 31 +++++++--- .../huimin/manage/index.html | 0 .../zhgh/staffbenefit/huimin/mine/index.html | 0 .../teachercongress/delegate/read/index.html | 20 +++++- .../staffbenefit/huimin/mine/index.html | 62 +++++++++++++++++++ .../views/platform/zhghh5/sys/home/apps.js | 27 ++++---- 15 files changed, 191 insertions(+), 59 deletions(-) delete mode 100644 src/main/java/com/budwk/app/zhgh/dayofficework/huimin/service/HuiminService.java delete mode 100644 src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/h5controller/H5TeacherCongressDelegateReadController.java rename src/main/java/com/budwk/app/zhgh/{dayofficework => staffbenefit}/huimin/controller/HuiminManageController.java (89%) create mode 100644 src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java rename src/main/java/com/budwk/app/zhgh/{dayofficework => staffbenefit}/huimin/models/Huimin.java (94%) create mode 100644 src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/service/HuiminService.java rename src/main/java/com/budwk/app/zhgh/{dayofficework => staffbenefit}/huimin/service/impl/HuiminServiceImpl.java (62%) rename src/main/resources/views/platform/zhgh/{dayofficework => staffbenefit}/huimin/manage/index.html (100%) create mode 100644 src/main/resources/views/platform/zhgh/staffbenefit/huimin/mine/index.html create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/huimin/mine/index.html diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/huimin/service/HuiminService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/huimin/service/HuiminService.java deleted file mode 100644 index 5e60566a..00000000 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/huimin/service/HuiminService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.budwk.app.zhgh.dayofficework.huimin.service; - -import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.dayofficework.huimin.models.Huimin; - -public interface HuiminService extends BaseService { -} diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateReadController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateReadController.java index 033032da..ef5a8f77 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateReadController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateReadController.java @@ -36,6 +36,13 @@ public class TeacherCongressDelegateReadController { public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/democratic/teachercongress/delegate/read/index.html") + @SaCheckPermission("h5.tc.delegate.read") + public void h5Index() { + } + + @At @SaCheckPermission("tc.delegate.read") public Result pageData(@Valid @Param("pageForm") TeacherCongressDelegateManagePageParam pageForm) { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/h5controller/H5TeacherCongressDelegateReadController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/h5controller/H5TeacherCongressDelegateReadController.java deleted file mode 100644 index 87bbd933..00000000 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/h5controller/H5TeacherCongressDelegateReadController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.budwk.app.zhgh.democratic.teachercongress.delegate.h5controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -@IocBean -@At("/platform/h5/teacherCongress/delegate/read") -@Ok("json:full") -@Api(tags = "手机端代表阅览") -public class H5TeacherCongressDelegateReadController { - - @At("") - @Ok("beetl:/platform/zhghh5/democratic/teachercongress/delegate/read/index.html") - @SaCheckPermission("tc.delegate.read") - public void index() { - } - -} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/huimin/controller/HuiminManageController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminManageController.java similarity index 89% rename from src/main/java/com/budwk/app/zhgh/dayofficework/huimin/controller/HuiminManageController.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminManageController.java index b32df5a0..5fa4cae1 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/huimin/controller/HuiminManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminManageController.java @@ -1,11 +1,11 @@ -package com.budwk.app.zhgh.dayofficework.huimin.controller; +package com.budwk.app.zhgh.staffbenefit.huimin.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; -import com.budwk.app.zhgh.dayofficework.huimin.models.Huimin; -import com.budwk.app.zhgh.dayofficework.huimin.service.HuiminService; +import com.budwk.app.zhgh.staffbenefit.huimin.models.Huimin; +import com.budwk.app.zhgh.staffbenefit.huimin.service.HuiminService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java new file mode 100644 index 00000000..10adb3e3 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java @@ -0,0 +1,48 @@ +package com.budwk.app.zhgh.staffbenefit.huimin.controller; + +import cn.dev33.satoken.annotation.SaCheckLogin; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.staffbenefit.huimin.service.HuiminService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Cnd; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +@IocBean +@At("/platform/huimin/mine") +@Api(tags = "惠民服务-我的") +@Slf4j +@Ok("json:full") +public class HuiminMineController { + + @Inject + private HuiminService huiminService; + + @At("") + @SaCheckLogin + @Ok("beetl:/platform/zhgh/staffbenefit/huimin/mine/index.html") + public void index() { + } + + @At("/h5") + @SaCheckLogin + @Ok("beetl:/platform/zhghh5/staffbenefit/huimin/mine/index.html") + public void h5Index(){ + + } + + @At + @SaCheckLogin + public Result pageData(PageForm pageForm){ + Cnd cnd = Cnd.NEW(); + Pagination pagination = huiminService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd); + return Result.success(pagination); + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/huimin/models/Huimin.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/models/Huimin.java similarity index 94% rename from src/main/java/com/budwk/app/zhgh/dayofficework/huimin/models/Huimin.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/models/Huimin.java index a2c3d358..00a86cbc 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/huimin/models/Huimin.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/models/Huimin.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.dayofficework.huimin.models; +package com.budwk.app.zhgh.staffbenefit.huimin.models; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/service/HuiminService.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/service/HuiminService.java new file mode 100644 index 00000000..b082f40f --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/service/HuiminService.java @@ -0,0 +1,7 @@ +package com.budwk.app.zhgh.staffbenefit.huimin.service; + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.staffbenefit.huimin.models.Huimin; + +public interface HuiminService extends BaseService { +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/huimin/service/impl/HuiminServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/service/impl/HuiminServiceImpl.java similarity index 62% rename from src/main/java/com/budwk/app/zhgh/dayofficework/huimin/service/impl/HuiminServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/service/impl/HuiminServiceImpl.java index 56a48d4f..d8558aee 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/huimin/service/impl/HuiminServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/service/impl/HuiminServiceImpl.java @@ -1,8 +1,8 @@ -package com.budwk.app.zhgh.dayofficework.huimin.service.impl; +package com.budwk.app.zhgh.staffbenefit.huimin.service.impl; import com.budwk.app.base.service.impl.BaseServiceImpl; -import com.budwk.app.zhgh.dayofficework.huimin.models.Huimin; -import com.budwk.app.zhgh.dayofficework.huimin.service.HuiminService; +import com.budwk.app.zhgh.staffbenefit.huimin.models.Huimin; +import com.budwk.app.zhgh.staffbenefit.huimin.service.HuiminService; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.IocBean; diff --git a/src/main/resources/static/assets/platform/css/h5.css b/src/main/resources/static/assets/platform/css/h5.css index 0ee91750..0300e694 100644 --- a/src/main/resources/static/assets/platform/css/h5.css +++ b/src/main/resources/static/assets/platform/css/h5.css @@ -183,6 +183,12 @@ body { } +/*************************覆盖vant默认CSS********************************/ +.van-dropdown-menu__bar{ + box-shadow: unset; +} + + /*****************************申请表单CSS********************************/ .form-container { padding-bottom: 80px; diff --git a/src/main/resources/static/assets/platform/js/util/commonUtil.js b/src/main/resources/static/assets/platform/js/util/commonUtil.js index 26eba11b..70ccd0f8 100644 --- a/src/main/resources/static/assets/platform/js/util/commonUtil.js +++ b/src/main/resources/static/assets/platform/js/util/commonUtil.js @@ -43,12 +43,25 @@ const commonUtil = { //下载文件 downLoadService: function (url, data) { - const loading = ELEMENT.Loading.service({ - lock: true, - text: "导出中,请耐心等待", - spinner: "el-icon-loading", - background: "rgba(0, 0, 0, 0.7)" - }) + const userAgent = navigator.userAgent || navigator.vendor || window.opera + const isMobile = /iPad|iPhone|iPod|Android/.test(userAgent) + + let loading = null + + if(isMobile){ + loading = vant.Toast.loading({ + duration: 0, + forbidClick: true, + message: '导出中,请耐心等待' + }); + }else{ + loading = ELEMENT.Loading.service({ + lock: true, + text: "导出中,请耐心等待", + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.7)" + }) + } Vue.prototype.$axios .post(url, data, { responseType: "blob" }) @@ -89,7 +102,11 @@ const commonUtil = { loading.close() }) .finally(() => { - loading.close() + if(isMobile){ + loading.clear() + }else{ + loading.close() + } }) }, diff --git a/src/main/resources/views/platform/zhgh/dayofficework/huimin/manage/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/huimin/manage/index.html similarity index 100% rename from src/main/resources/views/platform/zhgh/dayofficework/huimin/manage/index.html rename to src/main/resources/views/platform/zhgh/staffbenefit/huimin/manage/index.html diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/huimin/mine/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/huimin/mine/index.html new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html b/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html index 064c911a..a3b5d9aa 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html @@ -2,7 +2,7 @@ layout("/layouts/platform_h5.html"){ #--> -
+
+
+ + 导出Excel + + + 导出Word + +
+ + ref="tableListRef" + style="padding-bottom: 65px">