课程实操-上下架

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

@@ -82,11 +82,14 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                     }, {
                         field: 'handsOnStatus', width: 80,
                         title: '状态', align: "center", templet: function (d) {
+                            //handsOnStatus:状态 （1上架， 0下架）
                             var htm = "";
                             // if(d.dataType == 'ADMIN_ADD'){
                                 htm = d.handsOnStatus === 1
-                                    ? '<span class="layui-badge layui-bg-green" style="background-color: #abd5ff !important; color: #088eed!important">已上架</span>'
-                                    : '<span class="layui-badge layui-bg-gray" style="background-color: #dadada !important; color: #6c6c6c!important">已下架</span>';
+                                    ? '<span class="layui-badge layui-bg-green" ' +
+                                    'style="background-color: #abd5ff !important; color: #088eed!important">已上架</span>'
+                                    : '<span class="layui-badge layui-bg-gray" ' +
+                                    'style="background-color: #dadada !important; color: #6c6c6c!important">已下架</span>';
                             // }
                             return htm;
                         }
@@ -98,9 +101,11 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         templet: function (d) {
                             var css = isAdmin? "" : "display: none;";
                             var htm = '<div style="text-align:left">';
-                            htm += '<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>'
-                                + '<a class="layui-table-link" lay-event="drown" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>';
-
+                            if(d.handsOnStatus === 1){
+                                htm+= '<a class="layui-table-link" lay-event="drown" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>';
+                            }else if (d.handsOnStatus === 2) {
+                                htm += '<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>';
+                            }
                            // htm += '<a class="layui-table-link" lay-event="edit"style="' + css + '">编辑</a>';
                             htm += '<a class="layui-table-link" lay-event="edit">'+ ((d.dataType == 'FACULTY_ADD' && !isAdmin)||(d.dataType == 'ADMIN_ADD' && isAdmin)?'编辑':'查看')+'</a>';
                             if((d.dataType == 'FACULTY_ADD' && !isAdmin)||(d.dataType == 'ADMIN_ADD' && isAdmin)){
@@ -116,15 +121,15 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
 
             table.on('checkbox(handsOnTable)', function (obj) {
                 var handsOn = obj.data;
-                var btnDrown = $("#table-button-drown");
-                var btnUp = $("#table-button-up" );
+               /* var btnDrown = $("#table-button-drown");
+                var btnUp = $("#table-button-up" );*/
                 var btnDell = $("#table-button-allDel" );
                 if (obj.checked) {
                     if(isAdmin && handsOn.dataType == "FACULTY_ADD"){
-                        btnDrown.addClass("button-disabled");
-                        btnUp.addClass("button-disabled");
+                        /*btnDrown.addClass("button-disabled");
+                        btnUp.addClass("button-disabled");*/
                         btnDell.addClass("button-disabled");
-                        Common.info("禁止 '删除、上/下架' 系统内置的课程实训案例");
+                        Common.info("禁止 '删除' 系统内置的课程实训案例");
                     }
                     if(!isAdmin&& handsOn.dataType == "ADMIN_ADD"){
                         btnDell.addClass("button-disabled");
@@ -209,6 +214,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                 },
                 up: function () {
                     var data = Common.getMoreDataFromTable(table, "handsOnTable");
+                    var dataType = "";
                     var isFalse = true;
                     if(!isEmpty(data) || data.length > 0){
                         data.forEach(function (value, index) {
@@ -222,15 +228,17 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                                 isFalse = false;
                                 return;
                             }
+                            dataType  =  value.dataType;
                         })
                     }
                     if(isFalse){
                         var ids = Common.concatBatchId(data, "handsOnId");
-                        upDrown(1, ids);
+                        upDrown(1, ids, dataType);
                     }
                 },
                 drown: function () {
                     var data = Common.getMoreDataFromTable(table, "handsOnTable");
+                    var dataType = "";
                     var isFalse = true;
                     if(!$.isEmpty(data)){
                         data.forEach(function (value, index) {
@@ -244,11 +252,12 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                                 isFalse = false;
                                 return;
                             }
+                            dataType  = value.dataType;
                         })
                     }
                     if(isFalse){
                         var ids = Common.concatBatchId(data, "handsOnId");
-                        upDrown(0, ids);
+                        upDrown(2, ids,dataType);
                     }
                 }
             }
@@ -295,17 +304,27 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                 }
                 Common.openDlg(url);
             } else if (obj.event === "up") {
-                upDrown("1", data.handsOnId);
+                upDrown("1",  data.handsOnId, data.dataType);
             } else if (obj.event === "drown") {
-                upDrown("2", data.handsOnId);
+                upDrown("2",  data.handsOnId, data.dataType);
             }
         })
     };
 
     //上下架
