diff --git a/doc/sql/mysql/tianze-pro.sql b/doc/sql/mysql/tianze-pro.sql index b597caa7..fb2278a5 100644 --- a/doc/sql/mysql/tianze-pro.sql +++ b/doc/sql/mysql/tianze-pro.sql @@ -4702,12 +4702,12 @@ CREATE TABLE `course_label` ( -- ---------------------------- -- Records of course_label -- ---------------------------- -INSERT INTO `course_label` VALUES (1, '实务课程类', '大数据基础', 1, NULL, NULL); -INSERT INTO `course_label` VALUES (2, '实务课程类', '金融大数据', 1, NULL, NULL); -INSERT INTO `course_label` VALUES (3, '实务课程类', '财会大数据', 1, NULL, NULL); -INSERT INTO `course_label` VALUES (4, '实务课程类', '商业大数据', 1, NULL, NULL); -INSERT INTO `course_label` VALUES (5, '实务课程类', '营销大数据 ', 1, NULL, NULL); -INSERT INTO `course_label` VALUES (6, '实务课程类', '未命名', 2, NULL, NULL); +INSERT INTO `course_label` VALUES (1, '应用课程类', '大数据基础', 1, NULL, NULL); +INSERT INTO `course_label` VALUES (2, '应用课程类', '金融大数据', 1, NULL, NULL); +INSERT INTO `course_label` VALUES (3, '应用课程类', '财会大数据', 1, NULL, NULL); +INSERT INTO `course_label` VALUES (4, '应用课程类', '商业大数据', 1, NULL, NULL); +INSERT INTO `course_label` VALUES (5, '应用课程类', '营销大数据 ', 1, NULL, NULL); +INSERT INTO `course_label` VALUES (6, '应用课程类', '未命名', 2, NULL, NULL); INSERT INTO `course_label` VALUES (7, '考证课程类', '未命名', 2, NULL, NULL); INSERT INTO `course_label` VALUES (8, '理论课程类', '传统金融', 1, NULL, NULL); INSERT INTO `course_label` VALUES (9, '理论课程类', '金融风险', 1, NULL, NULL); @@ -27057,11 +27057,11 @@ CREATE TABLE `resources_application` ( -- ---------------------------- -- Records of resources_application -- ---------------------------- -INSERT INTO `resources_application` VALUES (1, '大数据基础 子应用', 'http://tzcjbd.sztzjy.com/server/?resourcesApplicationId=1', '实务课程类', '1', NULL, '', '', '', '', '

大数据基础 子应用

\n', '

大数据基础 子应用

\n', NULL, NULL, '大数据基础 子应用', '大数据基础 子应用'); -INSERT INTO `resources_application` VALUES (2, '金融财经大数据分析实验平台', 'http://tzcjbd.sztzjy.com/server/?resourcesApplicationId=2', '实务课程类', '2', NULL, NULL, NULL, NULL, NULL, '

金融大数据 子应用

\n', '

金融大数据 子应用

\n', NULL, NULL, '金融大数据 子应用', '金融大数据 子应用'); -INSERT INTO `resources_application` VALUES (3, '财会大数据 子应用', 'http://tzcjbd.sztzjy.com/server/?resourcesApplicationId=3', '实务课程类', '3', NULL, NULL, NULL, NULL, NULL, '

财会大数据 子应用

\r\n', '

财会大数据 子应用

\r\n', NULL, NULL, '财会大数据 子应用', '财会大数据 子应用'); -INSERT INTO `resources_application` VALUES (4, '商业大数据 子应用', 'http://tzcjbd.sztzjy.com/server/?resourcesApplicationId=4', '实务课程类', '4', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `resources_application` VALUES (5, '营销大数据 子应用', 'http://tzcjbd.sztzjy.com/server/?resourcesApplicationId=5', '实务课程类', '5', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `resources_application` VALUES (1, '大数据基础 子应用', 'http://tzcjbd.sztzjy.com/server/?resourcesApplicationId=1', '应用课程类', '1', NULL, '', '', '', '', '

大数据基础 子应用

\n', '

大数据基础 子应用

\n', NULL, NULL, '大数据基础 子应用', '大数据基础 子应用'); +INSERT INTO `resources_application` VALUES (2, '金融财经大数据分析实验平台', 'http://tzcjbd.sztzjy.com/server/?resourcesApplicationId=2', '应用课程类', '2', NULL, NULL, NULL, NULL, NULL, '

金融大数据 子应用

\n', '

金融大数据 子应用

\n', NULL, NULL, '金融大数据 子应用', '金融大数据 子应用'); +INSERT INTO `resources_application` VALUES (3, '财会大数据 子应用', 'http://tzcjbd.sztzjy.com/server/?resourcesApplicationId=3', '应用课程类', '3', NULL, NULL, NULL, NULL, NULL, '

财会大数据 子应用

\r\n', '

财会大数据 子应用

\r\n', NULL, NULL, '财会大数据 子应用', '财会大数据 子应用'); +INSERT INTO `resources_application` VALUES (4, '商业大数据 子应用', 'http://tzcjbd.sztzjy.com/server/?resourcesApplicationId=4', '应用课程类', '4', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `resources_application` VALUES (5, '营销大数据 子应用', 'http://tzcjbd.sztzjy.com/server/?resourcesApplicationId=5', '应用课程类', '5', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); drop table if exists resources_application_course; diff --git a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java index 2a9eeaff..3ff6ff78 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java @@ -149,7 +149,7 @@ public class CourseInfoController{ if(null != courseInfoQuery.getCourseLabelId()){ CourseLabel courseLabel = courseLabelService.queryById(courseInfoQuery.getCourseLabelId()); - if(null != courseLabel && courseLabel.getCourseLabelType().contains("实务课程类") && + if(null != courseLabel && courseLabel.getCourseLabelType().contains("应用课程类") && null == courseInfoQuery.getCourseInfoParentId() && StringUtils.isBlank(courseInfoQuery.getResourcesApplicationIds())){ return JsonResult.failMessage("请选择课程归属的应用"); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java index e5860bf7..f1f9b40f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java @@ -343,7 +343,7 @@ public class ResourcesQuestionController{ CourseInfoQuery courseInfoQuery = new CourseInfoQuery(); courseInfoQuery.setCourseLabelStatus(1); - courseInfoQuery.setCourseLabelTypes("实务课程类"); + courseInfoQuery.setCourseLabelTypes("应用课程类"); courseInfoQuery.setCourseInfoType(1); courseInfoQuery.setCourseInfoStatus(1); diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java index 2229bfc2..ecabcf23 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java @@ -1397,7 +1397,7 @@ public class StudentController{ if( null == student ){ return JsonResult.failMessage("请登录后再操作"); } - Listlist = courseInfoService.getListByCourseLabelTypes("实务课程类"); + Listlist = courseInfoService.getListByCourseLabelTypes("应用课程类"); return JsonResult.success(list); } @@ -1815,7 +1815,7 @@ public class StudentController{ if( null == student ){ return JsonResult.failMessage("请登录后再操作"); } - Listlist = courseInfoService.getListByCourseLabelTypes("实务课程类"); + Listlist = courseInfoService.getListByCourseLabelTypes("应用课程类"); return JsonResult.success(list); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java index 2dafffb2..16c3f257 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java @@ -1143,7 +1143,7 @@ public class TeacherController{ @GetMapping(MODEL + "/getCourseResourcesList.json") @ResponseBody public JsonResult getCourseResourcesList(){ - Listlist = courseInfoService.getListByCourseLabelTypes("实务课程类"); + Listlist = courseInfoService.getListByCourseLabelTypes("应用课程类"); return JsonResult.success(list); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationCourseQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationCourseQuery.java index 93d4f2f2..f5b3bb77 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationCourseQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationCourseQuery.java @@ -14,11 +14,11 @@ public class ResourcesApplicationCourseQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @Query(name = "ID", display = false) private Long resourcesApplicationCourseId; - @Query(name = "应用管理ID", display = true,type=Query.TYPE_DICT,dict="resources_application.application_name.1=1") + @Query(name = "应用管理ID", display = false,type=Query.TYPE_DICT,dict="resources_application.application_name.1=1") private Long resourcesApplicationId; - @Query(name = "课程配置ID", display = true,type=Query.TYPE_DICT,dict="course_info.course_info_name.course_info_status=1") + @Query(name = "课程配置ID", display = false,type=Query.TYPE_DICT,dict="course_info.course_info_name.course_info_status=1") private Long courseInfoId; - @Query(name = "标签ID", display = true,type=Query.TYPE_DICT,dict="course_label.course_label_name.course_label_status=1") + @Query(name = "标签ID", display = false,type=Query.TYPE_DICT,dict="course_label.course_label_name.course_label_status=1") private Long courseLabelId; private String resourcesApplicationCourseIdPlural; diff --git a/web/src/main/resources/static/js/jlw/competition/add.js b/web/src/main/resources/static/js/jlw/competition/add.js index f1fe0932..e428272d 100644 --- a/web/src/main/resources/static/js/jlw/competition/add.js +++ b/web/src/main/resources/static/js/jlw/competition/add.js @@ -1366,13 +1366,13 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t //客观题选择 function kgt_select(){ - var ret = Common.getAjax("/jlw/resourcesQuestion/getTreeByCourseLabelTypes.json",{courseLabelTypes:"实务课程类",competitionId:$("input[name='competitionId']").val(),ct1QuestionIds:$("input[name='ct1QuestionIds']").val() || '-1'}); + var ret = Common.getAjax("/jlw/resourcesQuestion/getTreeByCourseLabelTypes.json",{courseLabelTypes:"应用课程类",competitionId:$("input[name='competitionId']").val(),ct1QuestionIds:$("input[name='ct1QuestionIds']").val() || '-1'}); openTiMu(1,ret); } //竞赛案例设置 function jsal_select(){ - var ret = Common.getAjax("/jlw/resourcesCompetition/getTreeByCourseLabelTypes.json",{courseLabelTypes:"实务课程类",competitionId:$("input[name='competitionId']").val(),ct2QuestionIds:$("input[name='ct2QuestionIds']").val() || '-1'}); + var ret = Common.getAjax("/jlw/resourcesCompetition/getTreeByCourseLabelTypes.json",{courseLabelTypes:"应用课程类",competitionId:$("input[name='competitionId']").val(),ct2QuestionIds:$("input[name='ct2QuestionIds']").val() || '-1'}); openTiMu(2,ret); } diff --git a/web/src/main/resources/static/js/jlw/exam/add.js b/web/src/main/resources/static/js/jlw/exam/add.js index 3150a845..2d05a8a9 100644 --- a/web/src/main/resources/static/js/jlw/exam/add.js +++ b/web/src/main/resources/static/js/jlw/exam/add.js @@ -282,17 +282,17 @@ layui.define([ 'form', 'laydate', 'table','laytpl','examApi'], function(exports) } function kgt_select(){ - var ret = Common.getAjax("/jlw/resourcesQuestion/getTreeByCourseLabelTypes.json",{courseLabelTypes:"实务课程类",examId:$("input[name='examId']").val(),et1QuestionIds:$("input[name='et1QuestionIds']").val() || '-1'}); + var ret = Common.getAjax("/jlw/resourcesQuestion/getTreeByCourseLabelTypes.json",{courseLabelTypes:"应用课程类",examId:$("input[name='examId']").val(),et1QuestionIds:$("input[name='et1QuestionIds']").val() || '-1'}); openTiMu(1,ret); } function jsal_select(){ - var ret = Common.getAjax("/jlw/resourcesCompetition/getTreeByCourseLabelTypes.json",{courseLabelTypes:"实务课程类",examId:$("input[name='examId']").val(),et2QuestionIds:$("input[name='et2QuestionIds']").val() || '-1'}); + var ret = Common.getAjax("/jlw/resourcesCompetition/getTreeByCourseLabelTypes.json",{courseLabelTypes:"应用课程类",examId:$("input[name='examId']").val(),et2QuestionIds:$("input[name='et2QuestionIds']").val() || '-1'}); openTiMu(2,ret); } function sxal_select(){ - var ret = Common.getAjax("/jlw/resourcesTraining/getTreeByCourseLabelTypes.json",{courseLabelTypes:"实务课程类",examId:$("input[name='examId']").val(),et3QuestionIds:$("input[name='et3QuestionIds']").val() || '-1'}); + var ret = Common.getAjax("/jlw/resourcesTraining/getTreeByCourseLabelTypes.json",{courseLabelTypes:"应用课程类",examId:$("input[name='examId']").val(),et3QuestionIds:$("input[name='et3QuestionIds']").val() || '-1'}); openTiMu(3,ret); } 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 38c65e96..c02e245d 100644 --- a/web/src/main/resources/static/js/jlw/resourcesApplicationCourse/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesApplicationCourse/index.js @@ -5,7 +5,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) { var resourcesApplicationCourseTable = null; var selectCourseLabelType = "";//选择课程类型值 var selectList = "'; + var yykcl = ''; + var kzkcl = ''; + var llkcl = ''; $.each(courseLabelData, function (key, value) { - if (value.courseLabelId == d.courseLabelId) { - courseLabelType = value.courseLabelName; + var selected = selected = value.courseLabelId == d.courseLabelId?"selected":""; + if (value.courseLabelType == '应用课程类') { + yykcl += ''; + } else if (value.courseLabelType == '考证课程类') { + kzkcl += ''; + } else if (value.courseLabelType == '理论课程类') { + llkcl += ''; } }); - var html = ""; + yykcl+= ''; + kzkcl+= ''; + llkcl+= ''; + html +=yykcl+kzkcl+llkcl+''; return html; } }, @@ -104,7 +110,9 @@ layui.define(['form', 'laydate', 'table'], function (exports) { } } ]] + /* ,done: function (res, curr, count) { + }*/ }); table.on('checkbox(resourcesApplicationCourseTable)', function (obj) { @@ -170,7 +178,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) { }); } else if (obj.event === "binding") { layer.confirm('是否确定绑定?', function (index) { - var ret = Common.postAjax("/jlw/xxx/xx.json", {ids: data.resourcesApplicationCourseId}); + var param = obj.data; + var ret = Common.postAjax("/jlw/resourcesApplicationCourse/edit.json", param); layer.msg(ret.code == 0 ? "绑定成功!" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, @@ -184,33 +193,45 @@ layui.define(['form', 'laydate', 'table'], function (exports) { } }) }; - form.on('select(courseLabelType)', function (data) { - selectCourseLabelType = data.value; - resourcesApplication = Common.getAjax("/jlw/resourcesApplication/getValues.json", {applicationOneLevelRelation: data.value}).data; //获取课程数据 + form.on('select(courseLabelType)', function (obj) { + selectCourseLabelType = obj.value; + resourcesApplication = Common.getAjax("/jlw/resourcesApplication/getValues.json", {applicationSecondLevelRelation: obj.value}).data; //获取课程数据 var this_ = $(this).parents("td").next().next().find("select"); this_.empty(); this_.append(""); $(this).parents("td").next().next().find("select").empty(); $(this).parents("td").next().next().find("select").append(""); - if (!$.isEmpty(data.value)) { + if (!$.isEmpty(obj.value)) { $.each(resourcesApplication, function (key, v) { this_.append(""); }); } + + var courseLabelId = obj.value; + var resourcesApplicationCourseId = table.cache['resourcesApplicationCourseTable'][$(this).parents("tr").attr("data-index")].resourcesApplicationCourseId; + if (!$.isEmpty(resourcesApplicationCourseId)) { + var param = { + resourcesApplicationCourseId: resourcesApplicationCourseId, + courseLabelId: courseLabelId, + }; + var ret = Common.postAjax("/jlw/resourcesApplicationCourse/edit.json", param); + layer.msg(ret.code == 0 ? "绑定成功!" : ret.msg, { + offset: ['50%'], + icon: ret.code == 0 ? 1 : 2, + time: 1000 //2秒关闭(如果不配置,默认是3秒) + }); + } form.render(); }); - form.on('select(select_yingYong_1)', function (data) { - var resourcesApplicationId = data.value; + form.on('select(select_yingYong_1)', function (obj) { + var resourcesApplicationId = obj.value; var resourcesApplicationCourseId = table.cache['resourcesApplicationCourseTable'][$(this).parents("tr").attr("data-index")].resourcesApplicationCourseId; if (!$.isEmpty(resourcesApplicationCourseId)) { var param = { resourcesApplicationCourseId: resourcesApplicationCourseId, resourcesApplicationId: resourcesApplicationId, }; - if(!$.isEmpty(selectCourseLabelType)){ - param.courseLabelType = selectCourseLabelType; - } var ret = Common.postAjax("/jlw/resourcesApplicationCourse/edit.json", param); layer.msg(ret.code == 0 ? "绑定成功!" : ret.msg, { offset: ['50%'], @@ -219,13 +240,22 @@ layui.define(['form', 'laydate', 'table'], function (exports) { }); } }); - form.on('select(undefinedYD)', function (data) { - console.log("data->>>>>>>>>>>>>>>>", data); - var selectElem = $(data.elem); - var tdElem = selectElem.closest('td'); - var trElem = tdElem.closest('tr'); - var tableView = trElem.closest('.layui-table-view'); - table.cache[tableView.attr('lay-id')][trElem.data('index')][tdElem.data('field')] = data.value; + form.on('select(select_)', function (obj) { + var id = obj.value; + return; + var resourcesApplicationCourseId = table.cache['resourcesApplicationCourseTable'][$(this).parents("tr").attr("data-index")].resourcesApplicationCourseId; + if (!$.isEmpty(resourcesApplicationCourseId)) { + var param = { + resourcesApplicationCourseId: resourcesApplicationCourseId, + id: id, + }; + var ret = Common.postAjax("/jlw/resourcesApplicationCourse/edit.json", param); + layer.msg(ret.code == 0 ? "绑定成功!" : ret.msg, { + offset: ['50%'], + icon: ret.code == 0 ? 1 : 2, + time: 1000 //2秒关闭(如果不配置,默认是3秒) + }); + } }); exports('index', view); 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 3708ffa1..26d54d9d 100644 --- a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js @@ -8,7 +8,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) { selectMap = {},//已经生成过select的map selectList = " - + diff --git a/web/src/main/resources/templates/jlw/courseInfo/courseConfigurePage.html b/web/src/main/resources/templates/jlw/courseInfo/courseConfigurePage.html index e90d8585..ccb646fe 100644 --- a/web/src/main/resources/templates/jlw/courseInfo/courseConfigurePage.html +++ b/web/src/main/resources/templates/jlw/courseInfo/courseConfigurePage.html @@ -1120,7 +1120,7 @@ //加载编辑课程资源中的搜索树结构 function getTreeByCourseLabel(){ if(tag == 0){ - getTreeByCourseLabelTypes = Common.getAjax("/jlw/courseInfo/getTreeByCourseLabelTypes.json",{courseLabelTypes:"实务课程类"}).data; + getTreeByCourseLabelTypes = Common.getAjax("/jlw/courseInfo/getTreeByCourseLabelTypes.json",{courseLabelTypes:"应用课程类"}).data; tag = 1; } var el = ""; diff --git a/web/src/main/resources/templates/jlw/courseLabel/index.html b/web/src/main/resources/templates/jlw/courseLabel/index.html index 344cbb69..c7387610 100644 --- a/web/src/main/resources/templates/jlw/courseLabel/index.html +++ b/web/src/main/resources/templates/jlw/courseLabel/index.html @@ -1,150 +1,173 @@ -
-

课程分类管理

-
-
+
+

课程分类管理

+
+
-
- +
+ diff --git a/web/src/main/resources/templates/jlw/resourcesApplicationCourse/add.html b/web/src/main/resources/templates/jlw/resourcesApplicationCourse/add.html index 07310586..fd77934b 100644 --- a/web/src/main/resources/templates/jlw/resourcesApplicationCourse/add.html +++ b/web/src/main/resources/templates/jlw/resourcesApplicationCourse/add.html @@ -32,17 +32,28 @@
-
- - +
+ +
@@ -52,7 +63,7 @@
+
+