From 03f0457bdbbb990ada9b7f5ace57c543334ce648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Fri, 21 Jul 2023 23:33:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=AD=98=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/courseInfo/courseConfigureNew.html | 2 +- .../jlw/questionLogSummary/homeworkIndex.html | 6 +-- .../jlw/questionLogSummary/index.html | 18 +++---- .../jlw/teacherOpenCourseChatLog/index.html | 6 +-- .../jlw/teacherOpenCourseHandsOn/index.html | 10 ++-- .../teacherOpenCourseHandsOn/indexInfoP.html | 11 +++- .../teacherOpenCourseHandsOn/indexInfoR.html | 17 ++++--- .../teacherOpenCourseHandsOn/indexInfoS.html | 51 ++++++++++++++----- .../teacherOpenCourseHandsOn/indexInfoT.html | 2 +- .../teacherOpenCourseHandsOn/indexInfoV.html | 16 +++--- .../index.html | 8 +-- 11 files changed, 93 insertions(+), 54 deletions(-) diff --git a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html index b9c52ef0..8bcdce63 100644 --- a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html +++ b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html @@ -357,7 +357,7 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find value = "链接"; css = "lianjie"; } else if (d.resourcesInfoType === 5) { - value = "图片"; + value = "图文"; css = "tupian"; } return '' + value + ''; diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html b/web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html index b4b0f625..e3f0da16 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 @@

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

@@ -88,8 +88,8 @@ var data = ret.data; if($.isEmpty(data)){ data = { - avgStudentScore:'', - avgQuestionLogSummaryIsPass:'' + avgStudentScore:'0', + avgQuestionLogSummaryIsPass:'0' } } $("#avgStudentScore").html(data.avgStudentScore); diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/index.html b/web/src/main/resources/templates/jlw/questionLogSummary/index.html index ac106a8f..182e83f3 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/index.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/index.html @@ -11,21 +11,21 @@ diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/index.html index 07d6b16f..dd22ed1c 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/index.html @@ -11,9 +11,9 @@ diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html index f500d536..237bab4c 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 d23f0fc7..866f88ec 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html @@ -133,9 +133,16 @@ align: "center", }, { - field: 'pptFiles.fileName', + field: 'pptFiles', title: 'PPT名称', - align: "center" + align: "center", + templet:function (d) { + var fileName = "-"; + if(d.pptFiles.length>0){ + fileName = d.pptFiles[0].fileName; + } + return fileName; + } }, { field: 'pptScore', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1 diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html index 5f45236d..ea480388 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html @@ -128,9 +128,13 @@ hideField: false, }, { - field: 'reportFileMap.fileName', //数据字典类型为 school_class.class_name.class_status=1 + field: 'reportFileMap', //数据字典类型为 school_class.class_name.class_status=1 title: '报告名称', align: "center", + templet:function (d) { + var fileName = d.reportFileMap.fileName||"-"; + return fileName; + } }, { field: 'reportFile', @@ -138,6 +142,7 @@ align: "center", templet:function (d) { var htm = '下载'; + return htm; } }, { @@ -181,11 +186,8 @@ field: 'studentName', title: '姓名', align: "center" }, { - field: 'sumStudentScore', + field: 'sumScore', title: '得分', align: "center", - templet:function (d) { - return '0' - } } ]] }); @@ -296,8 +298,9 @@ }); }); }else if(obj.event === 'download'){ - layer.confirm('是否确定删除该信息？', function (index) { - Lib.downloadFile2(data.reportFile,"报告表") + layer.confirm('是否确定下载该信息？', function (index) { + var reportFile = data.reportFileMap.fileUrl||"-"; + Lib.downloadFile2(reportFile); }); } }) diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html index b9f98890..365c9c8e 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html @@ -102,7 +102,6 @@ initTable:function(){ var sx_ = localStorage.getItem("studentHandsOnTaskVideoTable_field_" + Common.userInfoId); //筛选值显示、隐藏缓存 if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} - studentHandsOnTaskVideoTable = table.render({ elem: '#studentHandsOnTaskVideoTable', height : Lib.getTableHeight(1), @@ -128,26 +127,55 @@ hideField: false, }, { - field: 'stemstems.question', //数据字典类型为 school_class.class_name.class_status=1 + field: 'stem', //数据字典类型为 school_class.class_name.class_status=1 title: '考核内容', align: "center", + templet:function (d) { + var question = "-"; + var stem = JSON.parse(d.stem); + if(stem.length>0){ + question = stem[0].question; + } + return question + } }, { - field: 'stemstems.studentAnswer', + field: 'stem', title: '我的答案', - align: "center" + align: "center", + templet:function (d) { + var studentAnswer = "-"; + var stem = JSON.parse(d.stem); + if(stem.length>0){ + studentAnswer = stem[0].studentAnswer; + } + return studentAnswer + } + },{ - field: 'stemstems.rightAnswer', + field: 'stem', title: '正确答案', - align: "center" + align: "center", + templet:function (d) { + var rightAnswer = "-"; + var stem = JSON.parse(d.stem); + if(stem.length>0){ + rightAnswer = stem[0].rightAnswer; + } + return rightAnswer + } }, { - field: 'studentHandsOnTaskStepId', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1 + field: 'stem', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1 title: '状态', align: "center", templet: function (d) { - var htm = d.stemstems.studentAnswer == d.stemstems.rightAnswer ? "正确" : "错误"; - return htm; + var stem = JSON.parse(d.stem); + var status = "-"; + if(stem.length>0){ + status = stem[0].studentAnswer == stem[0].rightAnswer ? "正确" : "错误"; + } + return status; } }, { @@ -187,11 +215,8 @@ field: 'studentName', title: '姓名', align: "center" }, { - field: 'sumStudentScore', + field: 'sumScore', title: '得分', align: "center", - templet:function (d) { - return '0' - } } ]] }); diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html index 181faec0..25f840a2 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html @@ -166,7 +166,7 @@ title: '得分', align: "center", templet: function (d) { - var htm = d.myOptions == d.rightKey ? d.questionScore : "0"; + var htm = d.myOptions == d.rightKey ? d.theoryScore : "0"; return htm; } } diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html index f33490ea..5ee78ac9 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html @@ -130,14 +130,21 @@ hideField: false, }, { - field: 'questionScore', //数据字典类型为 school_class.class_name.class_status=1 + field: 'handsOnName', //数据字典类型为 school_class.class_name.class_status=1 title: '项目名称', align: "center", }, { - field: 'videoFile.fileName', + field: 'videoFiles', title: '视频名称', - align: "center" + align: "center", + templet:function (d) { + var fileName = "-"; + if(d.videoFiles.length>0){ + fileName = d.videoFiles[0].fileName; + } + return fileName; + } }, { field: 'videoScore', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1 @@ -178,9 +185,6 @@ }, { field: 'sumScore', title: '得分', align: "center", - templet:function (d) { - return d.sumScore||'-'; - } } ]] }); diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html index 86aa8cd7..231e2250 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html @@ -10,10 +10,10 @@