diff --git a/admin-core/src/main/resources/templates/index.html b/admin-core/src/main/resources/templates/index.html index 82114bf6..d7c30bbc 100644 --- a/admin-core/src/main/resources/templates/index.html +++ b/admin-core/src/main/resources/templates/index.html @@ -441,9 +441,15 @@ var text =""; var data = ret.data; data.forEach(function (item,index) { - text+=item.name+"、" + if(index<=10){ + text+=item.name+"、"; + } }); - text = text.substring(0,text.length-1); + if(data.length<=10){ + text = text.substring(0,text.length-1); + }else { + text = text.substring(0,text.length-1)+"..."; + } var isAdmin = $("#isAdmin").val(); if(isAdmin == "true"){ 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 b4c0afb9..91289719 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 @@ -19,7 +19,7 @@ public class TeacherOpenCourseScheduleSessionQuery extends PageParam { private Date teacherOpenCourseScheduleSessionAddTime; @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") + @Query(name = "教师名称", display = true,type=Query.TYPE_DICT,dict="teacher.teacher_name.teacher_status=1,${seeMyOrgByRole}") private Long teacherId; @Query(name = "启用状态", display = true,type=Query.TYPE_DICT,dict="global_open_status")/*状态(1启用 2禁用)*/ private Integer teacherOpenCourseScheduleSessionStatus; diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js index afd7334d..c4e24f29 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js @@ -217,7 +217,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule offset: 'auto', title: '设置时间', shadeClose: 'true', - area: ['400px', '260px'], + area: ['700px', '260px'], scrollbar: 'false', btnAlign: 'c', content: $("#setTime_demo"), diff --git a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html index 033f9305..c0fecfd5 100644 --- a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html +++ b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html @@ -735,7 +735,7 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find cellMinWidth: 100, method: 'post', even: true, - url: Common.ctxPath + '/jlw/resourcesInfo/lis2t.json' // 数据接口 + url: Common.ctxPath + '/jlw/resourcesInfo/list.json' // 数据接口 , page: Lib.tablePage // 开启分页 , limit: 10, cols: [[ // 表头 diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html index 69ed6f5a..6f9205f6 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html @@ -1,221 +1,235 @@ - +
-
- -
+
+ +
-
-
-
- -
- -
-
-
-
-
-
-
- -
- +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ - - - + + + - - - -
-
-
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
+ + + +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+ +
+ + +
+
+
+ +
+ +
+
- -
- -
+ +
+ +
-
-
-
- -
- -
-
-
-
-
-
-
- -
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
- - -
-
-
-
-
- -
- - - - - - - -
-
-
+ + +
+
+
+
+
+ +
+ + + + + + + +
+
+
- - - + + +
- @@ -223,13 +237,13 @@