From c05883eac0d3ac2307afc632465bf5d41375a831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Thu, 22 Jun 2023 03:48:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E6=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/main/resources/static/js/jlw/handsOn/add.js  |  3 ++-
 .../static/js/jlw/teacherOpenCourseHandsOn/edit.js   |  4 ++--
 .../templates/jlw/teacherOpenCourseHandsOn/edit.html | 12 +++---------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/web/src/main/resources/static/js/jlw/handsOn/add.js b/web/src/main/resources/static/js/jlw/handsOn/add.js
index 83ea32ed..3a5a3493 100644
--- a/web/src/main/resources/static/js/jlw/handsOn/add.js
+++ b/web/src/main/resources/static/js/jlw/handsOn/add.js
@@ -26,6 +26,7 @@ layui.define(['form', 'laydate', 'table','laytpl','upload','layedit', 'handsOnAp
     }
     var handsOnId = $("input[name='handsOnId']").val();
     var courseInfoId_ = $("input[name='courseInfoId_']").val();
+    var one = layedit.build('test-editor'); //建立编辑器
     if(!$.isEmpty(handsOnId)){
         var ret = Common.getAjax("/jlw/handsOn/view.json",{handsOnId:handsOnId});
         if(ret.code == 0){
@@ -38,7 +39,7 @@ layui.define(['form', 'laydate', 'table','laytpl','upload','layedit', 'handsOnAp
             });
         }
     }
-    var one = layedit.build('test-editor'); //建立编辑器
+
     var view = {
         init: function () {
             Lib.initGenrealForm($("#addForm"), form);
diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js
index bae5e4fa..7c9c9b7a 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js
@@ -24,7 +24,7 @@ layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOp
     }
     var handsOnId = $("input[name='handsOnId']").val();
     var teacherOpenCourseId = $("input[name='teacherOpenCourseId']").val();
-
+    var one = layedit.build('test-editor'); //建立编辑器
     if(!$.isEmpty(handsOnId)){
         var ret = Common.getAjax("/jlw/handsOn/view.json",{handsOnId:handsOnId});
         if(ret.code == 0){
@@ -62,7 +62,7 @@ layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOp
     form.on('select(select_courseInfoIds)', function (obj) {
         let sourceType = $("select[name='courseInfoId']").find('option:selected').attr("status");
         let courseInfoType = 2;//courseInfoType（2 章节，3 节）
-        Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value,courseInfoType,sourceType, 1);
+        Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value,courseInfoType,sourceType);
     });
 
     $(".button_add").click(() => {
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html
index 9220585d..cf17926b 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html
@@ -11,7 +11,7 @@
     <div class="layui-row" style="margin: 0 auto;">
         <a class="layui-btn layui-btn-primary" id="addButton-cancel" style="margin-bottom: 10px;padding: 0 30px;">返回</a>
         <a class="layui-btn bg_button" id="addButton"
-           style="${user.get().isAdmin ? 'margin-bottom: 10px;padding: 0 28px;':'display: none;'}">确定</a>
+           style="${!user.get().isAdmin ? 'margin-bottom: 10px;padding: 0 28px;':'display: none;'}">确定</a>
     </div>
     <div class="layui-row">
         <div class="layui-form-item">
@@ -21,13 +21,7 @@
                                         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" layFilter="select_courseInfoIds"/>-->
 
-                <!--#if(user.get().isAdmin){ -->
-                <!--#// 查询授权的课程列表。自动根据身份判断 isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
-                <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId", "id": "courseInfoId", "isShowGroupName": "true","filterName": "应用课程类,理论课程类,考证课程类","defaultValue": teacherOpenCourseHandsOn.courseInfoId}) {} -->
-
-                <!--#}else{ -->
                 <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId", "id": "courseInfoId", "isShowGroupName": "true","filterName": "理论课程类,开课类","defaultValue": teacherOpenCourseHandsOn.courseInfoId}) {} -->
-                <!--#} -->
             </div>
         </div>
     </div>
@@ -35,7 +29,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="req">*</span>归属章节：</label>
             <div class="layui-input-block" style="width: 400px;">
-                <input type="hidden" id="courseInfoId" value="${teacherOpenCourseHandsOn.courseInfoId}"/>
+                <input type="hidden" id="courseChildNode" value="${teacherOpenCourseHandsOn.courseChildNode}"/>
                 <select name="courseChildNode" lay-filter="select_courseInfoIds_1">
                     <option value="">请选择</option>
                 </select>
@@ -96,7 +90,7 @@
                             </tr>
                             </thead>
                             <tbody id="demoList">
-                            
+
                             </tbody>
                         </table>
                     </div>