课程配置上移下移、文档存档

web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java

@@ -169,12 +169,40 @@ public class QuestionLogSummaryController extends BaseController {
 
 
     /* 后台页面 */
-
+    /**
+    *@author 姚丹
+    *@data 2023/01/10
+     */
     @GetMapping(MODEL + "/index.do")
     @Function("questionLogSummary.query")
-    public ModelAndView index() {
+    public ModelAndView index(Long teacherOpenCourseId) {
+        ModelAndView view = new ModelAndView("/jlw/questionLogSummary/index.html") ;
+        view.addObject("search", QuestionLogSummaryQuery.class.getName());
+        view.addObject("teacherOpenCourseId", teacherOpenCourseId);
+        return view;
+    }
+    /**
+     *@author 姚丹
+     *@data 2023/01/10
+     */
+    @GetMapping(MODEL + "/homeworkIndex.do")
+    @Function("questionLogSummary.query")
+    public ModelAndView homeworkIndex(Long teacherOpenCourseId) {
+        ModelAndView view = new ModelAndView("/jlw/questionLogSummary/index.html") ;
+        view.addObject("search", QuestionLogSummaryQuery.class.getName());
+        view.addObject("teacherOpenCourseId", teacherOpenCourseId);
+        return view;
+    }
+    /**
+     *@author 姚丹
+     *@data 2023/01/10
+     */
+    @GetMapping(MODEL + "/examIndex.do")
+    @Function("questionLogSummary.query")
+    public ModelAndView examIndex(Long teacherOpenCourseId) {
         ModelAndView view = new ModelAndView("/jlw/questionLogSummary/index.html") ;
         view.addObject("search", QuestionLogSummaryQuery.class.getName());
+        view.addObject("teacherOpenCourseId", teacherOpenCourseId);
         return view;
     }
 

web/src/main/resources/static/js/jlw/questionLogSummary/index.js

@@ -1,8 +1,25 @@
-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 questionLogSummaryTable = null;
+
+    var data = [];
+    var teacherOpenCourseId = $("input[name='teacherOpenCourseId']").val();
+    var ret = Common.postAjax("/jlw/teacherOpenCourseQuestionSetting/analysis.json",
+        {'teacherOpenCourseId':teacherOpenCourseId,'questionSettingType':'CHAPTER_EXERCISE'});
+    if(ret.code==0){
+        data = ret.data;
+        var getTpl = demo.innerHTML
+            ,view = document.getElementById('view');
+        laytpl(getTpl).render(data, function(html){
+            view.innerHTML = html;
+        });
+    }else {
+        Common.info(ret.msg);
+    }
+
     var view ={
         init:function(){
             var that = this
@@ -22,10 +39,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                 height : Lib.getTableHeight(1),
                 cellMinWidth: 100,
                 method : 'post',
-                url : Common.ctxPath + '/jlw/questionLogSummary/list.json' // 数据接口
+                url : Common.ctxPath + '/jlw/questionLogSummary/analysisPageList.json' // 数据接口
+                ,where:{'teacherOpenCourseId':teacherOpenCourseId,'questionSettingType':'CHAPTER_EXERCISE'}
                 ,page : Lib.tablePage // 开启分页
-                ,toolbar: '#toolbar_questionLogSummary' //自定义头部左侧工具栏
+               /* ,toolbar: '#toolbar_questionLogSummary' //自定义头部左侧工具栏
-                ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
+                ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
                 ,limit : 10,
                 cols : [ [ // 表头
                     {

web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js

@@ -61,7 +61,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                 {
                     field : 'teacherOpenCourseId',title : '操作',align:"center",width:'40%', templet: function (d) {
                         var htm = '<a class="layui-table-link" lay-event="qd">签到</a>';
-                        htm += '<a class="layui-table-link" lay-event="zj">章节</a>';
+                        htm += '<a class="layui-table-link" lay-event="chapter">章节</a>';
                         htm += '<a class="layui-table-link" lay-event="kcsc">课程实操</a>';
                         htm += '<a class="layui-table-link" lay-event="zy">作业</a>';
                         htm += '<a class="layui-table-link" lay-event="ks">考试</a>';
@@ -144,6 +144,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
 
         }, initTableTool: table.on('tool(teacherOpenCourseMergeCourseInfoTable)', function (obj) {
             var data = obj.data;
+            var title= data.teacherOpenCourseTitle;
             if (obj.event === 'edit') {
                 var url = "/jlw/teacherOpenCourseMergeCourseInfo/add.do?teacherOpenCourseMergeCourseInfoId="+data.teacherOpenCourseMergeCourseInfoId;
                 Common.openDlg(url,"开课课程拉取管理>"+data.teacherOpenCourseMergeCourseInfoId+">编辑");
@@ -161,19 +162,28 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     });
                 });
             }else if(obj.event === "qd"){
-                var title= data.teacherOpenCourseTitle;
                 var url = "/jlw/teacherOpenCourseStudentSigninSetting/index.do?teacherOpenCourseId="+data.teacherOpenCourseId;
                 Common.openDlg(url,"《"+title+"》/ 签到数据存档");
-            }else if(obj.event === "zj"){
+            }else if(obj.event === "chapter"){
-
+                console.log("hh")
+                var url = "/jlw/questionLogSummary/index.do?teacherOpenCourseId="+data.teacherOpenCourseId;
+                Common.openDlg(url,"《"+title+"》/ 章节练习存档");
             }else if(obj.event === "kcsc"){
-
+                console.log("1")
+                var url = "/jlw/questionLogSummary/index.do?teacherOpenCourseId="+data.teacherOpenCourseId;
+                Common.openDlg(url,"《"+title+"》/ 课程实操存档");
             }else if(obj.event === "zy"){
-
+                console.log("2")
+                var url = "/jlw/questionLogSummary/homeworkIndex.do?teacherOpenCourseId="+data.teacherOpenCourseId;
+                Common.openDlg(url,"《"+title+"》/ 作业存档");
             }else if(obj.event === "ks"){
-
+                console.log("3")
+                var url = "/jlw/questionLogSummary/examIndex.do?teacherOpenCourseId="+data.teacherOpenCourseId;
+                Common.openDlg(url,"《"+title+"》/ 考试存档");
             }else if(obj.event === "hd"){
-
+                console.log("4")
+                var url = "/jlw/teacherOpenCourseChatLog/index.do?teacherOpenCourseId="+data.teacherOpenCourseId;
+                Common.openDlg(url,"《"+title+"》/ 互动存档");
             }
         })
     }

web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html

@@ -423,32 +423,18 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
             }else if (obj.event === 'move') {//拖动
                 //soulTable.suspend('myTable', 'drag', !data.elem.checked)
             }else if (obj.event === 'moveUp') {//上移
-                var idLR = getLRid(data.resourcesInfoId);
-                if ($.isEmpty(idLR[0])) {
-                    Common.info("已经到顶了，无法继续上移！");
-                    return
-                }
                 layer.confirm('是否确定上移 "<span style="color: red">' + data.courseInfoName + '</span>" 该信息？', function (index) {
-                    var param = {};
+                    var param = {
-                    if ($.isEmpty(idLR[1])) {
+                        id: data.resourcesInfoId,
-                        param = {
+                        moveType: 'MOVE_LEFT'
-                            id: data.resourcesInfoId,
+                    };
-                            leftId: idLR[0]
+
-                        }
+                    var ret = Common.postAjax("/jlw/resourcesInfo/move.json", param);
-                    } else {
-                        param = {
-                            id: data.resourcesInfoId,
-                            leftId: idLR[0],
-                            rightId: idLR[1]
-                        }
-                    }
-                    var ret = Common.postAjax("/jlw/resourcesInfo/drag.json", param);
                     layer.msg(ret.code == 0 ? "移动成功！" : ret.msg, {
                         offset: ['50%'],
                         icon: ret.code == 0 ? 1 : 2,
                         time: 1500 //2秒关闭（如果不配置，默认是3秒）
                     }, function () {
-
                         if (ret.code == 0) {
                             courseInfoTable();
                             Lib.tableRefresh();
@@ -457,26 +443,13 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
                     });
                 });
             }else if (obj.event === 'moveDown') {//下移
-                var idLR = getLRid(data.resourcesInfoId);
-                if ($.isEmpty(idLR[1])) {
-                    Common.info("已经到底了，无法继续下移！");
-                    return
-                }
                 layer.confirm('是否确定下移 "<span style="color: red">' + data.courseInfoName + '</span>" 该信息？', function (index) {
-                    var param = {};
+                    var param = {
-                    if ($.isEmpty(idLR[0])) {
+                        id: data.resourcesInfoId,
-                        param = {
+                        moveType: 'MOVE_RIGHT'
-                            id: data.resourcesInfoId,
+                    };
-                            leftId: idLR[1]
+
-                        }
+                    var ret = Common.postAjax("/jlw/resourcesInfo/move.json", param);
-                    } else {
-                        param = {
-                            id: data.resourcesInfoId,
-                            leftId: idLR[0],
-                            rightId: idLR[1]
-                        }
-                    }
-                    var ret = Common.postAjax("/jlw/resourcesInfo/drag.json", param);
                     layer.msg(ret.code == 0 ? "移动成功！" : ret.msg, {
                         offset: ['50%'],
                         icon: ret.code == 0 ? 1 : 2,
@@ -815,8 +788,8 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
                     index = i;
                 }
             });
-            data.push(courseInfoAllData[index - 1].resourcesInfoId);
             data.push(courseInfoAllData[index + 1].resourcesInfoId);
+            data.push(courseInfoAllData[index + 2].resourcesInfoId);
 
             return data
         }

web/src/main/resources/templates/jlw/questionLogSummary/examIndex.html

@@ -0,0 +1,31 @@
+<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/questionLogSummary/"}){ -->
+<layui:searchForm formId="searchForm" searchList="" condition="${search}">
+</layui:searchForm>
+<table id="questionLogSummaryTable" lay-filter="questionLogSummaryTable"></table>
+<!--#} -->
+
+<script type="text/html" id="toolbar_questionLogSummary">
+    <div class="layui-btn-container">
+        <div class="layui-btn-group" >
+            <!--# if(core.searchIsShow(search)) {-->
+            <layui:accessButton function="questionLogSummary.query"  id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>
+            <!--# }-->
+            <layui:accessButton function="questionLogSummary.add"  action="add">添加</layui:accessButton>
+            <layui:accessButton function="questionLogSummary.edit"  action="edit">修改</layui:accessButton>
+            <layui:accessButton function="questionLogSummary.del"  action="del">删除</layui:accessButton>
+            <!--#            if(!isEmpty(search)) {-->
+            <layui:accessButton function="questionLogSummary.query"  action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>
+            <!--#            }-->
+            <layui:accessButton function="questionLogSummary.exportDocument"  action="exportDocument">导出</layui:accessButton>
+            <layui:accessButton function="questionLogSummary.importTemplate"  action="importDocument">导入</layui:accessButton>
+        </div>
+    </div>
+</script>
+<script>
+
+layui.use(['index'], function(){
+    var index = layui.index;
+    index.init();
+});
+
+</script>

web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html

@@ -0,0 +1,31 @@
+<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/questionLogSummary/"}){ -->
+<layui:searchForm formId="searchForm" searchList="" condition="${search}">
+</layui:searchForm>
+<table id="questionLogSummaryTable" lay-filter="questionLogSummaryTable"></table>
+<!--#} -->
+
+<script type="text/html" id="toolbar_questionLogSummary">
+    <div class="layui-btn-container">
+        <div class="layui-btn-group" >
+            <!--# if(core.searchIsShow(search)) {-->
+            <layui:accessButton function="questionLogSummary.query"  id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>
+            <!--# }-->
+            <layui:accessButton function="questionLogSummary.add"  action="add">添加</layui:accessButton>
+            <layui:accessButton function="questionLogSummary.edit"  action="edit">修改</layui:accessButton>
+            <layui:accessButton function="questionLogSummary.del"  action="del">删除</layui:accessButton>
+            <!--#            if(!isEmpty(search)) {-->
+            <layui:accessButton function="questionLogSummary.query"  action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>
+            <!--#            }-->
+            <layui:accessButton function="questionLogSummary.exportDocument"  action="exportDocument">导出</layui:accessButton>
+            <layui:accessButton function="questionLogSummary.importTemplate"  action="importDocument">导入</layui:accessButton>
+        </div>
+    </div>
+</script>
+<script>
+
+layui.use(['index'], function(){
+    var index = layui.index;
+    index.init();
+});
+
+</script>

web/src/main/resources/templates/jlw/questionLogSummary/index.html

@@ -1,26 +1,45 @@
 <!--#layout("/common/layout.html",{"jsBase":"/js/jlw/questionLogSummary/"}){ -->
-<layui:searchForm formId="searchForm" searchList="" condition="${search}">
+<div class="layui-row">
-</layui:searchForm>
+    <div style="float: left" id="view"></div>
+    <div class="layui-inline" style="float: right;">
+        <layui:accessButton function="teacherOpenCourseStudentSigninSetting.query"  action="export"><span
+                class="iconfont">&#xe8c7;</span>导出</layui:accessButton>
+        <layui:accessButton function="teacherOpenCourseStudentSigninSetting.query" class="layui-btn-primary"
+                            action="addButton_cancel"><span class="iconfont">&#xe600;</span>返回</layui:accessButton>
+    </div>
+</div>
+
+<script type="text/html" id="demo">
+    <h2 style="float: left">章节练习汇总：【
+        合计练习题目数量:{{!$.isEmpty(d.questionTotalCount)?d.questionTotalCount:""}};
+        合计平均答对数量：{{!$.isEmpty(d.avgCorrectCount)?d.avgCorrectCount:""}};
+        合计平均答错数量：{{!$.isEmpty(d.avgWrongCount)?d.avgWrongCount:""}};
+        合计得分：{{!$.isEmpty(d.avgStudentScore)?d.avgStudentScore:""}}
+        】
+    </h2>
+</script>
+
 <table id="questionLogSummaryTable" lay-filter="questionLogSummaryTable"></table>
+<input type="hidden" name="teacherOpenCourseId" value="${teacherOpenCourseId}" />
 <!--#} -->
 
-<script type="text/html" id="toolbar_questionLogSummary">
+<!--<script type="text/html" id="toolbar_questionLogSummary">
     <div class="layui-btn-container">
         <div class="layui-btn-group" >
-            <!--# if(core.searchIsShow(search)) {-->
+            &lt;!&ndash;# if(core.searchIsShow(search)) {&ndash;&gt;
             <layui:accessButton function="questionLogSummary.query"  id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>
-            <!--# }-->
+            &lt;!&ndash;# }&ndash;&gt;
             <layui:accessButton function="questionLogSummary.add"  action="add">添加</layui:accessButton>
             <layui:accessButton function="questionLogSummary.edit"  action="edit">修改</layui:accessButton>
             <layui:accessButton function="questionLogSummary.del"  action="del">删除</layui:accessButton>
-            <!--#            if(!isEmpty(search)) {-->
+            &lt;!&ndash;#            if(!isEmpty(search)) {&ndash;&gt;
             <layui:accessButton function="questionLogSummary.query"  action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>
-            <!--#            }-->
+            &lt;!&ndash;#            }&ndash;&gt;
             <layui:accessButton function="questionLogSummary.exportDocument"  action="exportDocument">导出</layui:accessButton>
             <layui:accessButton function="questionLogSummary.importTemplate"  action="importDocument">导入</layui:accessButton>
         </div>
     </div>
-</script>
+</script>-->
 <script>
 
 layui.use(['index'], function(){

web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html

@@ -1,20 +1,21 @@
 <!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseStudentSigninSetting/"}){ -->
-<div class="layui-row" id="view"></div>
+<div class="layui-row">
-<script type="text/html" id="demo">
+    <div style="float: left" id="view"></div>
-    <h2 style="float: left">签到汇总：【
-        合计签到次数:{{d.totalSigninCount}}次;
-        合计签到人数：{{d.totalSigninNumber}}人;
-        合计缺勤：{{d.totalUnSigninNumber}}人;
-        合计到课率：{{d.totalAttendanceRate}}%
-        】
-    </h2>
-
     <div class="layui-inline" style="float: right;">
         <layui:accessButton function="teacherOpenCourseStudentSigninSetting.query"  action="export"><span
                 class="iconfont">&#xe8c7;</span>导出</layui:accessButton>
         <layui:accessButton function="teacherOpenCourseStudentSigninSetting.query" class="layui-btn-primary"
                             action="addButton_cancel"><span class="iconfont">&#xe600;</span>返回</layui:accessButton>
     </div>
+</div>
+<script type="text/html" id="demo">
+    <h2 style="float: left">签到汇总：【
+        合计签到次数:{{!$.isEmpty(d.totalSigninCount)?d.totalSigninCount:""}};次;
+        合计签到人数：{{!$.isEmpty(d.totalSigninNumber)?d.totalSigninNumber:""}}人;
+        合计缺勤：{{!$.isEmpty(d.totalUnSigninNumber)?d.totalUnSigninNumber:""}}人;
+        合计到课率：{{!$.isEmpty(d.totalAttendanceRate)?d.totalAttendanceRate:""}}%
+        】
+    </h2>
 </script>
 
 <table id="teacherOpenCourseStudentSigninSettingTable" lay-filter="teacherOpenCourseStudentSigninSettingTable"></table>