From d748c3f50d1574dc5a6fd50c91b7a233cafcdaaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Mon, 26 Dec 2022 05:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/js/admin/user/index.js | 1 + .../main/resources/templates/admin/org/add.html | 2 +- .../resources/templates/admin/user/index.html | 11 ++++++----- .../resources/static/js/jlw/courseInfo/add.js | 11 +++++++---- .../static/js/jlw/courseInfo/courseInfoApi.js | 12 ++++++++---- .../resources/static/js/jlw/handsOn/index.js | 4 ++-- .../js/jlw/resourcesApplicationCourse/index.js | 4 +++- .../resources/templates/jlw/courseInfo/add.html | 17 +++++++++-------- 8 files changed, 37 insertions(+), 25 deletions(-) diff --git a/admin-console/src/main/resources/static/js/admin/user/index.js b/admin-console/src/main/resources/static/js/admin/user/index.js index f971e809..19d6d90d 100644 --- a/admin-console/src/main/resources/static/js/admin/user/index.js +++ b/admin-console/src/main/resources/static/js/admin/user/index.js @@ -116,6 +116,7 @@ layui.define(['form', 'transfer', 'table', 'userApi', 'tree', "laytpl"], functio } layer.closeAll("loading"); $("#tableInfo").show(); + $("#editOrg").hide(); loadOrg(); return false; }); diff --git a/admin-console/src/main/resources/templates/admin/org/add.html b/admin-console/src/main/resources/templates/admin/org/add.html index ab7a3b1c..1967685a 100644 --- a/admin-console/src/main/resources/templates/admin/org/add.html +++ b/admin-console/src/main/resources/templates/admin/org/add.html @@ -21,7 +21,7 @@
-
+
diff --git a/admin-console/src/main/resources/templates/admin/user/index.html b/admin-console/src/main/resources/templates/admin/user/index.html index 49431a9e..d7f025e7 100644 --- a/admin-console/src/main/resources/templates/admin/user/index.html +++ b/admin-console/src/main/resources/templates/admin/user/index.html @@ -61,15 +61,16 @@
- - + +
+ +
+
{{#}}} - -
diff --git a/web/src/main/resources/static/js/jlw/courseInfo/add.js b/web/src/main/resources/static/js/jlw/courseInfo/add.js index 7c9c953e..99ab85ea 100644 --- a/web/src/main/resources/static/js/jlw/courseInfo/add.js +++ b/web/src/main/resources/static/js/jlw/courseInfo/add.js @@ -1,8 +1,9 @@ -layui.define([ 'form', 'laydate', 'table','courseInfoApi'], function(exports) { +layui.define([ 'form', 'laydate', 'table','courseInfoApi',"layedit"], function(exports) { var form = layui.form; var courseInfoApi = layui.courseInfoApi; var index = layui.index; var transfer = layui.transfer; + var layedit = layui.layedit; // var resourcesApplicationIds = $("input[name='resourcesApplicationIds']").val(); // if(!$.isEmpty(resourcesApplicationIds)){ @@ -41,7 +42,7 @@ layui.define([ 'form', 'laydate', 'table','courseInfoApi'], function(exports) { // }else { // layer.msg(ret.msg); // } - + var courseInfoContent_ = layedit.build('courseInfoContent',{height:100}); //题干 var view = { init:function(){ Lib.initGenrealForm($("#addForm"),form); @@ -51,18 +52,20 @@ layui.define([ 'form', 'laydate', 'table','courseInfoApi'], function(exports) { $("#addButton").click(function(){ form.on('submit(form)', function(){ var courseInfoId = $("#addForm input[name='courseInfoId']").val(); + var courseInfoContent = layedit.getContent(courseInfoContent_); + var param={'courseInfoContent':courseInfoContent}; if($.isEmpty(courseInfoId)){ courseInfoApi.addCourseInfo($('#addForm'),function(){ parent.window.dataReload(); Common.info("添加成功"); Lib.closeFrame(); - }); + },param); }else { courseInfoApi.updateCourseInfo($('#addForm'),function(){ parent.Lib.tableRefresh(); Common.info("编辑成功！"); Lib.closeFrame(); - }); + },param); } }); }); diff --git a/web/src/main/resources/static/js/jlw/courseInfo/courseInfoApi.js b/web/src/main/resources/static/js/jlw/courseInfo/courseInfoApi.js index 5f34075f..e67f6609 100644 --- a/web/src/main/resources/static/js/jlw/courseInfo/courseInfoApi.js +++ b/web/src/main/resources/static/js/jlw/courseInfo/courseInfoApi.js @@ -1,11 +1,15 @@ /*访问后台的代码*/ layui.define([], function(exports) { var api={ - updateCourseInfo:function(form,callback){ - Lib.submitForm("/jlw/courseInfo/edit.json",form,{},callback) + updateCourseInfo:function(form,callback,paras){ + Lib.submitForm("/jlw/courseInfo/edit.json",form,paras,callback) }, - addCourseInfo:function(form,callback){ - Lib.submitForm("/jlw/courseInfo/add.json",form,{},callback) + addCourseInfo:function(form,callback,paras){ + var formPara = form.serializeJson(); + for (var key in paras) { + formPara[key] = paras[key]; + } + Lib.submitForm("/jlw/courseInfo/add.json",form,paras,callback) }, del:function(ids,callback){ Common.post("/jlw/courseInfo/delete.json",{"ids":ids},function(){ diff --git a/web/src/main/resources/static/js/jlw/handsOn/index.js b/web/src/main/resources/static/js/jlw/handsOn/index.js index 8c6873af..df22e5b3 100644 --- a/web/src/main/resources/static/js/jlw/handsOn/index.js +++ b/web/src/main/resources/static/js/jlw/handsOn/index.js @@ -44,11 +44,11 @@ layui.define(['form', 'laydate', 'table'], function (exports) { hideField: false, hide: $.isEmpty(sx_['handsOnName']) ? false : sx_['handsOnName'], }, { - field: 'courseInfoId', + field: 'courseInfoIdText', title: '归属课程', align: "center" }, { - field: 'courseChildNode', + field: 'courseChildNodeText', title: '归属章节', align: "center" }, { field: 'addTime', diff --git a/web/src/main/resources/static/js/jlw/resourcesApplicationCourse/index.js b/web/src/main/resources/static/js/jlw/resourcesApplicationCourse/index.js index bc026483..6baf0a83 100644 --- a/web/src/main/resources/static/js/jlw/resourcesApplicationCourse/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesApplicationCourse/index.js @@ -63,7 +63,9 @@ layui.define(['form', 'laydate', 'table'], function (exports) { // html字符串转对象，深拷贝操作，相当于每行copy一个下拉框进行回显选中操作 var copyHtml = $($('#select_resourcesApplicationIds').html()) // 兼容之前的一对多关系 - copyHtml.find("option[value="+d.resourcesApplicationIds.split(',')[0]+"]").attr("selected", true); + if(!$.isEmpty(d.resourcesApplicationIds)){ + copyHtml.find("option[value="+d.resourcesApplicationIds.split(',')[0]+"]").attr("selected", true); + } return copyHtml.html(); } }, diff --git a/web/src/main/resources/templates/jlw/courseInfo/add.html b/web/src/main/resources/templates/jlw/courseInfo/add.html index 9e73418a..2775fa12 100644 --- a/web/src/main/resources/templates/jlw/courseInfo/add.html +++ b/web/src/main/resources/templates/jlw/courseInfo/add.html @@ -90,26 +90,26 @@
-
+ +<!– –> - - - +<!–
–> +<!–
–> +<!–
–>
-
+
-->
-
- +
+
@@ -123,6 +123,7 @@ layui.use(['add','upload'], function(){ var courseInfoAdd = layui.add; var upload = layui.upload; + courseInfoAdd.init(); //上传LOGO upload.render({