From e44405d250f57a9d21566fd0205d97500b847722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Fri, 13 Jan 2023 23:54:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AD=98=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...TeacherOpenCourseQuestionLogController.java | 6 +++--- .../jlw/questionLogSummary/homeworkIndex.html | 11 ++++++++--- .../jlw/questionLogSummary/indexInfo.html | 18 +++++++++++++----- 3 files changed, 24 insertions(+), 11 deletions(-) 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 7ab584db..3b9ead08 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java @@ -541,14 +541,14 @@ public class TeacherOpenCourseQuestionLogController extends BaseController { /** * 附件作业日志导出 - * @param dto 附件的题目配置IDs （非必传） + * @param teacherOpenCourseQuestionSettingId 附件的题目配置IDs （非必传） * @return */ @SneakyThrows @PostMapping(MODEL + "/homeworkFileLogPageList.json") @ResponseBody - public JsonResult homeworkFileLogPageList(TeacherOpenCourseHomeWorkLogPageDTO dto, @SCoreUser CoreUser coreUser) { - return JsonResult.success(teacherOpenCourseQuestionLogService.getHomeWorkLogExportPageList(dto.getPageQuery())); + public JsonResult homeworkFileLogPageList(TeacherOpenCourseHomeWorkLogPageDTO teacherOpenCourseQuestionSettingId, @SCoreUser CoreUser coreUser) { + return JsonResult.success(teacherOpenCourseQuestionLogService.getHomeWorkLogExportPageList(teacherOpenCourseQuestionSettingId.getPageQuery())); } diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html b/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html index f53c2b46..7bae90e4 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html @@ -109,6 +109,12 @@ } }, initTable: function () { + var url; + if(questionSettingType == 'HOMEWORK_FILE'){ + url="/jlw/questionLogSummary/homeworkFileAnalysis.json" + }else if(questionSettingType == 'HOMEWORK_QUESTION'){ + url='/jlw/questionLogSummary/analysisPageList.json' + } questionLogSummaryTable = table.render({ elem: '#questionLogSummaryTable', height: Lib.getTableHeight(1), @@ -206,7 +212,7 @@ }, exportDocument: function () { var url,title; - if(questionSettingType == "HOMEWORK_QUESTION"){///jlw/questionLogSummary/homeworkFileAnalysisExport.json + if(questionSettingType == "HOMEWORK_QUESTION"){ title ="题库作业表"; url = "/jlw/questionLogSummary/exportAnalysis.json?teacherOpenCourseId=" + teacherOpenCourseId + '&questionSettingType=' + questionSettingType; }else{ @@ -214,8 +220,7 @@ url = url = '/jlw/questionLogSummary/homeworkFileAnalysisExport.json?teacherOpenCourseId=' + teacherOpenCourseId + "&questionSettingType=" + questionSettingType; } layer.confirm('是否确定导出'+title+'吗？', function (index) { - var url = Common.ctxPath + url; - $.downFile(url,title); + $.downFile(Common.ctxPath+url,title); layer.close(index); }); }, diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html b/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html index 3bbfa6fe..2887a385 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html @@ -31,7 +31,7 @@ - + @@ -158,12 +158,16 @@ layui.use(['form','laydate','table','laytpl'], function(){ initTable:function(){ var sx_ = localStorage.getItem("teacherOpenCourseQuestionLogTable_field_" + Common.userInfoId); //筛选值显示、隐藏缓存 if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} + var url = '/api/teacherOpenCourseQuestionLog/list.do'; + if(questionSettingType == 'HOMEWORK_FILE'){ + url = '/jlw/teacherOpenCourseQuestionLog/homeworkFileLogPageList.json'; + } teacherOpenCourseQuestionLogTable = table.render({ elem: '#teacherOpenCourseQuestionLogTable', height : Lib.getTableHeight(1), cellMinWidth: 100, method : 'post', - url: Common.ctxPath + '/api/teacherOpenCourseQuestionLog/list.do' // 数据接口 + url: Common.ctxPath + url // 数据接口 ,page : Lib.tablePage // 开启分页 /* ,toolbar: '#toolbar_teacherOpenCourseQuestionLog' //自定义头部左侧工具栏 ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/ @@ -297,6 +301,10 @@ layui.use(['form','laydate','table','laytpl'], function(){ 'studentId':obj.data.studentId, 'teacherOpenCourseQuestionSettingId':$.isEmpty(settingId)?questionSettingId:settingId, }; + if(questionSettingType == 'HOMEWORK_FILE'){ + url = 'jlw/teacherOpenCourseQuestionLog/homeworkFileLogPageList.json'; + param = {"questionSettingIdPlural":questionSettingId}; + } teacherOpenCourseQuestionLogTable.reload({ where: param, @@ -376,24 +384,24 @@ layui.use(['form','laydate','table','laytpl'], function(){ exportDocument: function () { var url,title; var settingId = $("select[name='teacherOpenCourseQuestionSettingId']").val(); - settingId = $.isEmpty(settingId)?questionSettingId:settingId + settingId = $.isEmpty(settingId)?questionSettingId:settingId; if(questionSettingType == "CHAPTER_EXERCISE"){///jlw/questionLogSummary/homeworkFileAnalysisExport.json title = '章节详情表'; url = "/api/teacherOpenCourseQuestionLog/zyDetailExport.do?teacherOpenCourseQuestionSettingId=" + settingId; - //+ teacherOpenCourseId + '&questionSettingType=' + questionSettingType; }else if(questionSettingType == "EXAM"){ title = '考试详情表'; url = "/api/teacherOpenCourseQuestionLog/zyDetailExport.do?teacherOpenCourseQuestionSettingId=" + settingId; }else if(questionSettingType == "HOMEWORK_FILE"){ title = '附件作业详情表'; + url = '/jlw/questionLogSummary/homeworkFileAnalysisExport.json?teacherOpenCourseId'+ teacherOpenCourseId + '&questionSettingType=' + questionSettingType; }else if(questionSettingType == "HOMEWORK_QUESTION"){ title ="题库作业详情表"; url = "/api/teacherOpenCourseQuestionLog/zyDetailExport.do?teacherOpenCourseQuestionSettingId=" + settingId; } Common.openConfirm("确认要导出"+title+"?", function (index) { - $.downFile(Common.ctxPath + url,title); + $.downFile(Common.ctxPath + url); layer.close(index); }) },