diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java index 7ee832e3..bfc57330 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java @@ -523,6 +523,22 @@ public class TeacherOpenCourseMergeCourseInfoController { return JsonResult.success(teacherOpenCourseMergeCourseInfoService.getTreeByTeacherOpenCourseId(teacherOpenCourseId)); } + + /** + *@author 姚丹 + *@data 2023/07/03 + * 跳转至课程配置页面 + */ + //跳转至课程配置页面 + @GetMapping(MODEL + "/courseConfigureNew.do") + @Function("teacherOpenCourseMergeCourseInfo.add") + public ModelAndView courseConfigureNew(Long teacherOpenCourseMergeCourseInfoId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeCourseInfo/courseConfigureNew.html"); + TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoService.queryById(teacherOpenCourseMergeCourseInfoId); + view.addObject("courseInfo", teacherOpenCourseMergeCourseInfo); + return view; + } + /** * 树结构查询开课课程信息 * 本地缓存,带到期时间 有BUG不建议用 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 ab931b84..21c708b9 100644 --- a/web/src/main/resources/static/js/jlw/courseInfo/index.js +++ b/web/src/main/resources/static/js/jlw/courseInfo/index.js @@ -64,7 +64,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { } }, { - field : 'operation_',width:300,title : '操作',align:"center", templet: function (d) { + field : 'operation_',width:300,title : '操作', templet: function (d) { var htm = '课程配置'; htm += ''+(d.courseInfoStatus == 1?"禁用":"启用")+''; htm += '编辑'; @@ -115,8 +115,15 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }, initTableTool: table.on('tool(courseInfoTable)', function (obj) { var data = obj.data; if (obj.event === 'edit') { - var url = "/jlw/courseInfo/add.do?courseInfoId="+data.courseInfoId; - Common.openDlg(url,""); + console.log(data) + if(data.sourceType == 1){ + var url = "/jlw/teacherOpenCourseMergeCourseInfo/courseConfigureNew.do?teacherOpenCourseMergeCourseInfoId="+data.courseInfoId; + Common.openDlg(url,""); + }else if(data.sourceType == 2){ + var url = "/jlw/courseInfo/add.do?courseInfoId="+data.courseInfoId; + Common.openDlg(url,""); + } + }else if(obj.event === "del"){ layer.confirm('是否确定删除该课程?', function (index) { //courseInfoStatus:状态(1启用 2禁用 3删除) var ret = Common.postAjax("/jlw/courseInfo/delete.json", {ids: data.courseInfoId}); diff --git a/web/src/main/resources/static/js/jlw/handsOn/index.js b/web/src/main/resources/static/js/jlw/handsOn/index.js index b2037c0c..0acd2464 100644 --- a/web/src/main/resources/static/js/jlw/handsOn/index.js +++ b/web/src/main/resources/static/js/jlw/handsOn/index.js @@ -277,9 +277,13 @@ layui.define(['form', 'laydate', 'table'], function (exports) { } else if (obj.event === "addTask") {//添加任务 // var url = "/jlw/handsOn/add.do?handsOnId=" + data.handsOnId+'&sign=1'; // Common.openDlg(url, "课程实训案例管理>新增课程实训案例>添加实训任务"); - var courseInfoId = data.dataType === 'FACULTY_ADD'?data.teacherOpenCourseId:data.systemCourseInfoId - var url = "/jlw/handsOnSimulationTasks/add.do?handsOnId=" + data.handsOnId + '&courseInfoId=' + courseInfoId; - + var courseInfoId = data.dataType === 'FACULTY_ADD'?data.teacherOpenCourseId:data.systemCourseInfoId; + var url; + if(isAdmin){ + url = "/jlw/handsOnSimulationTasks/add.do?handsOnId=" + data.handsOnId + '&courseInfoId=' + courseInfoId; + }else { + url = "/jlw/teacherOpenCourseHandsOnSimulationTasks/add.do?handsOnId="+ data.handsOnId + '&courseInfoId=' + courseInfoId; + } Common.openDlg(url); } else if (obj.event === "up") { upDrown("1", data.handsOnId); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js index 68433805..6146aa55 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js @@ -20,7 +20,7 @@ layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOp form.render(); window.loadList = function (){//重新加载实训任务列表 - getListInfo(); + /*getListInfo();*/ } var handsOnId = $("input[name='handsOnId']").val(); var teacherOpenCourseId = $("input[name='teacherOpenCourseId']").val(); @@ -93,8 +93,9 @@ layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOp $(this).parent().parent().remove() }); - function getListInfo(){ //获取 + /*function getListInfo(){ //获取 var ret = Common.postAjax("/api/teacherOpenCourseHandsOnSimulationTasks/getPageList.do",{handsOnId:$("#updateForm input[name='handsOnId']").val()}) + console.log(retf) if (ret.code == 0) { var getTpl = sc_demo.innerHTML ,view = document.getElementById('sc_view'); @@ -106,7 +107,7 @@ layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOp $(".sc").click(del_simu); }); } - } + }*/ exports('edit',view); }); \ No newline at end of file diff --git a/web/src/main/resources/templates/jlw/student/importPage.html b/web/src/main/resources/templates/jlw/student/importPage.html index fcc9a29b..766fbb4a 100644 --- a/web/src/main/resources/templates/jlw/student/importPage.html +++ b/web/src/main/resources/templates/jlw/student/importPage.html @@ -85,6 +85,10 @@ }); }*/ + + + var isAdmin = ('${user.get().isAdmin}' == 'true'? true:false ) ; + upload.render({ elem: '#importTemplate', url: Common.ctxPath + '${uploadFileUrl}', @@ -135,7 +139,12 @@ } $("#downloadTemplate").click(function () { - $.downFile(Common.ctxPath + "/jlw/student/downloadTemplate.json",'学生导入模板.xlsx'); + //var isAdmin = ('${user.get().isAdmin}' == 'true'? true:false ) ; + if(isAdmin){ + $.downFile(Common.ctxPath + "/jlw/student/downloadTemplate.json",'超管-学生导入模板.xlsx'); + }else { + $.downFile(Common.ctxPath + "/jlw/student/downloadTemplate.json",'院校管理员-学生导入模板.xlsx'); + } }); $("#addButton").click(function(){ diff --git a/web/src/main/resources/templates/jlw/teacher/importPage.html b/web/src/main/resources/templates/jlw/teacher/importPage.html index 0ecd7b8a..3b19b15f 100644 --- a/web/src/main/resources/templates/jlw/teacher/importPage.html +++ b/web/src/main/resources/templates/jlw/teacher/importPage.html @@ -86,6 +86,7 @@ $(".del").click(deleteInfo); }); }*/ + var isAdmin = ('${user.get().isAdmin}' == 'true'? true:false ) ; //导入 upload.render({ @@ -140,7 +141,11 @@ } $("#downloadTemplate").click(function () { - $.downFile(Common.ctxPath + "/jlw/teacher/downloadTemplate.json",'教师导入模板.xlsx'); + if(isAdmin){ + $.downFile(Common.ctxPath + "/jlw/teacher/downloadTemplate.json",'超管-教师导入模板.xlsx'); + }else { + $.downFile(Common.ctxPath + "/jlw/teacher/downloadTemplate.json",'院校管理员-教师导入模板.xlsx'); + } }); $("#addButton").click(function(){ diff --git a/web/src/main/resources/templates/jlw/teacher/studentLogin.html b/web/src/main/resources/templates/jlw/teacher/studentLogin.html index 23b6ac2c..2290810f 100644 --- a/web/src/main/resources/templates/jlw/teacher/studentLogin.html +++ b/web/src/main/resources/templates/jlw/teacher/studentLogin.html @@ -117,8 +117,8 @@ ,limit : 10, cols : [ [ // 表头 { - field: 'code', title: '学号', align: "center", - hide: "${isSignRole.get()!''}" != 1 ? false : true + field: 'code', title: '学号', align: "center",${isSignRole.get()!''}" + hide: " != 1 ? false : true }, { field: 'name', title: '姓名', align: "center", diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html index 1bf58006..9cde14c1 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html @@ -68,7 +68,7 @@ - + @@ -120,7 +120,7 @@
-
+
@@ -144,23 +144,23 @@ 操作 - - + + + + + ${item.taskOrder} + ${item.taskTitle} + ${item.taskTitle == '1'?'观看视频':item.taskType == '2'?'观看PPT': item.taskType == + '3'?'理论测评':item.taskType == '4'?'实训操作步骤':item.taskType == '5'?'报告撰写':'其他'} + + ${item.taskScore} + 编辑 删除 + + + +
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html index 533412b4..4d8ea583 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html @@ -1,7 +1,39 @@ + + + + + +
-
+ + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/courseConfigureNew.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/courseConfigureNew.html new file mode 100644 index 00000000..cb094788 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/courseConfigureNew.html @@ -0,0 +1,1002 @@ + + + + + + +
+ + + + + + + + + + + + + + \ No newline at end of file