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 7ea284c0..67251013 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java @@ -1,6 +1,5 @@ package com.ibeetl.jlw.web; -import cn.hutool.core.collection.ListUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.util.ToolUtils; import cn.jlw.validate.ValidateConfig; @@ -10,14 +9,11 @@ import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; -import com.ibeetl.jlw.entity.TaskTypeParam; import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOn; import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnList; import com.ibeetl.jlw.entity.vo.StudentHandsOnVO; -import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum; import com.ibeetl.jlw.service.TeacherOpenCourseHandsOnService; import com.ibeetl.jlw.web.query.GetHandsOnListParam; -import com.ibeetl.jlw.web.query.QuestionLogSummaryQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnQuery; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -29,7 +25,10 @@ import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; @@ -110,6 +109,7 @@ public class TeacherOpenCourseHandsOnController{ /** *@author 姚丹 *@data 2023/01/14 + * 观看视频平均得分/详情页 */ @GetMapping(MODEL + "/indexInfoV.do") @Function("teacherOpenCourseHandsOn.query") @@ -121,6 +121,67 @@ public class TeacherOpenCourseHandsOnController{ return view; } + /** + * @author 姚丹 + * @data 2023/01/15 + * 观看PPT平均得分/详情页 + */ + @GetMapping(MODEL + "/indexInfoP.do") + @Function("teacherOpenCourseHandsOn.query") + public ModelAndView indexInfoP(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); + return view; + } + + /** + * @author 姚丹 + * @data 2023/01/15 + * 理论测评平均得分/详情页 + */ + @GetMapping(MODEL + "/indexInfoT.do") + @Function("teacherOpenCourseHandsOn.query") + public ModelAndView indexInfoT(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); + return view; + } + + + /** + * @author 姚丹 + * @data 2023/01/15 + * 实训操作步骤平均得分/详情页 + */ + @GetMapping(MODEL + "/indexInfoS.do") + @Function("teacherOpenCourseHandsOn.query") + public ModelAndView indexInfoS(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); + return view; + } + + /** + * @author 姚丹 + * @data 2023/01/15 + * 报告撰写平均得分/详情页 + */ + @GetMapping(MODEL + "/indexInfoR.do") + @Function("teacherOpenCourseHandsOn.query") + public ModelAndView indexInfoR(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); + return view; + } + @GetMapping(MODEL + "/edit.do") @Function("teacherOpenCourseHandsOn.edit") public ModelAndView edit(Long handsOnId) { 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 fd6c79d7..879a1608 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js @@ -168,14 +168,14 @@ layui.define([ 'form', 'laydate', 'table','laytpl' ], function(exports) { 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,'签到汇总表'); + },exportDocument:function () { + layer.confirm('是否确定导出课程实训存档表吗?', function (index) { + var url = '/jlw/teacherOpenCourseHandsOn/getHandsOnList/export.json?teacherOpenCourseId='+teacherOpenCourseId; + $.downFile(Common.ctxPath + url ,'课程实训存档表'); layer.close(index); - });*/ + }); }, } //触发事件 @@ -203,16 +203,20 @@ layui.define([ 'form', 'laydate', 'table','laytpl' ], function(exports) { }); }); }else if(obj.event === "videoAvgScore"){ - var url = "/jlw/teacherOpenCourseHandsOn/indexInfoV.do?handsOnId=" + data.teacherOpenCourseStudentSigninSettingId + "&teacherOpenCourseId=" + teacherOpenCourseId; - Common.openDlg(url,"/详情"); -//teacherOpenCourseId handsOnId - //搜索条件studentOrName + var url = "/jlw/teacherOpenCourseHandsOn/indexInfoV.do?handsOnId=" + data.handsOnId + "&teacherOpenCourseId=" + teacherOpenCourseId; + Common.openDlg(url,"观看视频平均得分/详情"); }else if(obj.event === "pptAvgScore"){ - + var url = "/jlw/teacherOpenCourseHandsOn/indexInfoP.do?handsOnId=" + data.handsOnId + "&teacherOpenCourseId=" + teacherOpenCourseId; + Common.openDlg(url,"观看PPT平均得分/详情"); }else if(obj.event === "theoryAvgScore"){ + var url = "/jlw/teacherOpenCourseHandsOn/indexInfoT.do?handsOnId=" + data.handsOnId + "&teacherOpenCourseId=" + teacherOpenCourseId; + Common.openDlg(url,"理论测评平均得分/详情"); }else if(obj.event === "stepAvgScore"){ - + var url = "/jlw/teacherOpenCourseHandsOn/indexInfoS.do?handsOnId=" + data.handsOnId + "&teacherOpenCourseId=" + teacherOpenCourseId; + Common.openDlg(url,"实训操作步骤平均得分/详情"); }else if(obj.event === "reportAvgScore"){ + var url = "/jlw/teacherOpenCourseHandsOn/indexInfoR.do?handsOnId=" + data.handsOnId + "&teacherOpenCourseId=" + teacherOpenCourseId; + Common.openDlg(url,"报告撰写平均得分/详情"); } }) } diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html index 70a8ac2b..53e0d03e 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html @@ -40,9 +40,9 @@ <!–# }–> - ---> + - - - - - diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html new file mode 100644 index 00000000..8cb1c8ef --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html @@ -0,0 +1,299 @@ + +
+
+
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ 导出 +
+
+ 返回 +
+ +
+
+
+ + + + + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html new file mode 100644 index 00000000..708c06cf --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html @@ -0,0 +1,310 @@ + +
+
+
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ 导出 +
+
+ 返回 +
+ +
+
+
+ + + + + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html new file mode 100644 index 00000000..76739460 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html @@ -0,0 +1,312 @@ + +
+
+
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ 导出 +
+
+ 返回 +
+ +
+
+
+ + + + + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html new file mode 100644 index 00000000..6e850648 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html @@ -0,0 +1,326 @@ + +
+
+
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ 导出 +
+
+ 返回 +
+ +
+
+
+ + + + + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html index 9259994b..d180adcc 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html @@ -27,15 +27,7 @@
- - - - - - - - - +
@@ -49,89 +41,41 @@ action="addButton_cancel">返回
-
+
- - + - - - - + + +