diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/edu/h5controller/H5EduController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/edu/h5controller/H5EduController.java index a3bb2f71..173ffe6c 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/edu/h5controller/H5EduController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/edu/h5controller/H5EduController.java @@ -25,12 +25,6 @@ import org.nutz.mvc.annotation.Param; import java.util.List; -/** - * @ClassName H5EduController - * @Description 移动端教育培训控制器 - * @Author AI Assistant - * @Date 2024/01/01 - */ @Slf4j @IocBean @At("/platform/h5/edu") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java index 5719ba29..7104e70c 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java @@ -59,7 +59,7 @@ public class ProposalDelegationController { public void index() { } - @At + @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/delegation/index.html") @SaCheckPermission("proposal.delegation") public void h5Index() { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java index a7822399..10a5a11a 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java @@ -46,7 +46,7 @@ public class ProposalFeedbackEvaluationController { public void index() { } - @At + @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html") @SaCheckPermission("proposal.feedbackEvaluation") public void h5Index() { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java index 9238b4d9..371afe46 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java @@ -67,7 +67,7 @@ public class ProposalMineController { public void index() { } - @At + @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/mine/index.html") @SaCheckPermission("proposal.mine") public void h5Index() { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java index f9c0ea2d..79e1fa11 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java @@ -50,7 +50,7 @@ public class ProposalSchoolLeaderApprovalController { } - @At + @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html") @SaCheckPermission("proposal.schoolLeaderApproval") public void h5Index() { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java index 9249294e..a096301b 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java @@ -62,7 +62,7 @@ public class ProposalSecondedController { public void index() { } - @At + @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/seconded/index.html") @SaCheckPermission("proposal.seconded") public void h5Index() { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java index 7d7ba9d8..026e7719 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java @@ -45,7 +45,7 @@ public class ProposalUnderTakeReplyController { public void index() { } - @At + @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/unitReply/index.html") @SaCheckPermission("proposal.unitReply") public void h5Index() { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java index a2d46382..eda72064 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java @@ -15,7 +15,6 @@ import com.budwk.app.sys.models.Sys_dict; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo; import com.budwk.app.zhgh.democratic.proposal.service.ProposalWriteService; -import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate; import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_session; import io.swagger.annotations.Api; @@ -30,7 +29,6 @@ import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; - import javax.validation.Valid; import java.util.List; @@ -59,7 +57,7 @@ public class ProposalWriteController { public void index() { } - @At + @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/write/index.html") @SaCheckPermission("proposal.write") public void h5Index(){ diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalDelegationController.java deleted file mode 100644 index c87751fd..00000000 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalDelegationController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.budwk.app.zhgh.democratic.proposal.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/proposal/delegation") -@Ok("json:full") -@Api("h5提案附议") -public class H5ProposalDelegationController { - - @At("") - @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/delegation/index.html") - @SaCheckPermission("h5.proposal.delegation") - public void index() { - } - -} diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalMineController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalMineController.java deleted file mode 100644 index 6e592f49..00000000 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalMineController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.budwk.app.zhgh.democratic.proposal.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/proposal/mine") -@Ok("json:full") -@Api("h5我的提案") -public class H5ProposalMineController { - - @At("") - @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/mine/index.html") - @SaCheckPermission("h5.proposal.mine") - public void index() { - } - -} diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalSecondedController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalSecondedController.java deleted file mode 100644 index 6062274e..00000000 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalSecondedController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.budwk.app.zhgh.democratic.proposal.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/proposal/seconded") -@Ok("json:full") -@Api("h5提案附议") -public class H5ProposalSecondedController { - - @At("") - @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/seconded/index.html") - @SaCheckPermission("h5.proposal.seconded") - public void index() { - } - -} diff --git a/src/main/resources/static/components/plugins/sysFilePreview/H5Index.vue b/src/main/resources/static/components/plugins/sysFilePreview/H5Index.vue new file mode 100644 index 00000000..da51d706 --- /dev/null +++ b/src/main/resources/static/components/plugins/sysFilePreview/H5Index.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/src/main/resources/views/layouts/platform_h5.html b/src/main/resources/views/layouts/platform_h5.html index ced9b528..a2cc34bf 100644 --- a/src/main/resources/views/layouts/platform_h5.html +++ b/src/main/resources/views/layouts/platform_h5.html @@ -39,6 +39,10 @@ + + + + @@ -145,17 +149,20 @@ }) } - function historyBack() { + function historyBack(func) { if (window.history.length > 1) { window.history.back() } else { window.location.href = "/platform/h5/home" } + func && func() } Vue.mixin({ methods: { - historyBack: historyBack + historyBack: function(func) { + historyBack(func); + } } }) @@ -353,6 +360,7 @@ //挂载 Vue.prototype.$moment = moment Vue.prototype.$businessTool = businessTool + Vue.prototype.$commonUtil = commonUtil Vue.prototype.$auth = commonUtil.authService() Vue.prototype.$axios = commonUtil.axiosService() Vue.prototype.$downLoad = commonUtil.downLoadService.bind(commonUtil) @@ -371,6 +379,7 @@ Vue.component("enum-tag", httpVueLoader("/components/plugins/sysEnum/EnumTag.vue?v=" + new Date().getTime())) Vue.component("table-list", httpVueLoader("/components/plugins/h5/TableList.vue?v=" + new Date().getTime())) Vue.component("table-column", httpVueLoader("/components/plugins/h5/TableColumn.vue?v=" + new Date().getTime())) + Vue.component("file-preview", httpVueLoader("/components/plugins/sysFilePreview/H5Index.vue?v=" + new Date().getTime())) diff --git a/src/main/resources/views/platform/sys/module/index.html b/src/main/resources/views/platform/sys/module/index.html index 6c34e64e..e6178af4 100644 --- a/src/main/resources/views/platform/sys/module/index.html +++ b/src/main/resources/views/platform/sys/module/index.html @@ -49,6 +49,7 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js index ba29b3dc..132b5f97 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js @@ -25,13 +25,13 @@ const PROPOSAL_INFO = { - -
{{viewData.excerpt}}
+ +
{{viewData.researchFindings}}
- +
- +
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/edu/course/detail.html b/src/main/resources/views/platform/zhghh5/dayofficework/edu/course/detail.html index 47cae2e7..c76768d7 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/edu/course/detail.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/edu/course/detail.html @@ -2,6 +2,157 @@ layout("/layouts/platform_h5.html"){ #--> + +
@@ -17,7 +168,7 @@ layout("/layouts/platform_h5.html"){ - +
@@ -35,7 +186,7 @@ layout("/layouts/platform_h5.html"){ @@ -43,227 +194,156 @@ layout("/layouts/platform_h5.html"){ - - - +

课程章节

+ +
+
- - - - - - - - - +
+

{{ chapter.title || '第' + (index + 1) + '章' }}

+
+ +
+
+
+ +
+ +
+
{{ video.title || '未命名视频' }}
+
{{ formatDuration(video.duration) }}
+
+ +
+ 已完成 +
+
+
+
+
+ + + - + - - + +
- +
@@ -11,13 +41,14 @@ layout("/layouts/platform_h5.html"){
-
- +
- + + >
- -