Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

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

@@ -146,14 +146,13 @@ layui.define([ 'form', 'laydate', 'table','laytpl'], function(exports) {
             });
             //触发行单击事件
             table.on('row(studentTable)', function(obj){
-                var param={
-                    'teacherOpenCourseStudentSigninSettingId': teacherOpenCourseStudentSigninSettingId,
-                    'teacherOpenCourseStudentSigninSettingSessionTime':$("select[name='teacherOpenCourseStudentSigninSettingSessionTime']").val(),
-                    'studentId':obj.data.studentId
-                }
-                studentIdClick = obj.data.studentId;
+                var data = obj.data;
+                $(".layui-table-body tr ").attr({"style": "color:#666"});//其他tr恢复原样
+                // console.log(obj.tr) //得到当前点击的tr
+                $(obj.tr).attr({"style": "color:#5FB878"});//改变当前tr颜色
+                studentIdClick = data.studentId;
                 teacherOpenCourseStudentSigninLogTable.reload({
-                    where: param,
+                    where: getParam(),
                     page: {
                         curr: 1
                     }
@@ -167,23 +166,22 @@ layui.define([ 'form', 'laydate', 'table','laytpl'], function(exports) {
 
             var btn_s = $("#searchFormSearch");
             btn_s.on('click', function () {
-                console.log($("select[name='teacherOpenCourseStudentSigninSettingSessionTime']").val())
-                var data = $("#searchForm").serializeJson();
+                let param = getParam()
                 teacherOpenCourseStudentSigninLogTable.reload({
-                    where: data,
+                    where: param,
                     page: {
                         curr: 1
                     }
                 });
-                studentTable.reload({
+                /*studentTable.reload({
                     where: getParam_s(),
                     page: {
                         curr: 1
                     }
-                });
+                });*/
             });
 
-            var btn = $("#studentFormSearch");
+            var btn = $("#studentFormSearch");//班级搜索
             btn.on('click', function () {
                 studentTable.reload({
                     where: getParam_s(),
@@ -191,6 +189,15 @@ layui.define([ 'form', 'laydate', 'table','laytpl'], function(exports) {
                         curr: 1
                     }
                 });
+
+                let param = getParam();
+                param.studentId = "";
+                teacherOpenCourseStudentSigninLogTable.reload({
+                    where: param,
+                    page: {
+                        curr: 1
+                    }
+                });
             });
         },
 
@@ -279,9 +286,20 @@ layui.define([ 'form', 'laydate', 'table','laytpl'], function(exports) {
             }
         })
     };
+    //右侧表格
+    function getParam() {
+        var data = $("#searchForm").serializeJson();
+        var param = {
+            "studentSnOrName":$("#studentForm input[name='studentOrName']").val(),
+            'teacherOpenCourseId':teacherOpenCourseId,
+            "studentId":studentIdClick,
+        };
+        param  = Object.assign(data, param);
+        return param;
+    }
+    //学生table搜索条件
     function getParam_s(){
         var param = {
-        "teacherOpenCourseStudentSigninSettingSessionTime":$("select[name='teacherOpenCourseStudentSigninSettingSessionTime']").val(),
         "schoolClassIdPlural":$("#studentForm select[name='classId']").val(),
         "studentSnOrName":$("#studentForm input[name='studentOrName']").val(),
         'teacherOpenCourseId':teacherOpenCourseId

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

@@ -312,6 +312,10 @@ layui.use(['form','laydate','table','laytpl'], function(){
             });
             //触发行单击事件
             table.on('row(studentTable)', function(obj){
+                var data = obj.data;
+                $(".layui-table-body tr ").attr({"style": "color:#666"});//其他tr恢复原样
+                // console.log(obj.tr) //得到当前点击的tr
+                $(obj.tr).attr({"style": "color:#5FB878"});//改变当前tr颜色
                 var settingId = $("select[name='teacherOpenCourseQuestionSettingId']").val();
                 var param={
                     'studentId':obj.data.studentId,

web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html

@@ -192,6 +192,10 @@
                 });
                 //触发行单击事件
                 table.on('row(studentTable)', function(obj){
+                    var data = obj.data;
+                    $(".layui-table-body tr ").attr({"style": "color:#666"});//其他tr恢复原样
+                    // console.log(obj.tr) //得到当前点击的tr
+                    $(obj.tr).attr({"style": "color:#5FB878"});//改变当前tr颜色
                     var handsOnIdNew = $("select[name='handsOnId']").val();
                     var param={
                         'studentId':obj.data.studentId,

web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html

@@ -200,6 +200,10 @@
                 });
                 //触发行单击事件
                 table.on('row(studentTable)', function(obj){
+                    var data = obj.data;
+                    $(".layui-table-body tr ").attr({"style": "color:#666"});//其他tr恢复原样
+                    // console.log(obj.tr) //得到当前点击的tr
+                    $(obj.tr).attr({"style": "color:#5FB878"});//改变当前tr颜色
                     var handsOnIdNew = $("select[name='handsOnId']").val();
                     var param={
                         'studentId':obj.data.studentId,

web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html

@@ -206,6 +206,10 @@
                 });
                 //触发行单击事件
                 table.on('row(studentTable)', function(obj){
+                    var data = obj.data;
+                    $(".layui-table-body tr ").attr({"style": "color:#666"});//其他tr恢复原样
+                    // console.log(obj.tr) //得到当前点击的tr
+                    $(obj.tr).attr({"style": "color:#5FB878"});//改变当前tr颜色
                     var handsOnIdNew = $("select[name='handsOnId']").val();
                     var param={
                         'studentId':obj.data.studentId,

web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html

@@ -220,6 +220,10 @@
                 });
                 //触发行单击事件
                 table.on('row(studentTable)', function(obj){
+                    var data = obj.data;
+                    $(".layui-table-body tr ").attr({"style": "color:#666"});//其他tr恢复原样
+                    // console.log(obj.tr) //得到当前点击的tr
+                    $(obj.tr).attr({"style": "color:#5FB878"});//改变当前tr颜色
                     var handsOnIdNew = $("select[name='handsOnId']").val();
                     var param={
                         'studentId':obj.data.studentId,

web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html

@@ -194,6 +194,10 @@
                 });
                 //触发行单击事件
                 table.on('row(studentTable)', function(obj){
+                    var data = obj.data;
+                    $(".layui-table-body tr ").attr({"style": "color:#666"});//其他tr恢复原样
+                    // console.log(obj.tr) //得到当前点击的tr
+                    $(obj.tr).attr({"style": "color:#5FB878"});//改变当前tr颜色
                     var handsOnIdNew = $("select[name='handsOnId']").val();
                     var param={
                         'studentId':obj.data.studentId,