diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java index 88cf4479..b4c0afb9 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java @@ -17,7 +17,7 @@ public class TeacherOpenCourseScheduleSessionQuery extends PageParam { private Long teacherOpenCourseScheduleSessionId; @Query(name = "创建时间", display = false) private Date teacherOpenCourseScheduleSessionAddTime; - @Query(name = "课程名称", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") + @Query(name = "课程名称", display = false,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") private Long teacherOpenCourseId; @Query(name = "教师名称", display = true,type=Query.TYPE_DICT,dict="teacher.teacher_name.teacher_status=1") private Long teacherId; 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 115c45e6..dd96a9fd 100644 --- a/web/src/main/resources/static/js/jlw/handsOn/index.js +++ b/web/src/main/resources/static/js/jlw/handsOn/index.js @@ -3,7 +3,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) { var laydate = layui.laydate; var table = layui.table; var handsOnTable = null; - window.loadList = function (){//重新加载实训任务列表 + window.loadList = function () {//重新加载实训任务列表 console.log("进入了index页面") } var view = { @@ -71,11 +71,12 @@ layui.define(['form', 'laydate', 'table'], function (exports) { fixed: 'right', width: 260, templet: function (d) { + var css = $("#isAdmin").val() === 'true' ? "" : "display: none;"; var htm = '上架'; htm += '下架'; - htm += '编辑'; + htm += '编辑'; htm += '添加任务'; - htm += '删除'; + htm += '删除'; return htm; } } @@ -111,21 +112,21 @@ layui.define(['form', 'laydate', 'table'], function (exports) { Lib.doSearchForm($("#searchForm"), handsOnTable, 1); view.initToolBar() }, - allDel:function(){ + allDel: function () { layui.use(['del'], function () { var delView = layui.del; delView.delBatch(); }); }, - up:function () { - var data = Common.getMoreDataFromTable(table,"handsOnTable"); + up: function () { + var data = Common.getMoreDataFromTable(table, "handsOnTable"); var ids = Common.concatBatchId(data, "handsOnId"); - upDrown(1,ids); + upDrown(1, ids); }, - drown:function () { - var data = Common.getMoreDataFromTable(table,"handsOnTable"); + drown: function () { + var data = Common.getMoreDataFromTable(table, "handsOnTable"); var ids = Common.concatBatchId(data, "handsOnId"); - upDrown(0,ids); + upDrown(0, ids); } } //触发事件 @@ -158,20 +159,20 @@ layui.define(['form', 'laydate', 'table'], function (exports) { } else if (obj.event === "addTask") {//添加任务 // var url = "/jlw/handsOn/add.do?handsOnId=" + data.handsOnId+'&sign=1'; // Common.openDlg(url, "课程实训案例管理>新增课程实训案例>添加实训任务"); - var url = "/jlw/handsOnSimulationTasks/add.do?handsOnId="+data.handsOnId+'&courseInfoId='+data.courseInfoId; + var url = "/jlw/handsOnSimulationTasks/add.do?handsOnId=" + data.handsOnId + '&courseInfoId=' + data.courseInfoId; Common.openDlg(url); - }else if (obj.event === "up") { - upDrown("1",data.handsOnId); + } else if (obj.event === "up") { + upDrown("1", data.handsOnId); } else if (obj.event === "drown") { - upDrown("2",data.handsOnId); + upDrown("2", data.handsOnId); } }) }; //上下架 - function upDrown(status,ids){ - layer.confirm(status == 1?'是否确定上架?':'是否确定下架?', function (index) { - var ret = Common.postAjax('/jlw/handsOn/edit.json', {handsOnId: ids,handsOnStatus:status}); + function upDrown(status, ids) { + layer.confirm(status == 1 ? '是否确定上架?' : '是否确定下架?', function (index) { + var ret = Common.postAjax('/jlw/handsOn/edit.json', {handsOnId: ids, handsOnStatus: status}); layer.msg(ret.code == 0 ? "操作成功!" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, diff --git a/web/src/main/resources/static/js/jlw/resourcesQuestion/index.js b/web/src/main/resources/static/js/jlw/resourcesQuestion/index.js index 4dbf2192..7e377e8d 100644 --- a/web/src/main/resources/static/js/jlw/resourcesQuestion/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesQuestion/index.js @@ -63,11 +63,15 @@ layui.define(['form', 'laydate', 'table'], function (exports) { }, { field: 'userId', title: '操作', align: "center", width: 220, templet: function (d) { + var css = $("#isAdmin").val() === "true" ? "" : "display: none;"; + var cssN = $("#isAdmin").val() === "true" ? "display: none;" : ""; + // TODO 上下架前端逻辑待开发 return '上架\n' + '下架\n' + - '编辑\n' + - '删除'; + '编辑\n' + + '查看\n' + + '删除'; } } @@ -99,14 +103,14 @@ layui.define(['form', 'laydate', 'table'], function (exports) { Lib.doSearchForm($("#searchForm"), resourcesQuestionTable, 1); }, up: function () { - var data = Common.getMoreDataFromTable(table,"handsOnTable"); + var data = Common.getMoreDataFromTable(table, "handsOnTable"); var ids = Common.concatBatchId(data, "handsOnId"); - upDrown(1,data.resourcesQuestionId); + upDrown(1, data.resourcesQuestionId); }, down: function () { - var data = Common.getMoreDataFromTable(table,"handsOnTable"); + var data = Common.getMoreDataFromTable(table, "handsOnTable"); var ids = Common.concatBatchId(data, "handsOnId"); - upDrown(2,data.resourcesQuestionId); + upDrown(2, data.resourcesQuestionId); }, search: function () { Lib.doSearchForm($("#searchForm"), resourcesQuestionTable, 1); @@ -201,9 +205,9 @@ layui.define(['form', 'laydate', 'table'], function (exports) { } else if (obj.event === "del") { allDelete(data.resourcesQuestionId); } else if (obj.event === "up") { - upDrown(1,data.resourcesQuestionId); + upDrown(1, data.resourcesQuestionId); } else if (obj.event === "down") { - upDrown(2,data.resourcesQuestionId); + upDrown(2, data.resourcesQuestionId); } }) } @@ -225,9 +229,12 @@ layui.define(['form', 'laydate', 'table'], function (exports) { } //上下架 - function upDrown(status,ids){ - layer.confirm(status == 1?'是否确定上架该试题?':'是否确定下架该试题?', function (index) { - var ret = Common.postAjax("/jlw/resourcesQuestion/putOnShelves.json", {resourcesQuestionId: ids,questionStatus:status}); + function upDrown(status, ids) { + layer.confirm(status == 1 ? '是否确定上架该试题?' : '是否确定下架该试题?', function (index) { + var ret = Common.postAjax("/jlw/resourcesQuestion/putOnShelves.json", { + resourcesQuestionId: ids, + questionStatus: status + }); layer.msg(ret.code == 0 ? "操作成功!" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, diff --git a/web/src/main/resources/templates/jlw/handsOn/add.html b/web/src/main/resources/templates/jlw/handsOn/add.html index 166d5abe..f290c7be 100644 --- a/web/src/main/resources/templates/jlw/handsOn/add.html +++ b/web/src/main/resources/templates/jlw/handsOn/add.html @@ -41,10 +41,18 @@
-
- + + + + + + + + +
@@ -67,7 +75,7 @@
-
+
diff --git a/web/src/main/resources/templates/jlw/handsOn/index.html b/web/src/main/resources/templates/jlw/handsOn/index.html index 36fc8207..d829f4db 100644 --- a/web/src/main/resources/templates/jlw/handsOn/index.html +++ b/web/src/main/resources/templates/jlw/handsOn/index.html @@ -1,10 +1,11 @@ @@ -22,7 +23,13 @@
- + + + + + + +
@@ -50,7 +57,9 @@
+ 新增 + 批量删除 批量下架
+ +
diff --git a/web/src/main/resources/templates/jlw/resourcesCompetition/add.html b/web/src/main/resources/templates/jlw/resourcesCompetition/add.html index 7a7ad607..34fcc19c 100644 --- a/web/src/main/resources/templates/jlw/resourcesCompetition/add.html +++ b/web/src/main/resources/templates/jlw/resourcesCompetition/add.html @@ -37,10 +37,18 @@
-
- + + + + + + + + +
@@ -64,7 +72,7 @@
-
+
diff --git a/web/src/main/resources/templates/jlw/resourcesCompetition/index.html b/web/src/main/resources/templates/jlw/resourcesCompetition/index.html index 4f5bc063..39ce940d 100644 --- a/web/src/main/resources/templates/jlw/resourcesCompetition/index.html +++ b/web/src/main/resources/templates/jlw/resourcesCompetition/index.html @@ -22,7 +22,13 @@
- + + + + + + +
diff --git a/web/src/main/resources/templates/jlw/resourcesInfo/add.html b/web/src/main/resources/templates/jlw/resourcesInfo/add.html index d499e756..18e1492c 100644 --- a/web/src/main/resources/templates/jlw/resourcesInfo/add.html +++ b/web/src/main/resources/templates/jlw/resourcesInfo/add.html @@ -6,9 +6,17 @@
-
- +
+ + + + + + + + +
diff --git a/web/src/main/resources/templates/jlw/resourcesInfo/index.html b/web/src/main/resources/templates/jlw/resourcesInfo/index.html index 59be4ac3..4db8b2c8 100644 --- a/web/src/main/resources/templates/jlw/resourcesInfo/index.html +++ b/web/src/main/resources/templates/jlw/resourcesInfo/index.html @@ -42,29 +42,24 @@ - + - - -
- -
- - -
-
-
- + + + + + + +
-
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/add.html b/web/src/main/resources/templates/jlw/resourcesQuestion/add.html index 693b4d28..896d892f 100644 --- a/web/src/main/resources/templates/jlw/resourcesQuestion/add.html +++ b/web/src/main/resources/templates/jlw/resourcesQuestion/add.html @@ -1,15 +1,28 @@
+ + + + +
- + + + + + + + + +
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/index.html b/web/src/main/resources/templates/jlw/resourcesQuestion/index.html index 4b15cf00..fbe33b8c 100644 --- a/web/src/main/resources/templates/jlw/resourcesQuestion/index.html +++ b/web/src/main/resources/templates/jlw/resourcesQuestion/index.html @@ -27,8 +27,13 @@ - - + + + + + + +
@@ -58,6 +63,7 @@
+