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 2ceddf94..b919289e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java @@ -223,14 +223,16 @@ public class QuestionLogSummaryController extends BaseController { /** *@author 姚丹 *@data 2023/01/11 + * 章节、考试、作业的详情 */ @GetMapping(MODEL + "/indexInfo.do") @Function("questionLogSummary.query") - public ModelAndView indexInfo(Long teacherOpenCourseId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType) { + public ModelAndView indexInfo(Long teacherOpenCourseId,Long questionSettingId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType) { ModelAndView view = new ModelAndView("/jlw/questionLogSummary/indexInfo.html") ; view.addObject("search", QuestionLogSummaryQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("questionSettingType", questionSettingType); + view.addObject("questionSettingId", questionSettingId); return view; } @@ -602,7 +604,7 @@ public class QuestionLogSummaryController extends BaseController { * @return */ @SneakyThrows - @PostMapping(MODEL + "/homeworkFileAnalysisExport.json") + @GetMapping(MODEL + "/homeworkFileAnalysisExport.json") @ResponseBody public String homeworkFileAnalysisExport(Long teacherOpenCourseId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType, @SCoreUser CoreUser coreUser) { PageQuery pageQuery = new PageQuery<>(); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java index 57d0aa5e..7ab584db 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java @@ -317,7 +317,7 @@ public class TeacherOpenCourseQuestionLogController extends BaseController { * @return */ @SneakyThrows - @PostMapping(API + "/export.do") + @GetMapping(API + "/export.do") public void tuckExport(HttpServletResponse resp, TeacherOpenCourseQuestionLogQuery condition, @SCoreUser CoreUser coreUser) { Assert.notNull(getUser(), "请登录后再操作"); 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 a8d5225b..ac75ac9c 100644 --- a/web/src/main/resources/static/js/jlw/questionLogSummary/index.js +++ b/web/src/main/resources/static/js/jlw/questionLogSummary/index.js @@ -39,12 +39,12 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { }); var view ={ init:function(){ - var that = this + var that = this; this.initTable(); this.initSearchForm(); this.initToolBar(); window.dataReload = function(){ - Lib.doSearchForm($("#searchForm"),questionLogSummaryTable) + Lib.doSearchForm($("#searchForm"),questionLogSummaryTable); that.initToolBar(); } }, @@ -80,12 +80,15 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { hide: questionSettingType == "CHAPTER_EXERCISE" ? false : true, }, { - field: 'avgFinishTime', + field: 'startTime,endTime', title: '考试时间', align: "center", - hideField: false, - hide: $.isEmpty(sx_['avgFinishTime']) ? false : sx_['avgFinishTime'], + width: 320, hide: questionSettingType == "EXAM" ? false : true, + templet:function (d) { + var htm = d.startTime+" ~ "+ d.endTime; + return htm; + } }, { field : 'avgCorrectCount', @@ -178,7 +181,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { });*/ layer.confirm('是否确定导出章节练习表吗?', function (index) { var url = Common.ctxPath + "/jlw/questionLogSummary/exportAnalysis.json?teacherOpenCourseId=" + teacherOpenCourseId + '&questionSettingType=' + questionSettingType; - $.downFile(url); + $.downFile(url,'章节练习表'); layer.close(index); }); }, @@ -216,7 +219,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { }); }); }else if (obj.event === 'details') { - var url = "/jlw/questionLogSummary/indexInfo.do?teacherOpenCourseId=" + teacherOpenCourseId + "&questionSettingType=" + questionSettingType; + var url = "/jlw/questionLogSummary/indexInfo.do?teacherOpenCourseId=" + teacherOpenCourseId + "&questionSettingType=" + questionSettingType + "&questionSettingId=" + data.questionSettingId; Common.openDlg(url, "详情"); } }) diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js index da1e55a5..bcff3306 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js @@ -225,11 +225,11 @@ layui.define([ 'form', 'laydate', 'table','laytpl'], function(exports) { exportDocument: function () { layui.use([ 'teacherOpenCourseStudentSigninLogApi' ], function() { var teacherOpenCourseStudentSigninLogApi = layui.teacherOpenCourseStudentSigninLogApi - Common.openConfirm("确认要导出签到详情?", function() { + Common.openConfirm("确认要导出签到详情表?", function() { // teacherOpenCourseStudentSigninLogApi.exportExcel($("#searchForm"), function(fileId) { // // Lib.download(fileId); // }) - $.downFile(Common.ctxPath + "/api/teacherOpenCourseStudentSigninLog/export.do?teacherOpenCourseId="+teacherOpenCourseId); + $.downFile(Common.ctxPath + "/api/teacherOpenCourseStudentSigninLog/export.do?teacherOpenCourseId="+teacherOpenCourseId,"签到详情表"); }) }); }, diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js index 50c13b5e..21bf0af4 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js @@ -223,7 +223,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { Common.downLoad("/jlw/teacherOpenCourseMergeScheduleSession/excel/export.json", formPara, 'POST') */ layer.confirm('是否确定导出签到汇总表吗?', function (index) { - $.downFile(Common.ctxPath + "/jlw/teacherOpenCourseStudentSigninSetting/exportSummary.json"); + $.downFile(Common.ctxPath + "/jlw/teacherOpenCourseStudentSigninSetting/exportSummary.json",'签到汇总表'); layer.close(index); }); } diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html b/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html index 10667604..f53c2b46 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html @@ -44,7 +44,7 @@ var table = layui.table; var laytpl = layui.laytpl; var element = layui.element; - ///jlw/teacherOpenCourseQuestionSetting/analysis.json + var questionLogSummaryTable = null; var teacherOpenCourseId = $("input[name='teacherOpenCourseId']").val(); @@ -72,11 +72,17 @@ getCount(questionSettingType); function getCount(questionSettingType) { - var url = '/jlw/teacherOpenCourseQuestionSetting/analysis.json', + var url, param = { teacherOpenCourseId: teacherOpenCourseId, questionSettingType: questionSettingType }; + if(questionSettingType == "HOMEWORK_QUESTION"){ + url = '/jlw/teacherOpenCourseQuestionSetting/analysis.json'; + }else if(questionSettingType == "HOMEWORK_FILE"){ + url = '/jlw/questionLogSummary/homeworkFileAnalysis.json' + } + var ret = Common.postAjax(url, param); if (ret.code == 0) { var data = ret.data; @@ -199,9 +205,17 @@ Lib.closeFrame(); }, exportDocument: function () { - layer.confirm('是否确定导出'+(questionSettingType == "HOMEWORK_QUESTION" ? '题库作业表' : '附件作业表')+'吗?', function (index) { - var url = Common.ctxPath + "/jlw/questionLogSummary/exportAnalysis.json?teacherOpenCourseId=" + teacherOpenCourseId + '&questionSettingType=' + questionSettingType; - $.downFile(url); + var url,title; + if(questionSettingType == "HOMEWORK_QUESTION"){///jlw/questionLogSummary/homeworkFileAnalysisExport.json + title ="题库作业表"; + url = "/jlw/questionLogSummary/exportAnalysis.json?teacherOpenCourseId=" + teacherOpenCourseId + '&questionSettingType=' + questionSettingType; + }else{ + title = '附件作业表'; + url = url = '/jlw/questionLogSummary/homeworkFileAnalysisExport.json?teacherOpenCourseId=' + teacherOpenCourseId + "&questionSettingType=" + questionSettingType; + } + layer.confirm('是否确定导出'+title+'吗?', function (index) { + var url = Common.ctxPath + url; + $.downFile(url,title); layer.close(index); }); }, @@ -239,7 +253,7 @@ }); }); } else if (obj.event === 'details') { - var url = "/jlw/questionLogSummary/indexInfo.do?teacherOpenCourseId=" + teacherOpenCourseId + "&questionSettingType=" + questionSettingType; + var url = "/jlw/questionLogSummary/indexInfo.do?teacherOpenCourseId=" + teacherOpenCourseId + "&questionSettingType=" + questionSettingType + "&questionSettingId=" + data.questionSettingId; Common.openDlg(url, "详情"); } }) diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html b/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html index d4387b10..3bbfa6fe 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html @@ -26,8 +26,17 @@
-
- +
+ + + + + + + + + +
@@ -46,7 +55,17 @@
+ +