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 b54ee4a3..f69f0b51 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java @@ -213,12 +213,14 @@ public class QuestionLogSummaryController extends BaseController { */ @GetMapping(MODEL + "/indexInfo.do") @Function("questionLogSummary.query") - public ModelAndView indexInfo(Long teacherOpenCourseId,Long questionSettingId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType) { + public ModelAndView indexInfo(@SCoreUser CoreUser coreUser,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); + view.addObject("orgId", coreUser.getOrgId()); return view; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java index 952d69d0..8f5185ec 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java @@ -135,11 +135,12 @@ public class TeacherOpenCourseHandsOnController{ */ @GetMapping(MODEL + "/indexInfoV.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView indexInfoV(Long teacherOpenCourseId,Long handsOnId) { + public ModelAndView indexInfoV(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId,Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoV.html") ; view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("handsOnId", handsOnId); + view.addObject("orgId", coreUser.getOrgId()); return view; } @@ -150,11 +151,12 @@ public class TeacherOpenCourseHandsOnController{ */ @GetMapping(MODEL + "/indexInfoP.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView indexInfoP(Long teacherOpenCourseId, Long handsOnId) { + public ModelAndView indexInfoP(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoP.html"); view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("handsOnId", handsOnId); + view.addObject("orgId", coreUser.getOrgId()); return view; } @@ -165,11 +167,12 @@ public class TeacherOpenCourseHandsOnController{ */ @GetMapping(MODEL + "/indexInfoT.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView indexInfoT(Long teacherOpenCourseId, Long handsOnId) { + public ModelAndView indexInfoT(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoT.html"); view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("handsOnId", handsOnId); + view.addObject("orgId", coreUser.getOrgId()); return view; } @@ -181,11 +184,12 @@ public class TeacherOpenCourseHandsOnController{ */ @GetMapping(MODEL + "/indexInfoS.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView indexInfoS(Long teacherOpenCourseId, Long handsOnId) { + public ModelAndView indexInfoS(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoS.html"); view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("handsOnId", handsOnId); + view.addObject("orgId", coreUser.getOrgId()); return view; } @@ -196,11 +200,12 @@ public class TeacherOpenCourseHandsOnController{ */ @GetMapping(MODEL + "/indexInfoR.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView indexInfoR(Long teacherOpenCourseId, Long handsOnId) { + public ModelAndView indexInfoR(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoR.html"); view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("handsOnId", handsOnId); + view.addObject("orgId", coreUser.getOrgId()); return view; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java index 0eab945f..0563c512 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java @@ -192,11 +192,12 @@ public class TeacherOpenCourseStudentSigninLogController{ @GetMapping(MODEL + "/index.do") @Function("teacherOpenCourseStudentSigninLog.query") - public ModelAndView index(Long signinSettingId,Long tOCId) { + public ModelAndView index(Long signinSettingId,Long tOCId,@SCoreUser CoreUser coreUser) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseStudentSigninLog/index.html") ; view.addObject("search", TeacherOpenCourseStudentSigninLogQuery.class.getName()); view.addObject("teacherOpenCourseStudentSigninSettingId", signinSettingId); view.addObject("teacherOpenCourseId", tOCId); + view.addObject("orgId", coreUser.getOrgId()); return view; } diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js index c691f469..6c31b7c5 100644 --- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js @@ -64,6 +64,7 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT $(this).parents(".progressCss_file").remove(); }); } + var assessmentContent = $("#assessmentContent").val(); window.loadYl = function (){//富文本代码编辑器 产生变化时触发 yl(); @@ -569,8 +570,13 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT editor.setToolbarAutoFixed(false); } } - resourcesInfoShowTable.reload({data:[]}); - resourcesInfoShowPPTTable.reload({data:[]}); + if(obj.value == "2"||obj.value == "1"){ + if(!$.isEmpty(resourcesInfoShowTable) || !$.isEmpty(resourcesInfoShowPPTTable)){ + resourcesInfoShowTable.reload({data:[]}); + resourcesInfoShowPPTTable.reload({data:[]}); + } + } + // $("input[name='taskTitle']").val(""); // $("input[name='taskScore']").val(""); // $("input[name='taskOrder']").val(""); @@ -619,16 +625,29 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT if(tableData4.length > val.split("[---]").length - 1){ tableData4 = tableData4.slice(0,val.split("[---]").length - 1); }else if(tableData4.length < val.split("[---]").length - 1){ - tableData4.push({ - handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID - handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 - handsOnSimulationTasksAssessmentAnswer:"", //考核答案 - handsOnSimulationTasksAssessmentScore:"", //考核分值 - }) + if((val.split("[---]").length - 1)-tableData4.length > 1){ + var length = (val.split("[---]").length - 1) - tableData4.length; + for(var i=0;i < length;i++){ + tableData4.push({ + handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID + handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 + handsOnSimulationTasksAssessmentAnswer:"", //考核答案 + handsOnSimulationTasksAssessmentScore:"", //考核分值 + }) + } + }else{ + tableData4.push({ + handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID + handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 + handsOnSimulationTasksAssessmentAnswer:"", //考核答案 + handsOnSimulationTasksAssessmentScore:"", //考核分值 + }) + } } }else{ tableData4 = []; } + console.log(tableData4) var getTpl = tableData4_demo.innerHTML ,view = document.getElementById('tableData4_view'); laytpl(getTpl).render({list:tableData4}, function(html){ diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js index 8cff1506..619ee948 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js @@ -11,6 +11,9 @@ layui.define([ 'form', 'laydate', 'table','laytpl' ], function(exports) { var ret = Common.getAjax("/jlw/teacherOpenCourseHandsOn/getHandsOnListCount.do?teacherOpenCourseId="+teacherOpenCourseId); if(ret.code==0){ data = ret.data; + for(var i in data){ + data[i] = (parseInt(data[i] * 100) / 100).toFixed(2); // 输出结果为 15.77 + } }else { Common.info(ret.msg); } diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js index d55bb001..e3b8f1bd 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js @@ -593,12 +593,24 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas if(tableData4.length > val.split("[---]").length - 1){ tableData4 = tableData4.slice(0,val.split("[---]").length - 1); }else if(tableData4.length < val.split("[---]").length - 1){ - tableData4.push({ - handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID - handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 - handsOnSimulationTasksAssessmentAnswer:"", //考核答案 - handsOnSimulationTasksAssessmentScore:"", //考核分值 - }) + if((val.split("[---]").length - 1)-tableData4.length > 1){ + var length = (val.split("[---]").length - 1) - tableData4.length; + for(var i=0;i < length;i++){ + tableData4.push({ + handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID + handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 + handsOnSimulationTasksAssessmentAnswer:"", //考核答案 + handsOnSimulationTasksAssessmentScore:"", //考核分值 + }) + } + }else{ + tableData4.push({ + handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID + handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 + handsOnSimulationTasksAssessmentAnswer:"", //考核答案 + handsOnSimulationTasksAssessmentScore:"", //考核分值 + }) + } } }else{ tableData4 = []; @@ -618,7 +630,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas //PPT资源库button $("#pptClick").click(function (obj) { - updataResourcesOpenRe(2); + updataResourcesOpenRe(); }); /*资源库上传弹出框*/ diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html index d0678bb9..7829fc0a 100644 --- a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html +++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html @@ -369,7 +369,7 @@
- +
diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html b/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html index e3f0da16..0f8333ea 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html @@ -16,7 +16,7 @@

作业汇总:【 合计平均得分: - 合计及格率: + ;合计及格率:% 】

@@ -77,23 +77,26 @@ teacherOpenCourseId: teacherOpenCourseId, questionSettingType: questionSettingType }; - if(questionSettingType == "HOMEWORK_QUESTION"){//"作业-题目类型 + url = '/jlw/teacherOpenCourseQuestionSetting/analysis.json'; + /*if(questionSettingType == "HOMEWORK_QUESTION"){//"作业-题目类型 url = '/jlw/teacherOpenCourseQuestionSetting/analysis.json'; }else if(questionSettingType == "HOMEWORK_FILE"){//作业-附件类型 url = '/jlw/teacherOpenCourseQuestionSetting/analysis.json' - } + }*/ var ret = Common.postAjax(url, param); if (ret.code == 0) { var data = ret.data; if($.isEmpty(data)){ data = { - avgStudentScore:'0', - avgQuestionLogSummaryIsPass:'0' + avgStudentScore:'0.00', + avgQuestionLogSummaryIsPass:'0.00' } } - $("#avgStudentScore").html(data.avgStudentScore); - $("#avgQuestionLogSummaryIsPass").html(data.avgQuestionLogSummaryIsPass); + let avgStudentScore = data.avgStudentScore || 0.00; + let avgQuestionLogSummaryIsPass = data.avgQuestionLogSummaryIsPass || 0.00; + $("#avgStudentScore").html(avgStudentScore); + $("#avgQuestionLogSummaryIsPass").html(avgQuestionLogSummaryIsPass); } } diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/index.html b/web/src/main/resources/templates/jlw/questionLogSummary/index.html index 182e83f3..73d3a32e 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/index.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/index.html @@ -14,7 +14,7 @@ 合计练习题目数量: {{!$.isEmpty(d.questionTotalCount)?d.questionTotalCount:"0"}}; 合计平均答对数量:{{!$.isEmpty(d.avgCorrectCount)?d.avgCorrectCount:"0"}}; 合计平均答错数量:{{!$.isEmpty(d.avgWrongCount)?d.avgWrongCount:"0"}}; - 合计平均得分:{{!$.isEmpty(d.avgStudentScore)?d.avgStudentScore:"0"}} + 合计平均得分:{{!$.isEmpty(d.avgStudentScore)?d.avgStudentScore:"0.00"}} 】 @@ -24,8 +24,8 @@ 合计考试题目数量: {{!$.isEmpty(d.questionTotalCount)?d.questionTotalCount:"0"}}; 合计平均答对数量:{{!$.isEmpty(d.avgCorrectCount)?d.avgCorrectCount:"0"}}; 合计平均答错数量:{{!$.isEmpty(d.avgWrongCount)?d.avgWrongCount:"0"}}; - 合计平均准确率:{{!$.isEmpty(d.avgQuestionLogSummarySuccessRate)?d.avgQuestionLogSummarySuccessRate:"0"}}; - 合计平均得分:{{!$.isEmpty(d.avgStudentScore)?d.avgStudentScore:"0"}} + 合计平均准确率:{{!$.isEmpty(d.avgQuestionLogSummarySuccessRate)?d.avgQuestionLogSummarySuccessRate:"0.00"}}%; + 合计平均得分:{{!$.isEmpty(d.avgStudentScore)?d.avgStudentScore:"0.00"}} 】 diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html b/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html index ec5010df..5d0bbfa6 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html index 237bab4c..d1b0d367 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html @@ -10,11 +10,11 @@
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html index 866f88ec..26a1f446 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html index ea480388..9cafbc2d 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html index 1f94b672..9d115540 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html index 25f840a2..2f06fa42 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html index 5ee78ac9..7684f5c8 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html index b18149b3..049752bd 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html index 231e2250..a9395ca7 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html @@ -13,7 +13,7 @@ 合计签到次数: {{!$.isEmpty(d.totalSigninCount)?d.totalSigninCount:"0"}}次; 合计签到人数:{{!$.isEmpty(d.totalSigninNumber)?d.totalSigninNumber:"0"}}人; 合计缺勤:{{!$.isEmpty(d.totalUnSigninNumber)?d.totalUnSigninNumber:"0"}}人; - 合计到课率:{{!$.isEmpty(d.totalAttendanceRate)?d.totalAttendanceRate:"0"}}% + 合计到课率:{{!$.isEmpty(d.TotalAttendanceRate)?d.TotalAttendanceRate:"0"}}% 】