修改bug

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

@@ -124,11 +124,11 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         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");
-                        Common.info("只能 '删除' 院校添加的课程实训案例");
+                        Common.info("禁止 '删除' 院校添加的课程实训案例");
                     }
                 } else {
                     var isFalse = true;

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

@@ -241,8 +241,16 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
 
             table.on('checkbox(resourcesInfoTable)', function (obj) {
                 var resourcesInfo = obj.data;
+                var btnAllDel = $("#table-button-allDel");
                 if (obj.checked) {
                     //按钮逻辑Lib.buttonEnable()
+                    if(isAdmin && (resourcesQuestion.addType == "FACULTY_ADD"||resourcesQuestion.sourceType == '1')){
+                        btnAllDel.addClass("button-disabled");
+                        Common.info("禁止 '删除 院校添加的试题");
+                    }else if(!isAdmin && (resourcesQuestion.addType == "ADMIN_ADD"||resourcesQuestion.sourceType == '2')){
+                        btnAllDel.addClass("button-disabled");
+                        Common.info("禁止 '删除 系统内置的试题");
+                    }
                 } else {
 
                 }

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

@@ -102,10 +102,31 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
 
             table.on('checkbox(resourcesQuestionTable)', function (obj) {
                 var resourcesQuestion = obj.data;
+                var btnAllDel = $("#table-button-allDel");
                 if (obj.checked) {
                     //按钮逻辑Lib.buttonEnable()
+                    if(isAdmin && (resourcesQuestion.addType == "FACULTY_ADD"||resourcesQuestion.sourceType == '1')){
+                        btnAllDel.addClass("button-disabled");
+                        Common.info("禁止 '删除 院校添加的试题");
+                    }else if(!isAdmin && (resourcesQuestion.addType == "ADMIN_ADD"||resourcesQuestion.sourceType == '2')){
+                        btnAllDel.addClass("button-disabled");
+                        Common.info("禁止 '删除 系统内置的试题");
+                    }
                 } else {
-
+                    var isFalse = true;
+                    var data = Common.getMoreDataFromTable(table, "resourcesQuestionTable");//获取当前选中的数据
+                    if(!$.isEmpty(data)){
+                        data.forEach(function (value, index) {
+                            if(isAdmin && (value.addType == "FACULTY_ADD"||value.sourceType == '1')){
+                                isFalse = false;
+                            }else if(!isAdmin && (value.addType == "ADMIN_ADD"||value.sourceType == '2')){
+                                isFalse = false;
+                            }
+                        })
+                    }
+                    if(isFalse){
+                        btnAllDel.removeClass("button-disabled");
+                    }
                 }
             })
         },

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

@@ -135,6 +135,10 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         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?classId=" + classId + "&studentName=" + studentName + "&studentSn=" + studentSn);
                     });
                 }

web/src/main/resources/static/js/jlw/teacher/add.js

@@ -33,6 +33,12 @@ layui.define([ 'form', 'laydate', 'table','teacherApi'], function(exports) {
         var url = "/jlw/universitySystem/add.do";
         Common.openDlg(url,"");
     });
+    //跳转院系管理
+    $(".universityFacultyAdd").click(function (){
+        sessionStorage.setItem($.getKeyInfo("teacher_tag"),($("input[name='teacherId']").val() || '-1'));
+        var url = "/jlw/universityFaculty/add.do";
+        Common.openDlg(url,"");
+    });
 
     var view = {
         init:function(){

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

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

web/src/main/resources/static/js/jlw/universityFaculty/add.js

@@ -13,12 +13,14 @@ layui.define([ 'form', 'laydate', 'table','universityFacultyApi'], function(expo
                      var universityFacultyId = $("#addForm input[name='universityFacultyId']").val();
                      if(!$.isEmpty(universityFacultyId)){
                          universityFacultyApi.updateUniversityFaculty($('#addForm'),function(){
+                             window.parent.location.reload();
                              parent.window.dataReload();
                              Common.info("更新成功");
                              Lib.closeFrame();
                          });
                      }else{
                          universityFacultyApi.addUniversityFaculty($('#addForm'),function(){
+                             window.parent.location.reload();
                              parent.window.dataReload();
                              Common.info("添加成功");
                              Lib.closeFrame();

web/src/main/resources/static/js/jlw/universitySystem/add.js

@@ -18,6 +18,7 @@ layui.define([ 'form', 'laydate', 'table','universitySystemApi'], function(expor
                      var universitySystemId = $("#addForm input[name='universitySystemId']").val();
                      if(!$.isEmpty(universitySystemId)){
                          universitySystemApi.updateUniversitySystem($('#addForm'),function(){
+                             window.parent.location.reload();//刷新上一级页面
                              parent.window.dataReload();
                              Common.info("更新成功");
                              Lib.closeFrame();
@@ -26,8 +27,10 @@ layui.define([ 'form', 'laydate', 'table','universitySystemApi'], function(expor
                          universitySystemApi.addUniversitySystem($('#addForm'),function(){
                              Common.info("添加成功");
                              if(!$.isEmpty(student_tag)){
+                                 window.parent.location.reload();//刷新上一级页面
                                  parent.load();
                              }else if(!$.isEmpty(teacher_tag)) {
+                                 window.parent.location.reload();//刷新上一级页面
                                  parent.load();
                              }else {
                                  parent.window.dataReload();

web/src/main/resources/templates/jlw/teacher/add.html

@@ -31,6 +31,7 @@
                                             layFilter="select_universityFacultyIds"/>
                 </div>
             </div>
+            <button type="button" class="layui-btn layui-btn-sm universityFacultyAdd bg_button">去添加</button>
         </div>
     </div>
     <!-- <div class="layui-row">
@@ -74,6 +75,7 @@
                                             layFilter="select_universityFacultyIds"/>
                 </div>
             </div>
+            <button type="button" class="layui-btn layui-btn-sm universityFacultyAdd bg_button">去添加</button>
         </div>
     </div>
     <!--#} -->

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

@@ -120,7 +120,7 @@
     <div class="layui-row" id="handsOnSimulationTasks" style="${teacherOpenCourseHandsOn.handsOnId != null?'':'display: none;'}">
         <div>
             <label class="layui-form-label">实操任务：</label>
-            <div class="layui-input-block" style="${!user.get().isAdmin?'':'display: none;'}">
+            <div class="layui-input-block" style="display: none;">
                 <button type="button" class="layui-btn bg_button button_add" style="float: left">
                     <i class="layui-icon">&#xe654;</i>
                 </button>