diff --git a/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java b/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java index 8011185b..61cfc0bc 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java @@ -169,12 +169,40 @@ public class QuestionLogSummaryController extends BaseController { /* 后台页面 */ - + /** + *@author 姚丹 + *@data 2023/01/10 + */ @GetMapping(MODEL + "/index.do") @Function("questionLogSummary.query") - public ModelAndView index() { + public ModelAndView index(Long teacherOpenCourseId) { + ModelAndView view = new ModelAndView("/jlw/questionLogSummary/index.html") ; + view.addObject("search", QuestionLogSummaryQuery.class.getName()); + view.addObject("teacherOpenCourseId", teacherOpenCourseId); + return view; + } + /** + *@author 姚丹 + *@data 2023/01/10 + */ + @GetMapping(MODEL + "/homeworkIndex.do") + @Function("questionLogSummary.query") + public ModelAndView homeworkIndex(Long teacherOpenCourseId) { + ModelAndView view = new ModelAndView("/jlw/questionLogSummary/index.html") ; + view.addObject("search", QuestionLogSummaryQuery.class.getName()); + view.addObject("teacherOpenCourseId", teacherOpenCourseId); + return view; + } + /** + *@author 姚丹 + *@data 2023/01/10 + */ + @GetMapping(MODEL + "/examIndex.do") + @Function("questionLogSummary.query") + public ModelAndView examIndex(Long teacherOpenCourseId) { ModelAndView view = new ModelAndView("/jlw/questionLogSummary/index.html") ; view.addObject("search", QuestionLogSummaryQuery.class.getName()); + view.addObject("teacherOpenCourseId", teacherOpenCourseId); return view; } diff --git a/web/src/main/resources/static/js/jlw/questionLogSummary/index.js b/web/src/main/resources/static/js/jlw/questionLogSummary/index.js index f438b14c..e75bedd4 100644 --- a/web/src/main/resources/static/js/jlw/questionLogSummary/index.js +++ b/web/src/main/resources/static/js/jlw/questionLogSummary/index.js @@ -1,8 +1,25 @@ -layui.define([ 'form', 'laydate', 'table' ], function(exports) { +layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { var form = layui.form; var laydate = layui.laydate; var table = layui.table; + var laytpl= layui.laytpl; var questionLogSummaryTable = null; + + var data = []; + var teacherOpenCourseId = $("input[name='teacherOpenCourseId']").val(); + var ret = Common.postAjax("/jlw/teacherOpenCourseQuestionSetting/analysis.json", + {'teacherOpenCourseId':teacherOpenCourseId,'questionSettingType':'CHAPTER_EXERCISE'}); + if(ret.code==0){ + data = ret.data; + var getTpl = demo.innerHTML + ,view = document.getElementById('view'); + laytpl(getTpl).render(data, function(html){ + view.innerHTML = html; + }); + }else { + Common.info(ret.msg); + } + var view ={ init:function(){ var that = this @@ -22,10 +39,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { height : Lib.getTableHeight(1), cellMinWidth: 100, method : 'post', - url : Common.ctxPath + '/jlw/questionLogSummary/list.json' // 数据接口 + url : Common.ctxPath + '/jlw/questionLogSummary/analysisPageList.json' // 数据接口 + ,where:{'teacherOpenCourseId':teacherOpenCourseId,'questionSettingType':'CHAPTER_EXERCISE'} ,page : Lib.tablePage // 开启分页 - ,toolbar: '#toolbar_questionLogSummary' //自定义头部左侧工具栏 - ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 + /* ,toolbar: '#toolbar_questionLogSummary' //自定义头部左侧工具栏 + ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/ ,limit : 10, cols : [ [ // 表头 { diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js index a91ad59c..e9d37725 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js @@ -61,7 +61,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { { field : 'teacherOpenCourseId',title : '操作',align:"center",width:'40%', templet: function (d) { var htm = '签到'; - htm += '章节'; + htm += '章节'; htm += '课程实操'; htm += '作业'; htm += '考试'; @@ -144,6 +144,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }, initTableTool: table.on('tool(teacherOpenCourseMergeCourseInfoTable)', function (obj) { var data = obj.data; + var title= data.teacherOpenCourseTitle; if (obj.event === 'edit') { var url = "/jlw/teacherOpenCourseMergeCourseInfo/add.do?teacherOpenCourseMergeCourseInfoId="+data.teacherOpenCourseMergeCourseInfoId; Common.openDlg(url,"开课课程拉取管理>"+data.teacherOpenCourseMergeCourseInfoId+">编辑"); @@ -161,19 +162,28 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }); }); }else if(obj.event === "qd"){ - var title= data.teacherOpenCourseTitle; var url = "/jlw/teacherOpenCourseStudentSigninSetting/index.do?teacherOpenCourseId="+data.teacherOpenCourseId; Common.openDlg(url,"《"+title+"》/ 签到数据存档"); - }else if(obj.event === "zj"){ - + }else if(obj.event === "chapter"){ + console.log("hh") + var url = "/jlw/questionLogSummary/index.do?teacherOpenCourseId="+data.teacherOpenCourseId; + Common.openDlg(url,"《"+title+"》/ 章节练习存档"); }else if(obj.event === "kcsc"){ - + console.log("1") + var url = "/jlw/questionLogSummary/index.do?teacherOpenCourseId="+data.teacherOpenCourseId; + Common.openDlg(url,"《"+title+"》/ 课程实操存档"); }else if(obj.event === "zy"){ - + console.log("2") + var url = "/jlw/questionLogSummary/homeworkIndex.do?teacherOpenCourseId="+data.teacherOpenCourseId; + Common.openDlg(url,"《"+title+"》/ 作业存档"); }else if(obj.event === "ks"){ - + console.log("3") + var url = "/jlw/questionLogSummary/examIndex.do?teacherOpenCourseId="+data.teacherOpenCourseId; + Common.openDlg(url,"《"+title+"》/ 考试存档"); }else if(obj.event === "hd"){ - + console.log("4") + var url = "/jlw/teacherOpenCourseChatLog/index.do?teacherOpenCourseId="+data.teacherOpenCourseId; + Common.openDlg(url,"《"+title+"》/ 互动存档"); } }) } diff --git a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html index 3cf3b002..ab6417f1 100644 --- a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html +++ b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html @@ -423,32 +423,18 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find }else if (obj.event === 'move') {//拖动 //soulTable.suspend('myTable', 'drag', !data.elem.checked) }else if (obj.event === 'moveUp') {//上移 - var idLR = getLRid(data.resourcesInfoId); - if ($.isEmpty(idLR[0])) { - Common.info("已经到顶了，无法继续上移！"); - return - } layer.confirm('是否确定上移 "' + data.courseInfoName + '" 该信息？', function (index) { - var param = {}; - if ($.isEmpty(idLR[1])) { - param = { - id: data.resourcesInfoId, - leftId: idLR[0] - } - } else { - param = { - id: data.resourcesInfoId, - leftId: idLR[0], - rightId: idLR[1] - } - } - var ret = Common.postAjax("/jlw/resourcesInfo/drag.json", param); + var param = { + id: data.resourcesInfoId, + moveType: 'MOVE_LEFT' + }; + + var ret = Common.postAjax("/jlw/resourcesInfo/move.json", param); layer.msg(ret.code == 0 ? "移动成功！" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, time: 1500 //2秒关闭（如果不配置，默认是3秒） }, function () { - if (ret.code == 0) { courseInfoTable(); Lib.tableRefresh(); @@ -457,26 +443,13 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find }); }); }else if (obj.event === 'moveDown') {//下移 - var idLR = getLRid(data.resourcesInfoId); - if ($.isEmpty(idLR[1])) { - Common.info("已经到底了，无法继续下移！"); - return - } layer.confirm('是否确定下移 "' + data.courseInfoName + '" 该信息？', function (index) { - var param = {}; - if ($.isEmpty(idLR[0])) { - param = { - id: data.resourcesInfoId, - leftId: idLR[1] - } - } else { - param = { - id: data.resourcesInfoId, - leftId: idLR[0], - rightId: idLR[1] - } - } - var ret = Common.postAjax("/jlw/resourcesInfo/drag.json", param); + var param = { + id: data.resourcesInfoId, + moveType: 'MOVE_RIGHT' + }; + + var ret = Common.postAjax("/jlw/resourcesInfo/move.json", param); layer.msg(ret.code == 0 ? "移动成功！" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, @@ -815,8 +788,8 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find index = i; } }); - data.push(courseInfoAllData[index - 1].resourcesInfoId); data.push(courseInfoAllData[index + 1].resourcesInfoId); + data.push(courseInfoAllData[index + 2].resourcesInfoId); return data } diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/examIndex.html b/web/src/main/resources/templates/jlw/questionLogSummary/examIndex.html new file mode 100644 index 00000000..b92840fa --- /dev/null +++ b/web/src/main/resources/templates/jlw/questionLogSummary/examIndex.html @@ -0,0 +1,31 @@ + + + +
+ + + + diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html b/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html new file mode 100644 index 00000000..b92840fa --- /dev/null +++ b/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html @@ -0,0 +1,31 @@ + + + +
+ + + + diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/index.html b/web/src/main/resources/templates/jlw/questionLogSummary/index.html index b92840fa..37c93cce 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/index.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/index.html @@ -1,26 +1,45 @@ - - +
+
+
+ 导出 + 返回 +
+
+ + +
+ - +-->