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 @@