From f23d17159332d6c584b692c7af93b5896c0667b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Tue, 18 Jul 2023 23:35:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=AD=98=E6=A1=A3--=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E6=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../teacherOpenCourseHandsOn/indexInfoP.html  | 63 +++++++++++--------
 .../teacherOpenCourseHandsOn/indexInfoR.html  | 54 +++++++++-------
 .../teacherOpenCourseHandsOn/indexInfoS.html  | 54 +++++++++-------
 .../teacherOpenCourseHandsOn/indexInfoT.html  | 60 ++++++++++--------
 .../teacherOpenCourseHandsOn/indexInfoV.html  | 58 +++++++++--------
 5 files changed, 162 insertions(+), 127 deletions(-)

diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html
index 1400d3e7..69716851 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html
@@ -71,6 +71,7 @@
 
         var handsOnId = $("input[name='handsOnId']").val();
         var teacherOpenCourseId=$("input[name='teacherOpenCourseId']").val();
+        var studentIdClick = "";//左侧选中选学生id
 
         var data = [];
 
@@ -107,11 +108,11 @@
                     height : Lib.getTableHeight(1),
                     cellMinWidth: 100,
                     method : 'post',
-                    url: Common.ctxPath + '/api/studentHandsOnTaskPpt/getPageList.do' // 数据接口
+                        url: Common.ctxPath + '/api/studentHandsOnTaskPpt/getPageList.do' // 数据接口
                     ,page : Lib.tablePage // 开启分页
                     /*  ,toolbar: '#toolbar_teacherOpenCourseQuestionLog' //自定义头部左侧工具栏
                       ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
-                    ,where:{'teacherOpenCourseId':teacherOpenCourseId, 'handsOnId':handsOnId}
+                    ,where:getParam()
                     ,limit : 10,
                     cols : [ [ // 表头
                         {
@@ -173,11 +174,8 @@
                             field: 'studentName',
                             title: '姓名', align: "center"
                         }, {
-                            field: 'sumStudentScore',
+                            field: 'sumScore',
                             title: '得分', align: "center",
-                            templet:function (d) {
-                                return '0'
-                            }
                         }
                     ]]
                 });
@@ -196,13 +194,9 @@
                     $(".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,
-                        'teacherOpenCourseId':teacherOpenCourseId,
-                        'handsOnId':$.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew
-                    };
 
+                    studentIdClick = data.studentId;
+                    var param = getParam(studentIdClick)
                     studentHandsOnTaskPptTable.reload({
                         where: param,
                         page: {
@@ -218,12 +212,11 @@
 
                 var btn_s = $("#searchFormSearch");
                 btn_s.on('click', function () {
-                    var data = $("#searchForm").serializeJson();
-                    var handsOnIdNew = $("select[name='handsOnId']").val();
-                    data.handsOnId = $.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew;
-                    data.teacherOpenCourseId=teacherOpenCourseId;
+                    /*var data = $("#searchForm").serializeJson();*/
+                    var param = getParam(studentIdClick);
+
                     studentHandsOnTaskPptTable.reload({
-                        where: data,
+                        where: param,
                         page: {
                             curr: 1
                         }
@@ -232,6 +225,7 @@
 
                 var btn = $("#studentFormSearch");
                 btn.on('click', function () {
+                    studentIdClick = "";
                     studentTable.reload({
                         where: getParam_s(),
                         page: {
@@ -244,12 +238,19 @@
             initToolBar:function(){
                 toolbar = {
                     exportDocument: function () {
-                        var handsOnIdNew = $("select[name='handsOnId']").val();
-                        handsOnIdNew = $.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew;
-                        var url = '/jlw/studentHandsOnTaskPpt/excel/export.do?teacherOpenCourseId='+teacherOpenCourseId+'&handsOnId='+handsOnIdNew;
-
-                        Common.openConfirm("确认要导出课程实操存档详情?", function (index) {
-                            $.downFile(Common.ctxPath + url,'课程实操存档详情');
+                        Common.openConfirm("确认要导出-PPT平均得分信息?", function (index) {
+                            let value = "";
+                            var url = '/jlw/studentHandsOnTaskPpt/excel/export.do';
+                            let param = getParam(studentIdClick);
+                            for(let k in param) {
+                                if(!$.isEmpty(param[k])){
+                                    value+='&'+k+"="+param[k];
+                                }
+                            }
+                            if(!$.isEmpty(value)){
+                                url = url +"?" + value.slice(1);
+                            }
+                            $.downFile(Common.ctxPath + url,'PPT平均得分表');
                             layer.close(index);
                         })
                     },
@@ -285,14 +286,22 @@
                 }
             })
         };
+        function getParam(studentId) {
+            let param = $("#searchForm").serializeJson();
+            param.teacherOpenCourseId = teacherOpenCourseId;
+            param.studentId = studentId;
+            param.handsOnId = $.isEmpty(param.handsOnId)?handsOnId:param.handsOnId
+            return param;
+        }
+
         function getParam_s(){
+            var handsOnIdSelect = $("select[name='handsOnId']").val();
             var param = {
                 "classId":$("#studentForm select[name='classId']").val(),
-                "studentName":$("#studentForm input[name='studentOrName']").val(),
-                'teacherOpenCourseId': teacherOpenCourseId,
-                'handsOnId':handsOnId
+                "studentOrName":$("#studentForm input[name='studentOrName']").val(),
+                'handsOnId':$.isEmpty(handsOnIdSelect)?handsOnId:handsOnIdSelect,
+                "type":2
             };
-
             return param
         }
 
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html
index 4929ddb5..7f8e61c8 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html
@@ -72,7 +72,7 @@
 
         var handsOnId = $("input[name='handsOnId']").val();
         var teacherOpenCourseId=$("input[name='teacherOpenCourseId']").val();
-
+        var studentIdClick = "";//左侧点击学生列的id
         var data = [];
 
         var url = "/jlw/teacherOpenCourseHandsOn/getHandsOnList.do?teacherOpenCourseId=" + teacherOpenCourseId;
@@ -112,7 +112,7 @@
                     ,page : Lib.tablePage // 开启分页
                     /*  ,toolbar: '#toolbar_teacherOpenCourseQuestionLog' //自定义头部左侧工具栏
                       ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
-                    ,where:{'teacherOpenCourseId':teacherOpenCourseId, 'handsOnId':handsOnId}
+                    ,where:getParam()
                     ,limit : 10,
                     cols : [ [ // 表头
                         {
@@ -204,15 +204,9 @@
                     $(".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,
-                        'teacherOpenCourseId':teacherOpenCourseId,
-                        'handsOnId':$.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew
-                    };
-
+                    studentIdClick = data.studentId;
                     studentHandsOnTaskVideoTable.reload({
-                        where: param,
+                        where: getParam(studentIdClick),
                         page: {
                             curr: 1
                         }
@@ -226,12 +220,8 @@
 
                 var btn_s = $("#searchFormSearch");
                 btn_s.on('click', function () {
-                    var data = $("#searchForm").serializeJson();
-                    var handsOnIdNew = $("select[name='handsOnId']").val();
-                    data.handsOnId = $.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew;
-                    data.teacherOpenCourseId=teacherOpenCourseId;
                     studentHandsOnTaskVideoTable.reload({
-                        where: data,
+                        where: getParam(studentIdClick),
                         page: {
                             curr: 1
                         }
@@ -240,6 +230,7 @@
 
                 var btn = $("#studentFormSearch");
                 btn.on('click', function () {
+                    studentIdClick = "";
                     studentTable.reload({
                         where: getParam_s(),
                         page: {
@@ -252,12 +243,19 @@
             initToolBar:function(){
                 toolbar = {
                     exportDocument: function () {
-                        var handsOnIdNew = $("select[name='handsOnId']").val();
-                        handsOnIdNew = $.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew;
-                        var url = '/jlw/studentHandsOnTaskReport/excel/export.do?teacherOpenCourseId='+teacherOpenCourseId+'&handsOnId='+handsOnIdNew;
-
-                        Common.openConfirm("确认要导出课程实操存档详情?", function (index) {
-                            $.downFile(Common.ctxPath + url,'课程实操存档详情');
+                        Common.openConfirm("确认要导出-报告撰写平均得分信息?", function (index) {
+                            var url = '/jlw/studentHandsOnTaskReport/excel/export.do';
+                            let value = "";
+                            let param = getParam(studentIdClick);
+                            for(let k in param) {
+                                if(!$.isEmpty(param[k])){
+                                    value+='&'+k+"="+param[k];
+                                }
+                            }
+                            if(!$.isEmpty(value)){
+                                url = url +"?" + value.slice(1);
+                            }
+                            $.downFile(Common.ctxPath + url,'报告撰写平均得分表');
                             layer.close(index);
                         })
                     },
@@ -297,12 +295,20 @@
                 }
             })
         };
+        function getParam(studentId) {
+            var param = $("#searchForm").serializeJson();
+            param.teacherOpenCourseId = teacherOpenCourseId;
+            param.studentId = studentId;
+            param.handsOnId = $.isEmpty(param.handsOnId)?handsOnId:param.handsOnId;
+            return param;
+        }
         function getParam_s(){
+            var handsOnIdSelect = $("select[name='handsOnId']").val();
             var param = {
                 "classId":$("#studentForm select[name='classId']").val(),
-                "studentName":$("#studentForm input[name='studentOrName']").val(),
-                'teacherOpenCourseId': teacherOpenCourseId,
-                "handsOnId": handsOnId
+                "studentOrName":$("#studentForm input[name='studentOrName']").val(),
+                "handsOnId": $.isEmpty(handsOnIdSelect)? handsOnId : handsOnIdSelect,
+                'type': 5
             };
 
             return param
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html
index faac6f35..6a357e3b 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html
@@ -72,7 +72,7 @@
 
         var handsOnId = $("input[name='handsOnId']").val();
         var teacherOpenCourseId=$("input[name='teacherOpenCourseId']").val();
-
+        var studentIdClick = "";//左侧选中选学生id
         var data = [];
 
         var url = "/jlw/teacherOpenCourseHandsOn/getHandsOnList.do?teacherOpenCourseId=" + teacherOpenCourseId;
@@ -112,7 +112,7 @@
                     ,page : Lib.tablePage // 开启分页
                     /*  ,toolbar: '#toolbar_teacherOpenCourseQuestionLog' //自定义头部左侧工具栏
                       ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
-                    ,where:{'teacherOpenCourseId':teacherOpenCourseId, 'handsOnId':handsOnId}
+                    ,where:getParam()
                     ,limit : 10,
                     cols : [ [ // 表头
                         {
@@ -210,15 +210,9 @@
                     $(".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,
-                        'teacherOpenCourseId':teacherOpenCourseId,
-                        'handsOnId':$.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew
-                    };
-
+                    studentIdClick = data.studentId;
                     studentHandsOnTaskVideoTable.reload({
-                        where: param,
+                        where: getParam(studentIdClick),
                         page: {
                             curr: 1
                         }
@@ -232,12 +226,8 @@
 
                 var btn_s = $("#searchFormSearch");
                 btn_s.on('click', function () {
-                    var data = $("#searchForm").serializeJson();
-                    var handsOnIdNew = $("select[name='handsOnId']").val();
-                    data.handsOnId = $.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew;
-                    data.teacherOpenCourseId=teacherOpenCourseId;
                     studentHandsOnTaskVideoTable.reload({
-                        where: data,
+                        where: getParam(studentIdClick),
                         page: {
                             curr: 1
                         }
@@ -246,6 +236,7 @@
 
                 var btn = $("#studentFormSearch");
                 btn.on('click', function () {
+                    studentIdClick = "";
                     studentTable.reload({
                         where: getParam_s(),
                         page: {
@@ -258,12 +249,19 @@
             initToolBar:function(){
                 toolbar = {
                     exportDocument: function () {
-                        var handsOnIdNew = $("select[name='handsOnId']").val();
-                        handsOnIdNew = $.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew;
-                        var url = '/jlw/studentHandsOnTaskStep/excel/export.do?teacherOpenCourseId='+teacherOpenCourseId+'&handsOnId='+handsOnIdNew;
-
-                        Common.openConfirm("确认要导出课程实操存档详情?", function (index) {
-                            $.downFile(Common.ctxPath + url,'课程实操存档详情');
+                        Common.openConfirm("确认要导出-实训操作步骤平均得分信息?", function (index) {
+                            var url = '/jlw/studentHandsOnTaskStep/excel/export.do';
+                            let value = "";
+                            let param = getParam(studentIdClick);
+                            for(let k in param) {
+                                if(!$.isEmpty(param[k])){
+                                    value+='&'+k+"="+param[k];
+                                }
+                            }
+                            if(!$.isEmpty(value)){
+                                url = url +"?" + value.slice(1);
+                            }
+                            $.downFile(Common.ctxPath + url,'实训操作步骤平均得分表');
                             layer.close(index);
                         })
                     },
@@ -299,12 +297,20 @@
                 }
             })
         };
+        function getParam(studentId) {
+            var param = $("#searchForm").serializeJson();
+            param.teacherOpenCourseId = teacherOpenCourseId;
+            param.studentId = studentId;
+            param.handsOnId = $.isEmpty(param.handsOnId)?handsOnId:param.handsOnId
+            return param;
+        }
         function getParam_s(){
+            var handsOnIdSelect = $("select[name='handsOnId']").val();
             var param = {
                 "classId":$("#studentForm select[name='classId']").val(),
-                "studentName":$("#studentForm input[name='studentOrName']").val(),
-                'teacherOpenCourseId': teacherOpenCourseId,
-                "handsOnId": handsOnId
+                "studentOrName":$("#studentForm input[name='studentOrName']").val(),
+                "handsOnId": $.isEmpty(handsOnIdSelect)?handsOnId:handsOnIdSelect,
+                "type":4
             };
 
             return param
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html
index 0b252408..201747a3 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html
@@ -72,6 +72,7 @@
 
         var handsOnId = $("input[name='handsOnId']").val();
         var teacherOpenCourseId=$("input[name='teacherOpenCourseId']").val();
+        var studentIdClick = "";
 
         var data = [];
 
@@ -112,7 +113,7 @@
                     ,page : Lib.tablePage // 开启分页
                     /*  ,toolbar: '#toolbar_teacherOpenCourseQuestionLog' //自定义头部左侧工具栏
                       ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
-                    ,where:{'teacherOpenCourseId':teacherOpenCourseId, 'handsOnId':handsOnId}
+                    ,where:getParam()
                     ,limit : 10,
                     cols : [ [ // 表头
                         {
@@ -201,11 +202,8 @@
                             field: 'studentName',
                             title: '姓名', align: "center"
                         }, {
-                            field: 'sumStudentScore',
-                            title: '得分', align: "center",
-                            templet:function (d) {
-                                return '0'
-                            }
+                            field: 'sumScore',
+                            title: '得分', align: "center"
                         }
                     ]]
                 });
@@ -224,13 +222,8 @@
                     $(".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,
-                        'teacherOpenCourseId':teacherOpenCourseId,
-                        'handsOnId':$.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew
-                    };
-
+                    studentIdClick = data.studentId;
+                    var param= getParam(studentIdClick)
                     studentHandsOnTaskTheoryTable.reload({
                         where: param,
                         page: {
@@ -246,12 +239,9 @@
 
                 var btn_s = $("#searchFormSearch");
                 btn_s.on('click', function () {
-                    var data = $("#searchForm").serializeJson();
-                    var handsOnIdNew = $("select[name='handsOnId']").val();
-                    data.handsOnId = $.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew;
-                    data.teacherOpenCourseId=teacherOpenCourseId;
+                    var param = getParam(studentIdClick);
                     studentHandsOnTaskTheoryTable.reload({
-                        where: data,
+                        where: param,
                         page: {
                             curr: 1
                         }
@@ -260,6 +250,7 @@
 
                 var btn = $("#studentFormSearch");
                 btn.on('click', function () {
+                    studentIdClick = "";
                     studentTable.reload({
                         where: getParam_s(),
                         page: {
@@ -272,12 +263,19 @@
             initToolBar:function(){
                 toolbar = {
                     exportDocument: function () {
-                        var handsOnIdNew = $("select[name='handsOnId']").val();
-                        handsOnIdNew = $.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew;
-                        var url = '/jlw/studentHandsOnTaskTheory/excel/export.do?teacherOpenCourseId='+teacherOpenCourseId+'&handsOnId='+handsOnIdNew;
-
-                        Common.openConfirm("确认要导出课程实操存档详情?", function (index) {
-                            $.downFile(Common.ctxPath + url,'课程实操存档详情');
+                        Common.openConfirm("确认要导出-理论测评平均得分信息?", function (index) {
+                            var url = "/jlw/studentHandsOnTaskTheory/excel/export.do";
+                            let value = "";
+                            let param = getParam(studentIdClick);
+                            for(let k in param) {
+                                if(!$.isEmpty(param[k])){
+                                    value+='&'+k+"="+param[k];
+                                }
+                            }
+                            if(!$.isEmpty(value)){
+                                url = url +"?" + value.slice(1);
+                            }
+                            $.downFile(Common.ctxPath + url,'理论测评平均得分表');
                             layer.close(index);
                         })
                     },
@@ -313,12 +311,20 @@
                 }
             })
         };
+        function getParam(studentId) {
+            var param = $("#searchForm").serializeJson();
+            param.teacherOpenCourseId = teacherOpenCourseId;
+            param.studentId = studentId;
+            param.handsOnId = $.isEmpty(param.handsOnId)?handsOnId:param.handsOnId
+            return param;
+        }
         function getParam_s(){
+            var handsOnIdSelect = $("select[name='handsOnId']").val();
             var param = {
                 "classId":$("#studentForm select[name='classId']").val(),
-                "studentName":$("#studentForm input[name='studentOrName']").val(),
-                'teacherOpenCourseId': teacherOpenCourseId,
-                "handsOnId": handsOnId
+                "studentOrName":$("#studentForm input[name='studentOrName']").val(),
+                "handsOnId": $.isEmpty(handsOnIdSelect)?handsOnId:handsOnIdSelect,
+                "type":3
             };
 
             return param
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html
index 5bb6c79e..34176cbd 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html
@@ -72,6 +72,7 @@
 
         var handsOnId = $("input[name='handsOnId']").val();
         var teacherOpenCourseId=$("input[name='teacherOpenCourseId']").val();
+        var studentIdClick = "";//左侧点击学生列的id
 
         var data = [];
 
@@ -111,8 +112,9 @@
                     url: Common.ctxPath + '/api/studentHandsOnTaskVideo/getPageList.do' // 数据接口
                     ,page : Lib.tablePage // 开启分页
                     /*  ,toolbar: '#toolbar_teacherOpenCourseQuestionLog' //自定义头部左侧工具栏
-                      ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
-                    ,where:{'teacherOpenCourseId':teacherOpenCourseId}
+                      ,defaultToolbar14
+                      +466: ['filter', 'print', 'exports'] //头部右侧工具栏*/
+                    ,where:getParam()
                     ,limit : 10,
                     cols : [ [ // 表头
                         {
@@ -144,8 +146,7 @@
                         }
                     ] ]
                 });
-                let param = getParam_s();
-                param.handsOnId = handsOnId;
+
                 studentTable = table.render({
                     elem: '#studentTable',
                     height: Lib.getTableHeight(),
@@ -153,7 +154,7 @@
                     method: 'get',
                     even: true,
                     // skin:'nob',
-                    where:param,
+                    where:getParam_s(),
                     size: "sm",
                     url: Common.ctxPath + '/api/teacherOpenCourseHandsOnSimulationTasks/getStudentScore.do' // 数据接口
                     ,parseData: function(res){ //res 即为原始返回的数据
@@ -198,13 +199,8 @@
                     $(".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,
-                        'teacherOpenCourseId':teacherOpenCourseId,
-                        'handsOnId':$.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew
-                    };
-
+                    studentIdClick = data.studentId;
+                    var param = getParam(studentIdClick)
                     studentHandsOnTaskVideoTable.reload({
                         where: param,
                         page: {
@@ -220,12 +216,8 @@
 
                 var btn_s = $("#searchFormSearch");
                 btn_s.on('click', function () {
-                    var data = $("#searchForm").serializeJson();
-                    var handsOnIdNew = $("select[name='handsOnId']").val();
-                    data.handsOnId = $.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew;
-                    data.teacherOpenCourseId=teacherOpenCourseId;
                     studentHandsOnTaskVideoTable.reload({
-                        where: data,
+                        where: getParam(studentIdClick),
                         page: {
                             curr: 1
                         }
@@ -234,6 +226,7 @@
 
                 var btn = $("#studentFormSearch");
                 btn.on('click', function () {
+                    studentIdClick = "";
                     studentTable.reload({
                         where: getParam_s(),
                         page: {
@@ -246,12 +239,19 @@
             initToolBar:function(){
                 toolbar = {
                     exportDocument: function () {
-                        var handsOnIdNew = $("select[name='handsOnId']").val();
-                        handsOnIdNew = $.isEmpty(handsOnIdNew)?handsOnId:handsOnIdNew;
-                        var url = '/jlw/studentHandsOnTaskVideo/excel/export.do?teacherOpenCourseId='+teacherOpenCourseId+'&handsOnId='+handsOnIdNew;
-
-                        Common.openConfirm("确认要导出课程实操存档详情?", function (index) {
-                            $.downFile(Common.ctxPath + url,'课程实操存档详情');
+                        Common.openConfirm("确认要导出-视频平均得分信息?", function (index) {
+                            let value = "";
+                            let param = getParam(studentIdClick);
+                            var url = "/jlw/studentHandsOnTaskVideo/excel/export.do";
+                            for(let k in param) {
+                                if(!$.isEmpty(param[k])){
+                                    value+='&'+k+"="+param[k];
+                                }
+                            }
+                            if(!$.isEmpty(value)){
+                                url = url +"?" + value.slice(1);
+                            }
+                            $.downFile(Common.ctxPath + url,'视频平均得分表');
                             layer.close(index);
                         })
                     },
@@ -287,11 +287,19 @@
                 }
             })
         };
+        function getParam(studentId) {
+            var param = $("#searchForm").serializeJson();
+            param.teacherOpenCourseId = teacherOpenCourseId;
+            param.studentId = studentId;
+            param.handsOnId = $.isEmpty(param.handsOnId)?handsOnId:param.handsOnId;
+            return param;
+        }
         function getParam_s(){
+            var handsOnIdSelect = $("select[name='handsOnId']").val();
             var param = {
                 "classId":$("#studentForm select[name='classId']").val(),
-                "studentName":$("#studentForm input[name='studentOrName']").val(),
-                'teacherOpenCourseId': teacherOpenCourseId,
+                "studentOrName":$("#studentForm input[name='studentOrName']").val(),
+                "handsOnId":$.isEmpty(handsOnIdSelect)? handsOnId : handsOnIdSelect,
                 'type':1
             };