diff --git a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java index aaf5a1c1..3ebaa8a8 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java @@ -133,6 +133,21 @@ public class CourseInfoController{ return view; } + /** + *@author 姚丹 + *@data 2022/11/23 + */ + //跳转至课程配置页面 + @GetMapping(MODEL + "/courseConfigureNew.do") + @Function("courseInfo.add") + @ResponseBody + public ModelAndView courseConfigureNew(Long courseInfoId) { + ModelAndView view = new ModelAndView("/jlw/courseInfo/courseConfigureNew.html"); + CourseInfo courseInfo = courseInfoService.queryById(courseInfoId); + view.addObject("courseInfo", courseInfo); + return view; + } + /* 后台接口 */ @PostMapping(MODEL + "/list.json") diff --git a/web/src/main/resources/static/js/jlw/courseInfo/index.js b/web/src/main/resources/static/js/jlw/courseInfo/index.js index 2750e727..4c629fba 100644 --- a/web/src/main/resources/static/js/jlw/courseInfo/index.js +++ b/web/src/main/resources/static/js/jlw/courseInfo/index.js @@ -57,9 +57,9 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }, { field : 'userId',width:300,title : '操作',align:"center", templet: function (d) { - var htm = '编辑'; - htm += '课程配置'; - htm += ''+(d.courseInfoStatus == 1?"停用":"启用")+''; + /*var htm = '编辑';*/ + var htm = '课程配置'; + htm += ''+(d.courseInfoStatus == 1?"禁用":"启用")+''; htm += '删除'; return htm; } @@ -119,10 +119,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }); }else if(obj.event === "courseConfigure"){ //跳转至课程配置 if(data.courseInfoStatus == 1){ - Common.info("课程配置时,请先停用课程。配置完成后再启用课程") + Common.info("课程配置时,请先禁用课程。配置完成后再启用课程") return; } - var url = "/jlw/courseInfo/courseConfigurePage.do?courseInfoId="+data.courseInfoId; + var url = "/jlw/courseInfo/courseConfigureNew.do?courseInfoId="+data.courseInfoId; Common.openDlg(url,""); }else if(obj.event === "editStatus"){ //启用 var param = { @@ -136,7 +136,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { //修改状态 function editCourseInfoStatus(param){ - layer.confirm('是否确定 '+(param.courseInfoStatus == 1?"启用":"停用")+' 该课程?', function (index) { + layer.confirm('是否确定 '+(param.courseInfoStatus == 1?"启用":"禁用")+' 该课程?', function (index) { layer.close(index); var ret = Common.postAjax("/jlw/courseInfo/edit.json",param); layer.msg(ret.code == 0?"操作成功!":ret.msg, { diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js index 8e407478..dde33b8e 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js @@ -147,7 +147,7 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func treeSpid: '0', //最上级的父级id treeIdName: 'teacherOpenCourseScheduleSessionClassId', //id字段的名称 treePidName: 'teacherOpenCourseScheduleSessionClassParentId', //父级节点字段 - treeDefaultClose: false, //是否默认折叠 + treeDefaultClose: true, //是否默认折叠 treeLinkage: true, //父级展开时是否自动展开所有子级 data: classRoomTableData /*,page : Lib.tablePage // 开启分页*/ @@ -317,6 +317,7 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func ' \n' + ' ' , btn: ['确定', '关闭'] + , shadeClose:true , yes: function (index, layero) { let param = { "teacherOpenCourseScheduleSessionClassName": $("#addRoom input[name='teacherOpenCourseScheduleSessionClassName']").val(), @@ -347,6 +348,7 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func '\n' + '' , btn: ['确定', '关闭'] + , shadeClose:true , success:function () { $("#editRoom input[name='teacherOpenCourseScheduleSessionClassName']").val(data.teacherOpenCourseScheduleSessionClassName) } diff --git a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html new file mode 100644 index 00000000..b9563b82 --- /dev/null +++ b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html @@ -0,0 +1,305 @@ + + + + +
+