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 3513e76c..7ea284c0 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java @@ -14,8 +14,10 @@ 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; @@ -27,10 +29,7 @@ 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.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.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; @@ -108,6 +107,20 @@ public class TeacherOpenCourseHandsOnController{ return view; } + /** + *@author 姚丹 + *@data 2023/01/14 + */ + @GetMapping(MODEL + "/indexInfoV.do") + @Function("teacherOpenCourseHandsOn.query") + public ModelAndView indexInfoV(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); + 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 23f67328..fd6c79d7 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js @@ -203,6 +203,8 @@ 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 }else if(obj.event === "pptAvgScore"){ diff --git a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html index ccc1fcdf..a5dae63a 100644 --- a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html +++ b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html @@ -233,35 +233,38 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find var index_child = 1; var index_child_child = 1; var courseInfoParentIdOld; + var courseInfoIdOld; courseInfoAllData.forEach((item,index) => { /*根据课程类型值判断章节*/ if(item.courseInfoType == 2){ - item.numberName = index_parent; + item.courseInfoNo = index_parent; index_parent++; - courseInfoParentIdOld = item.courseInfoId; - index_child =1 + courseInfoParentIdOld = item.courseInfoParentId; + courseInfoIdOld = item.courseInfoId; + index_child =1; } - if(item.courseInfoType == 3){ - if(item.courseInfoParentId === courseInfoParentIdOld){ - item.numberName = index_parent-1 + "." + index_child; - index_child++; - index_child_child =1 - }else { - item.numberName = index_parent-1 + "." + (index_child-1)+"."+index_child_child; + index_child_child=1 + courseInfoAllData.forEach((em,i) => { + + if(item.courseInfoType == 2 && (item.courseInfoId == em.courseInfoParentId)){ + em.courseInfoNo = index_parent-1 + "." + index_child; + index_child ++; + } + if(item.courseInfoType == 3 && (item.courseInfoId == em.courseInfoParentId)){ + em.courseInfoNo = item.courseInfoNo+"."+index_child_child; index_child_child++ } - } + }); item.resourcesInfo.forEach(function (e, i) { e.courseInfoParentId = e.courseInfoId; e.courseInfoId = 0; e.courseInfoName = e.resourcesInfoName; - e.numberName=''; + e.courseInfoNo=''; courseInfoAllData.push(e); }); }); - layer.closeAll(); }else{ layer.msg(ret.msg||"加载失败!!", { @@ -296,7 +299,7 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find ,totalRow: true*/ , cols: [[ // 表头 { - field: 'numberName', + field: 'courseInfoNo', title: '序号', width:280, align: "center", diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfo.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfo.html new file mode 100644 index 00000000..2c435491 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfo.html @@ -0,0 +1,454 @@ + +
+
+
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+ + + + + + + + + +
+
+
+
+
+ 导出 +
+
+ 返回 +
+ +
+
+
+ + + + + + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html new file mode 100644 index 00000000..9259994b --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html @@ -0,0 +1,454 @@ + +
+
+
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+ + + + + + + + + +
+
+
+
+
+ 导出 +
+
+ 返回 +
+ +
+
+
+ + + + + + + + + +