From 754a8f11baa8af1e8a71cd6beeb5ef3657694253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Thu, 15 Jun 2023 02:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/js/lib.js       |  5 +++--
 .../static/js/jlw/resourcesInfo/add.js        | 19 ++++++++++++++-----
 .../static/js/jlw/resourcesInfo/index.js      | 11 ++++++-----
 .../templates/jlw/resourcesInfo/add.html      | 16 +++-------------
 .../templates/jlw/resourcesInfo/index.html    |  2 +-
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/admin-core/src/main/resources/static/js/lib.js b/admin-core/src/main/resources/static/js/lib.js
index 2e5ed1fd..7cdbfad6 100644
--- a/admin-core/src/main/resources/static/js/lib.js
+++ b/admin-core/src/main/resources/static/js/lib.js
@@ -947,7 +947,7 @@ var Lib = {
             }
         });
         return editor;
-    },getCourseInfo:function (key,courseInfoParentId,courseInfoType,sourceType,resourcesQuestionIdsIsNotNull){ //根据归属课程id查询下级所有章节并返显key
+    },getCourseInfo:function (key,courseInfoParentId,courseInfoType,sourceType,resourcesQuestionIdsIsNotNull,value){ //根据归属课程id查询下级所有章节并返显key
         var htm = '<option value="">请选择</option>';
         if(!$.isEmpty(courseInfoParentId)){
             var paras = {
@@ -956,7 +956,7 @@ var Lib = {
                 sourceType:sourceType
             }
             if(!$.isEmpty(resourcesQuestionIdsIsNotNull)){
-                // paras.resourcesQuestionIdsIsNotNull = resourcesQuestionIdsIsNotNull;
+                 paras.resourcesQuestionIdsIsNotNull = resourcesQuestionIdsIsNotNull;
             }else {
                 //paras.courseInfoStatus = 1;
             }
@@ -969,6 +969,7 @@ var Lib = {
         }
         $(key).empty();
         $(key).append(htm);
+        $(key).find("option[value='"+value+"']").attr("selected",true);
         layui.form.render();
     },getUniversitiesColleges:function (key){ //获取院校
         var ret = Common.getAjax("/jlw/universitiesColleges/getValues.json",{universitiesCollegesStatus: 1});
diff --git a/web/src/main/resources/static/js/jlw/resourcesInfo/add.js b/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
index 6a3d85f9..85e3a214 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
+++ b/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
@@ -1,17 +1,29 @@
-layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi','layedit' ], function(exports) {
+layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi','layedit','laytpl'], function(exports) {
     var form = layui.form;
     var resourcesInfoApi = layui.resourcesInfoApi;
     var index = layui.index;
     var element = layui.element;
     var upload = layui.upload;
     var layedit = layui.layedit;
+    var laytpl  = layui.laytpl ;
+
+    var courseInfoContent_ = layedit.build('resourcesInfoContent',{height: 400});
+    var courseId = $("select[name='courseInfoId_0']").val();//课程ID
+    var chapterId = $("select[name='courseInfoId_1']").val();//章ID
+    var courseInfoId = $("select[name='courseInfoId_2']").val();//节ID
+    var sourceType = $("select[name='courseInfoId_0']").find('option:selected').attr("status");
+    var childValue = $("#courseInfoId_1").val();
+    var childChildValue = $("#courseInfoId_2").val();
+
     layedit.set({ //富文本上传图片
         uploadImage: {
             url: Common.ctxPath + "/jlw/file/update.do",
             imgUrl:Common.ctxPath
         }
     });
-    var courseInfoContent_ = layedit.build('resourcesInfoContent',{height: 400});
+
+    Lib.getCourseInfo($("select[name='courseInfoId_1']"),courseId,2,sourceType,'',childValue);//key,courseInfoParentId,courseInfoType,sourceType,resourcesQuestionIdsIsNotNull
+    Lib.getCourseInfo($("select[name='courseInfoId_2']"),childValue,3,sourceType,'',childChildValue);//key,courseInfoParentId,courseInfoType,sourceType,resourcesQuestionIdsIsNotNull
 
     var view = {
         init:function(){
@@ -21,9 +33,6 @@ layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi',
         initSubmit:function(){
             $("#addButton").click(function(){
                  form.on('submit(form)', function(){
-                     var courseId = $("select[name='courseInfoId_0']").val();//课程ID
-                     var chapterId = $("select[name='courseInfoId_1']").val();//章ID
-                     var courseInfoId = $("select[name='courseInfoId_2']").val();//节ID
                      var resourcesInfoId = $("input[name='resourcesInfoId']").val();
                      var resourcesInfoType = $("select[name='resourcesInfoType']").val(); // 资源类型(详细见数据字典，resources_info_type)
                      var sourceType = 2;
diff --git a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
index 34448d0f..56b9f247 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
+++ b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
@@ -416,7 +416,9 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         this_.append("<option value='" + v.courseInfoId + "'>" + v.courseInfoName + "</option>");
                     });
                 }
-                selectMap[obj.value] = this_.html();
+                let htm = "<select lay-filter='select_courseInfoIds_1'>";
+                htm += this_.html()+ "</select>";
+                selectMap[obj.value] = htm;
             }
 
         }
@@ -442,10 +444,10 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         this_.append("<option value='" + v.courseInfoId + "'>" + v.courseInfoName + "</option>");
                     });
                 }
-                selectMap[obj.value] = this_.html();
+                let htm = "<select lay-filter='select_courseInfoIds_2'>";
+                htm += this_.html()+ "</select>";
+                selectMap[obj.value] = htm;
             }
-
-
         }
         form.render();
     });