-    function upDrown(status, ids) {
+    function upDrown(status, ids, dataType) {
         layer.confirm(status == 1 ? '是否确定上架？' : '是否确定下架？', function (index) {
-            var ret = Common.postAjax('/jlw/handsOn/batchEdit.json', {handsOnIdPlural: ids, handsOnStatus: status});
+            var url = "";
+            var param = {};
+            if(dataType == 'ADMIN_ADD'){
+                param =  {handsOnIdPlural: ids, handsOnStatus: status};
+                url = '/jlw/handsOn/batchEdit.json'
+            }else if(dataType = 'FACULTY_ADD'){
+                param =  {ids: ids, status: status};
+                url = "/jlw/teacherOpenCourseHandsOn/editStatus.json"
+            }
+
+            var ret = Common.postAjax(url, param);
             layer.msg(ret.code == 0 ? "操作成功！" : ret.msg, {
                 offset: ['50%'],
                 icon: ret.code == 0 ? 1 : 2,

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

@@ -4,6 +4,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
     var table = layui.table;
     var studentTable = null;
     var isSignRole = $("input[name='isSignRole']").val();
+
     var view = {
         init: function () {
             this.initTable();
@@ -132,14 +133,18 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                 }, export: function () {//导出
                     layer.confirm('是否确定导出学生信息？', function (index) {
                         layer.close(index);
-                        var classId = $("#searchForm select[name='classId']").val(),
-                            studentName = $("#searchForm input[name='studentName']").val(),
-                            studentSn = $("#searchForm input[name='studentSn']").val();
-                        console.log(classId)
-                        console.log(studentName)
-                        console.log(studentSn)
-                        //return;
-                        $.downFile(Common.ctxPath + "/jlw/student/export.json?");
+                        var param = getParam();
+                        var url = "/jlw/student/export.json";
+                        var value = ""
+                        for(var k in param) {
+                            if(!$.isEmpty(param[k])){
+                                value+='&'+k+"="+param[k];
+                            }
+                        }
+                        if(!$.isEmpty(value)){
+                            url = url +"?" + value.slice(1);
+                        }
+                        $.downFile(Common.ctxPath +url);
                     });
                 }
             };
@@ -192,6 +197,15 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
     form.on('select(select_universityFacultyIds)', function (obj) {
         Lib.getSchoolClassByUniFac($("select[name='classId']"), obj.value);
     });
+
+    //获取检索条件（确认/取消时使用：选择学生时，传学生IDS否则传检索条件）
+    function getParam(checkStatus) {
+        var codePlural = "";
+        var param = {};
+        param = $("#searchForm").serializeJson();
+
+        return param;
+    }
     exports('index', view);
 
 });

web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js

@@ -78,7 +78,7 @@ layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOp
                         });
                     });
                     var param ={
-                        courseInfoId:courseInfoId,
+                        teacherOpenCourseId:courseInfoId,
                         courseChildNode:courseChildNode,
                         handsOnName:handsOnName,
                         handsOnRecommend:layedit.getContent(one),