diff --git a/admin-core/src/main/resources/static/plugins/layui/layui.js b/admin-core/src/main/resources/static/plugins/layui/layui.js index d78769d9..e24089e7 100644 --- a/admin-core/src/main/resources/static/plugins/layui/layui.js +++ b/admin-core/src/main/resources/static/plugins/layui/layui.js @@ -7603,7 +7603,7 @@ layui.define(["layer", "form"], function (t) { o = "layui-show", r = "layui-disabled", c = function () { var t = this; t.index = 0, t.config = { - tool: ["strong", "italic", "underline", "del", "|", "left", "center", "right", "|", "link", "unlink", "face", "image"], + tool: ["strong", "italic", "underline", "del", "|", "left", "center", "right", "|", "link", "unlink", "face", "image","table"], hideTool: [], height: 280 } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java index 72682485..797d417f 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java @@ -87,6 +87,46 @@ public class ResourcesApplication extends BaseEntity{ private String thumbnailUrl; + //适用专业 + private String applyMajor; + //适用课程 + private String applyCourse; + //可开展实验项目 + private String carryOutProject; + private String carryOutProjectOriginal; + + public String getCarryOutProjectOriginal() { + return carryOutProjectOriginal; + } + + public void setCarryOutProjectOriginal(String carryOutProjectOriginal) { + this.carryOutProjectOriginal = carryOutProjectOriginal; + } + + public String getApplyMajor() { + return applyMajor; + } + + public void setApplyMajor(String applyMajor) { + this.applyMajor = applyMajor; + } + + public String getApplyCourse() { + return applyCourse; + } + + public void setApplyCourse(String applyCourse) { + this.applyCourse = applyCourse; + } + + public String getCarryOutProject() { + return carryOutProject; + } + + public void setCarryOutProject(String carryOutProject) { + this.carryOutProject = carryOutProject; + } + /** * 新增时间 */ diff --git a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java index 746e41bd..1e80bff6 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java @@ -697,7 +697,7 @@ public class IndexController { // //断token的尾巴 // if(StringUtils.isNotBlank(token)){ // if(token.split("\\.").length > 3){ -// String loginTime = token.split("\\.")[3]; +// ! String loginTime = token.split("\\.")[3]; // token = token.replace("."+loginTime,""); // } // } @@ -873,10 +873,11 @@ public class IndexController { }); // isBG 是否大后台 - return JsonResult.success(MapUtil.builder().put("isBG", false) + JsonResult> success = JsonResult.success(MapUtil.builder().put("isBG", false) .put("loginTime", loginTime) .put("token_key", createTokenKey(user)) .build()); + return success; } } break; @@ -1002,7 +1003,8 @@ public class IndexController { createSessionByUserId(); if(ApplicationRunnerController.isOnline){ String tsUrl = SpringUtil.getBean(Environment.class).getProperty("student.teacher.url"); - response.sendRedirect(tsUrl + (tsUrl.endsWith("/") ? "" : "/") + "Home" + roleTagCopy); +// response.sendRedirect(tsUrl + (tsUrl.endsWith("/") ? "" : "/") + "Home" + roleTagCopy); + response.sendRedirect(tsUrl + (tsUrl.endsWith("/") ? "" : "/") + "MyApps" + roleTagCopy); }else { response.sendRedirect("http://localhost:8080/home" + roleTagCopy); } @@ -1011,7 +1013,9 @@ public class IndexController { else{ request.getRequestDispatcher("/pc/index.do" + roleTagCopy).forward(request, response); } - }catch (Exception e) { } + }catch (Exception e) { + e.printStackTrace(); + } } //跳转到电脑端首页 diff --git a/web/src/main/java/com/ibeetl/jlw/web/api/IndexBaseController.java b/web/src/main/java/com/ibeetl/jlw/web/api/IndexBaseController.java index dfea3871..d1c9a502 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/api/IndexBaseController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/api/IndexBaseController.java @@ -11,6 +11,7 @@ import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreUserService; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.query.PageParam; +import com.ibeetl.jlw.entity.ResourcesApplication; import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.Teacher; import com.ibeetl.jlw.entity.UniversitiesColleges; @@ -83,7 +84,8 @@ public class IndexBaseController { if (teacher != null) { resourcesApplicationQuery.setTeacherId(teacher.getTeacherId()); } - return JsonResult.success(resourcesApplicationService.queryMyApplicationByConditionQuery(pageQuery)); + PageQuery resourcesApplicationPageQuery = resourcesApplicationService.queryMyApplicationByConditionQuery(pageQuery); + return JsonResult.success(resourcesApplicationPageQuery); } /** diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationQuery.java index 174c28f6..79c55130 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationQuery.java @@ -60,6 +60,17 @@ public class ResourcesApplicationQuery extends PageParam { @ApiModelProperty("应用详细介绍(原始数据)") private String applicationInfoOriginal; + @Query(name = "适用专业",display = false) + private String applyMajor; + @Query(name = "适用课程",display = false) + private String applyCourse; + @Query(name = "可开展实验项目",display = false) + private String carryOutProject; + @Query(name = "可开展实验项目原始数据",display = false) + private String carryOutProjectOriginal; + + + private String courseInfoIds; /** @@ -92,6 +103,54 @@ public class ResourcesApplicationQuery extends PageParam { @ApiModelProperty("是否显示key") private boolean showKey; + public String getCarryOutProjectOriginal() { + return carryOutProjectOriginal; + } + + public void setCarryOutProjectOriginal(String carryOutProjectOriginal) { + this.carryOutProjectOriginal = carryOutProjectOriginal; + } + + public Boolean getTeacher() { + return isTeacher; + } + + public void setTeacher(Boolean teacher) { + isTeacher = teacher; + } + + public boolean isShowKey() { + return showKey; + } + + public void setShowKey(boolean showKey) { + this.showKey = showKey; + } + + public String getApplyMajor() { + return applyMajor; + } + + public void setApplyMajor(String applyMajor) { + this.applyMajor = applyMajor; + } + + public String getApplyCourse() { + return applyCourse; + } + + public void setApplyCourse(String applyCourse) { + this.applyCourse = applyCourse; + } + + public String getCarryOutProject() { + return carryOutProject; + } + + public void setCarryOutProject(String carryOutProject) { + this.carryOutProject = carryOutProject; + } + public Long getResourcesApplicationId(){ return resourcesApplicationId; } @@ -216,6 +275,10 @@ public class ResourcesApplicationQuery extends PageParam { pojo.setApplicationIntroductionOriginal(this.getApplicationIntroductionOriginal()); pojo.setApplicationInfoOriginal(this.getApplicationInfoOriginal()); pojo.setLinkSecretKey(this.getLinkSecretKey()); + pojo.setApplyMajor(this.getApplyMajor()); + pojo.setApplyCourse(this.getApplyCourse()); + pojo.setCarryOutProject(this.getCarryOutProject()); + pojo.setCarryOutProjectOriginal(this.getCarryOutProjectOriginal()); return pojo; } diff --git a/web/src/main/resources/static/js/jlw/resourcesApplication/add.js b/web/src/main/resources/static/js/jlw/resourcesApplication/add.js index dc56c79f..fc797385 100644 --- a/web/src/main/resources/static/js/jlw/resourcesApplication/add.js +++ b/web/src/main/resources/static/js/jlw/resourcesApplication/add.js @@ -3,7 +3,7 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati var upload = layui.upload; var layedit = layui.layedit; var resourcesApplicationApi = layui.resourcesApplicationApi; - + var editor = Lib.editorMd("test-editor"); layedit.set({ //富文本上传图片 uploadImage: { url: Common.ctxPath + "/jlw/file/update.do", @@ -12,6 +12,7 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati }); var one = layedit.build('applicationIntroduction'); //建立编辑器 var two = layedit.build('applicationInfo'); //建立编辑器 + var three = layedit.build('carryOutProject'); //建立编辑器 var resourcesApplicationId = $("input[name='resourcesApplicationId']").val(); if(!$.isEmpty(resourcesApplicationId)){ @@ -19,6 +20,7 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati if(ret.code == 0){ layedit.setContent(one,Lib.repLaceltgt(ret.data.applicationIntroduction),false); layedit.setContent(two,Lib.repLaceltgt(ret.data.applicationInfo),false); + layedit.setContent(three,Lib.repLaceltgt(ret.data.carryOutProject),false); }else { layer.msg(ret.msg, { offset: ['50%'], @@ -123,6 +125,7 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati var view = { init:function(){ + // debugger Lib.initGenrealForm($("#addForm"),form); this.initSubmit(); }, @@ -140,8 +143,13 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati applicationExperimentalCourse:$("input[name='applicationExperimentalCourse']").val(), applicationUserManual:$("input[name='applicationUserManual']").val(), applicationInstallationPackage:$("input[name='applicationInstallationPackage']").val(), + applyMajor:$("input[name='applyMajor']").val(), + applyCourse:$("input[name='applyCourse']").val(), + carryOutProject: editor.getPreviewedHTML(),//可开展实验项目源码 + carryOutProjectOriginal:Lib.repLaceString(editor.getMarkdown()),//可开展实验项目 html applicationIntroduction:layedit.getContent(one),//应用简介 html applicationInfo:layedit.getContent(two),//详细介绍 html + applicationInfo:layedit.getContent(two),//详细介绍 html },url = "/jlw/resourcesApplication/add.json"; if($.isEmpty(param.applicationName)){ layer.msg("请输入应用名称!", { diff --git a/web/src/main/resources/static/js/jlw/resourcesCompetition/index.js b/web/src/main/resources/static/js/jlw/resourcesCompetition/index.js index 232d7753..7d92f902 100644 --- a/web/src/main/resources/static/js/jlw/resourcesCompetition/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesCompetition/index.js @@ -132,7 +132,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) { //上下架 function upDrown(status,ids){ - layer.confirm('是否下架该编程竞赛案例?', function (index) { + layer.confirm('是否下架该编程竞赛案例?' , function (index) { var ret = Common.postAjax("/jlw/resourcesCompetition/edit.json", {resourcesCompetitionId: ids,resourcesCompetitionStatus:status}); layer.msg(ret.code == 0 ? "操作成功!" : ret.msg, { offset: ['50%'], diff --git a/web/src/main/resources/templates/jlw/resourcesApplication/add.html b/web/src/main/resources/templates/jlw/resourcesApplication/add.html index bf09c48e..4ae25384 100644 --- a/web/src/main/resources/templates/jlw/resourcesApplication/add.html +++ b/web/src/main/resources/templates/jlw/resourcesApplication/add.html @@ -1,7 +1,10 @@ - + + + +
@@ -163,6 +166,38 @@ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+ ${resourcesApplication.carryOutProjectOriginal} + + +
+
+
+