diff --git a/admin-core/src/main/resources/static/plugins/login/img/123456.jpg b/admin-core/src/main/resources/static/plugins/login/img/123456.jpg new file mode 100644 index 00000000..e26b69f6 Binary files /dev/null and b/admin-core/src/main/resources/static/plugins/login/img/123456.jpg differ diff --git a/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html b/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html index c75998a7..ef61eb6a 100644 --- a/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html +++ b/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html @@ -69,130 +69,11 @@ }/*结束循环*/ --> - - - - -
-
- -
-
- - -
- -
- -
-
- + +
+
-
- - -
-
- -
-
- - - -
- -
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java index 6d2762ca..d16a8a66 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java @@ -104,6 +104,13 @@ public class TeacherOpenCourseMergeCourseInfoController{ return view; } + @GetMapping(MODEL + "/wdcd.do") + @Function("teacherOpenCourseMergeCourseInfo.wfcdindex") + public ModelAndView wdcd() { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html") ; + return view; + } + @GetMapping(MODEL + "/edit.do") @Function("teacherOpenCourseMergeCourseInfo.edit") public ModelAndView edit(Long teacherOpenCourseMergeCourseInfoId) { diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java index 970cc367..0cd28feb 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java @@ -14,13 +14,13 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @Query(name = "ID", display = false) private Long teacherOpenCourseMergeCourseInfoId; - @Query(name = "开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") + @Query(name = "开课名称", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") private Long teacherOpenCourseId; @Query(name = "名称(课程名 或 章名 或 节名)", display = false) private String courseInfoName; @Query(name = "课程缩略图", display = false) private String courseInfoThumbnail; - @Query(name = "课程标签ID", display = true,type=Query.TYPE_DICT,dict="course_label.course_label_name.course_label_status=1") + @Query(name = "课程标签", display = true,type=Query.TYPE_DICT,dict="course_label.course_label_name.course_label_status=1") private Long courseLabelId; @Query(name = "课程学习人数基数", display = false) private Integer courseInfoBasicsCount; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionClassQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionClassQuery.java index ba81f269..3528209e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionClassQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionClassQuery.java @@ -16,7 +16,7 @@ public class TeacherOpenCourseScheduleSessionClassQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @Query(name = "课程开课-排课位置ID", display = false) private Long teacherOpenCourseScheduleSessionClassId; - @Query(name = "排课位置名称", display = true) + @Query(name = "位置名称", display = true) private String teacherOpenCourseScheduleSessionClassName; // 默认 0 为顶级ID diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html new file mode 100644 index 00000000..d8607168 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html @@ -0,0 +1,11 @@ + + + +