From 496f59956daed8044647ec9dd359a86a6859a6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Sat, 14 Jan 2023 01:34:11 +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 --- .../TeacherOpenCourseHandsOnController.java | 3 +- .../js/jlw/teacherOpenCourseHandsOn/index.js | 153 ++++++++++-------- .../teacherOpenCourseMergeCourseInfo/index.js | 3 +- .../jlw/teacherOpenCourseHandsOn/index.html | 38 ++++- 4 files changed, 123 insertions(+), 74 deletions(-) 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 64c4e879..27b38238 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java @@ -99,9 +99,10 @@ public class TeacherOpenCourseHandsOnController{ @GetMapping(MODEL + "/index.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView index() { + public ModelAndView index(Long teacherOpenCourseId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/index.html") ; view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); + view.addObject("teacherOpenCourseId", teacherOpenCourseId); return view; } 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 e2e91af3..23f67328 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js @@ -1,16 +1,42 @@ -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 teacherOpenCourseHandsOnTable = null; + var teacherOpenCourseId = $("input[name='teacherOpenCourseId']").val(); + var data={}; + + var ret = Common.getAjax("/jlw/teacherOpenCourseHandsOn/getHandsOnListCount.do?teacherOpenCourseId"+teacherOpenCourseId); + if(ret.code==0){ + data = ret.data; + }else { + Common.info(ret.msg); + } + if ($.isEmpty(data)) { + data = { + videoAvgScore: '', + pptAvgScore: '', + theoryAvgScore: '', + stepAvgScore: '', + reportAvgScore: '' + }; + } + var getTpl = demo.innerHTML + ,view = document.getElementById('view'); + laytpl(getTpl).render(data, function(html){ + view.innerHTML = html; + }); + var view ={ init:function(){ - var that = this + var that = this; this.initTable(); this.initSearchForm(); this.initToolBar(); window.dataReload = function(){ - Lib.doSearchForm($("#searchForm"),teacherOpenCourseHandsOnTable) + Lib.doSearchForm($("#searchForm"),teacherOpenCourseHandsOnTable); that.initToolBar(); } }, @@ -21,94 +47,76 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { elem : '#teacherOpenCourseHandsOnTable', height : Lib.getTableHeight(1), cellMinWidth: 100, - method : 'post', - url : Common.ctxPath + '/jlw/teacherOpenCourseHandsOn/list.json' // 数据接口 + method : 'get', + url : Common.ctxPath + '/jlw/teacherOpenCourseHandsOn/getHandsOnList.do' // 数据接口 /server + ,where:{"teacherOpenCourseId":teacherOpenCourseId} ,page : Lib.tablePage // 开启分页 - ,toolbar: '#toolbar_teacherOpenCourseHandsOn' //自定义头部左侧工具栏 - ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 ,limit : 10, cols : [ [ // 表头 { - type : 'checkbox', - + type : 'numbers', + title:'序号' }, { - field : 'handsOnId', - title : '实操主键', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['handsOnId'])?false:sx_['handsOnId'], - - width : 60, - }, - { - field : 'teacherOpenCourseId', - title : '开课ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseId'])?false:sx_['teacherOpenCourseId'], - }, - { - field : 'courseInfoId', - title : '归属课程', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['courseInfoId'])?false:sx_['courseInfoId'], - }, - { - field : 'courseChildNode', - title : '归属章节', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['courseChildNode'])?false:sx_['courseChildNode'], - }, - { - field : 'handsOnName', - title : '实操名称', + field : 'handsOnName', + title : '项目名称', align:"center", hideField :false, - hide:$.isEmpty(sx_['handsOnName'])?false:sx_['handsOnName'], + hide:$.isEmpty(sx_['handsOnName'])?false:sx_['handsOnName'] }, { - field : 'handsOnRecommend', - title : '实操介绍', + field : 'videoAvgScore', + title : '观看视频平均得分', align:"center", hideField :false, - hide:$.isEmpty(sx_['handsOnRecommend'])?false:sx_['handsOnRecommend'], + hide:$.isEmpty(sx_['videoAvgScore'])?false:sx_['videoAvgScore'], + templet:function (d) { + var htm = ''+d.videoAvgScore+''; + return htm + } }, { - field : 'addTime', - title : '添加时间', + field : 'pptAvgScore', + title : '观看PPT平均得分', align:"center", hideField :false, - hide:$.isEmpty(sx_['addTime'])?false:sx_['addTime'], + hide:$.isEmpty(sx_['pptAvgScore'])?false:sx_['pptAvgScore'], + templet:function (d) { + var htm = ''+d.pptAvgScore+''; + return htm + } }, { - field : 'orgId', - title : '组织机构ID', + field : 'theoryAvgScore', + title : '理论测评平均得分', align:"center", hideField :false, - hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'], + hide:$.isEmpty(sx_['theoryAvgScore'])?false:sx_['theoryAvgScore'], + templet:function (d) { + var htm = ''+d.theoryAvgScore+''; + return htm + } }, { - field : 'userId', - title : '后台用户ID', + field : 'stepAvgScore', + title : '实训操作步骤平均得分', align:"center", hideField :false, - hide:$.isEmpty(sx_['userId'])?false:sx_['userId'], + hide:$.isEmpty(sx_['stepAvgScore'])?false:sx_['stepAvgScore'], + templet:function (d) { + var htm = ''+d.stepAvgScore+''; + return htm + } }, { - field : 'trainingData', - title : '数据集（多个地址，逗号隔开）', + field : 'reportAvgScore', + title : '报告撰写平均得分', align:"center", hideField :false, - hide:$.isEmpty(sx_['trainingData'])?false:sx_['trainingData'], - } - ,{ - field : 'operation_',title : '操作',align:"center", templet: function (d) { - var htm = ''; - htm += ''; - return htm; + hide:$.isEmpty(sx_['reportAvgScore'])?false:sx_['reportAvgScore'], + templet:function (d) { + var htm = ''+d.reportAvgScore+''; + return htm } } @@ -159,6 +167,16 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { Lib.doSearchForm($("#searchForm"), teacherOpenCourseHandsOnTable, 1); view.initToolBar() }, + addButton_cancel:function () { + + parent.Lib.tableRefresh(); + Lib.closeFrame(); + },exportDocument:function () { console.log("h") + /*layer.confirm('是否确定导出课程实操汇总表吗？', function (index) { + $.downFile(Common.ctxPath + "/jlw/teacherOpenCourseStudentSigninSetting/exportSummary.json?teacherOpenCourseId=" + teacherOpenCourseId,'签到汇总表'); + layer.close(index); + });*/ + }, } //触发事件 $('.ext-toolbar').on('click', function() { @@ -184,6 +202,15 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { } }); }); + }else if(obj.event === "videoAvgScore"){ +//teacherOpenCourseId handsOnId + //搜索条件studentOrName + }else if(obj.event === "pptAvgScore"){ + + }else if(obj.event === "theoryAvgScore"){ + }else if(obj.event === "stepAvgScore"){ + + }else if(obj.event === "reportAvgScore"){ } }) } 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 3e817cc7..4352caeb 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js @@ -168,8 +168,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { var url = "/jlw/questionLogSummary/index.do?teacherOpenCourseId=" + data.teacherOpenCourseId + "&questionSettingType=CHAPTER_EXERCISE"; Common.openDlg(url,"《"+title+"》/ 章节练习存档"); }else if(obj.event === "kcsc"){ - - var url = "/jlw/questionLogSummary/index.do?teacherOpenCourseId="+data.teacherOpenCourseId; + var url = "/jlw/teacherOpenCourseHandsOn/index.do?teacherOpenCourseId="+data.teacherOpenCourseId; Common.openDlg(url,"《"+title+"》/ 课程实操存档"); } else if (obj.event === "homework") { var url = "/jlw/questionLogSummary/homeworkIndex.do?teacherOpenCourseId=" + data.teacherOpenCourseId; diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html index 60ed4993..70a8ac2b 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html @@ -1,25 +1,47 @@ - - +
+ 返回 +
+ 导出 +
+
+
+
+
+ + +
+ - + + <!–# if(core.searchIsShow(search)) {–> 搜索 - + <!–# }–> 添加 修改 删除 - + <!–# if(!isEmpty(search)) {–> 刷新 - + <!–# }–> -