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

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

@@ -68,7 +68,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         width: 260,
                         templet: function (d) {
                             var htm = '<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>';
-                            htm += '<a class="layui-table-link" lay-event="down" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>';
+                            htm += '<a class="layui-table-link" lay-event="drown" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>';
                             htm += '<a class="layui-table-link" lay-event="edit">编辑</a>';
                             htm += '<a class="layui-table-link" lay-event="addTask">添加任务</a>';
                             htm += '<a class="layui-table-link" lay-event="del">删除</a>';
@@ -107,6 +107,22 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                     Lib.doSearchForm($("#searchForm"), handsOnTable, 1);
                     view.initToolBar()
                 },
+                allDel:function(){
+                    layui.use(['del'], function () {
+                        var delView = layui.del;
+                        delView.delBatch();
+                    });
+                },
+                up:function () {
+                    var data = Common.getMoreDataFromTable(table,"handsOnTable");
+                    var ids = Common.concatBatchId(data, "handsOnId");
+                    upDrown(1,ids);
+                },
+                drown:function () {
+                    var data = Common.getMoreDataFromTable(table,"handsOnTable");
+                    var ids = Common.concatBatchId(data, "handsOnId");
+                    upDrown(0,ids);
+                }
             }
             //触发事件
             $('.ext-toolbar').on('click', function () {
@@ -137,22 +153,36 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                 });
             } else if (obj.event === "addTask") {
                 var url = "/jlw/handsOnSimulationTasks/add.do?bussiness_id=" + data.handsOnId;
-                Common.openDlg(url, "HandsOnSimulationTasks管理>" + data.handsOnId + ">编辑");
+                Common.openDlg(url, "课程实训案例管理>新增课程实训案例>添加实训任务");
             }else if (obj.event === "up") {
-                alert('up')
+                upDrown(1,data.handsOnId);
-            } else if (obj.event === "down") {
+            } else if (obj.event === "drown") {
-                alert('down')
+                upDrown(0,data.handsOnId);
             }
         })
     };
+    function upDrown(status,ids){
+        layer.confirm(status == 1?'是否确定上架？':'是否确定下架？', function (index) {
+            var ret = Common.postAjax(status == 1?"/xx.json":"/dd.json", {ids: ids});
+            layer.msg(ret.code == 0 ? "下架成功！" : ret.msg, {
+                offset: ['50%'],
+                icon: ret.code == 0 ? 1 : 2,
+                time: 1500 //2秒关闭（如果不配置，默认是3秒）
+            }, function () {
+                if (ret.code == 0) {
+                    Lib.tableRefresh();
+                }
+            });
+        });
+    };
     //选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节
     form.on('select(select_courseInfoIds)', function (obj) {
-        Lib.getCourseInfo($("select[name='courseInfoId_1']"), obj.value, 1);
+        Lib.getCourseInfo($("select[name='courseInfoId']"), obj.value, 1);
     });
 
     //选择归属课程 并且根据选择的课程查询章节
     form.on('select(select_courseInfoIds_)', function (obj) {
-        Lib.getCourseInfo($("select[name='courseInfoId_2']"), obj.value);
+        Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value);
     });
     exports('index', view);
 

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

@@ -86,6 +86,11 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                 },
                 search: function () {
                     Lib.doSearchForm($("#searchForm"), resourcesCompetitionTable, 1);
+                },allDel:function(){
+                    layui.use(['del'], function () {
+                        var delView = layui.del;
+                        delView.delBatch();
+                    });
                 }
             };
             $('.ext-toolbar').on('click', function () {

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

@@ -88,7 +88,13 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                 },
                 search: function () {
                     Lib.doSearchForm($("#searchForm"), resourcesTrainingTable, 1);
-                }
+                },
+                allDel:function(){
+                    layui.use(['del'], function () {
+                        var delView = layui.del;
+                        delView.delBatch();
+                    });
+                },
             };
             $('.ext-toolbar').on('click', function () {
                 var type = $(this).data('type');

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

@@ -14,7 +14,7 @@
         <div class="layui-input-inline">
             <layui:simpleDictSelect style='layui-input-inline'
                                     type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
-                                    id="courseInfoIds" name="courseInfoId_0"
+                                    id="courseInfoId" name="courseInfoId"
                                     layFilter="select_courseInfoIds"/>
         </div>
     </div>
@@ -23,7 +23,7 @@
         <div class="layui-input-block">
             <layui:simpleDictSelect style='layui-input-inline'
                                     type="course_info.course_info_name.course_info_status=1,course_info_type=2"
-                                    id="courseInfoId1" name="courseInfoId_1" layFilter="select_courseInfoIds_"/>
+                                    id="courseChildNode" name="courseChildNode" layFilter="select_courseInfoIds_"/>
         </div>
     </div>
     <div class="layui-inline">
@@ -48,7 +48,7 @@
             class="layui-icon">&#xe640;</i>批量删除</layui:accessButton>
     <layui:accessButton function="handsOn.query"  action="up" class="layui-btn-warm"><i
             class="iconfont">&#xebcb;</i>批量上架</layui:accessButton>
-    <layui:accessButton function="handsOn.query"  action="down" class="layui-btn-warm"><i
+    <layui:accessButton function="handsOn.query"  action="drown" class="layui-btn-warm"><i
             class="iconfont">&#xebcc;</i>批量下架</layui:accessButton>
 <!--    <layui:accessButton function="handsOn.query"  action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>-->
 </div>