@@ -470,7 +472,6 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
             }, function () {
                 if (ret.code == 0) {
                     Lib.tableRefresh();
-                    layer.close(index);
                 }
             });
         }
diff --git a/web/src/main/resources/templates/jlw/resourcesInfo/add.html b/web/src/main/resources/templates/jlw/resourcesInfo/add.html
index 5a817ae9..a4052ac3 100644
--- a/web/src/main/resources/templates/jlw/resourcesInfo/add.html
+++ b/web/src/main/resources/templates/jlw/resourcesInfo/add.html
@@ -16,7 +16,7 @@
                 <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true", "defaultValue":courseInfoId}) {} -->
 
                 <!--#}else{ -->
-                <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "理论课程类", "defaultValue":courseInfoId}) {} -->
+                <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "理论课程类,开课课程类", "defaultValue":courseInfoId}) {} -->
                 <!--#} -->
             </div>
         </div>
@@ -25,15 +25,10 @@
         <div class="layui-form-item">
             <label class="layui-form-label">归属章节：</label>
             <div class="layui-input-block" style="width: 400px;">
-                <!--#if(courseInfoId != null){-->
-                <layui:simpleDictSelect style='layui-input-inline' value="${twoChildNode}"
-                                        type="course_info.course_info_name.course_info_status=1,course_info_type=2,course_info_parent_id=${courseInfoId}"
-                                        id="courseInfoId1" name="courseInfoId_1" layFilter="select_courseInfoIds_1"/>
-                <!--#}else{-->
+                <input type="hidden" id="courseInfoId_1" value="${twoChildNode}"/>
                 <select name="courseInfoId_1" lay-filter="select_courseInfoIds_1">
                     <option value="">请选择</option>
                 </select>
-                <!--#}-->
             </div>
         </div>
     </div>
@@ -41,15 +36,10 @@
         <div class="layui-form-item">
             <label class="layui-form-label">归属小节：</label>
             <div class="layui-input-block" style="width: 400px;">
-                <!--#if(twoChildNode != null){-->
-                <layui:simpleDictSelect style='layui-input-inline' value="${threeChildNode}"
-                                        type="course_info.course_info_name.course_info_status=1,course_info_type=3,course_info_parent_id=${twoChildNode}"
-                                        id="courseInfoId2" name="courseInfoId_2"/>
-                <!--#}else{-->
+                <input type="hidden" id="courseInfoId_2" value="${threeChildNode}">
                 <select name="courseInfoId_2">
                     <option value="">请选择</option>
                 </select>
-                <!--#}-->
             </div>
         </div>
     </div>
diff --git a/web/src/main/resources/templates/jlw/resourcesInfo/index.html b/web/src/main/resources/templates/jlw/resourcesInfo/index.html
index d39ab841..4adb0e10 100644
--- a/web/src/main/resources/templates/jlw/resourcesInfo/index.html
+++ b/web/src/main/resources/templates/jlw/resourcesInfo/index.html
@@ -110,7 +110,7 @@
 
 <table id="resourcesInfoTable" lay-filter="resourcesInfoTable"></table>
 
-<input type="hidden" id="isUser" value="${user.get().isAdmin}"/>
+<input type="hidden" id="isAdmin" value="${user.get().isAdmin}"/>
 <div id="bindingCourseInfo_dialog" class="layui-form" style="display: none;padding: 20px 20px 0;">
     <div class="layui-row">
         <div class="layui-form-item">