diff --git a/web/src/main/java/cn/jlw/Interceptor/GetFile.java b/web/src/main/java/cn/jlw/Interceptor/GetFile.java index f2cb6e2a..06a68d86 100644 --- a/web/src/main/java/cn/jlw/Interceptor/GetFile.java +++ b/web/src/main/java/cn/jlw/Interceptor/GetFile.java @@ -239,7 +239,7 @@ public class GetFile implements HandlerMethodArgumentResolver { } long num = 0; try { - if(null != user || null != student){ +// if(null != user || null != student){ if(mhsr != null){ if(null != multipartFileParam){ FileEntity fileEntity = new FileEntity(); @@ -418,9 +418,9 @@ public class GetFile implements HandlerMethodArgumentResolver { } } - }else { - log.error("有人上传不对劲的玩意！"); - } +// }else { +// log.error("有人上传不对劲的玩意！"); +// } } catch (Exception e) { e.printStackTrace(); } 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 d98add72..38c6ad3a 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 @@ -17,15 +17,15 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam { private Long teacherOpenCourseMergeCourseInfoId; @NotNull(message = "开课ID不能为空", groups =ValidateConfig.ADD.class) - @Query(name = "开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") + @Query(name = "开课ID", display = false,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") private Long teacherOpenCourseId; @NotEmpty(message = "章节名称不能为空", groups =ValidateConfig.ADD.class) - @Query(name = "名称（课程名 或 章名 或 节名）", display = false) + @Query(name = "课程名称", display = true) private String courseInfoName; @Query(name = "课程缩略图", display = false) private String courseInfoThumbnail; - @Query(name = "课程标签", display = true,type=Query.TYPE_DICT,dict="course_label.course_label_name.course_label_status=1") + @Query(name = "课程标签", display = false,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/resources/static/js/jlw/courseInfo/index.js b/web/src/main/resources/static/js/jlw/courseInfo/index.js index 4c629fba..529e1d70 100644 --- a/web/src/main/resources/static/js/jlw/courseInfo/index.js +++ b/web/src/main/resources/static/js/jlw/courseInfo/index.js @@ -122,7 +122,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { Common.info("课程配置时，请先禁用课程。配置完成后再启用课程") return; } - var url = "/jlw/courseInfo/courseConfigureNew.do?courseInfoId="+data.courseInfoId; + var url = "/jlw/courseInfo/courseConfigurePage.do?courseInfoId="+data.courseInfoId; Common.openDlg(url,""); }else if(obj.event === "editStatus"){ //启用 var param = { diff --git a/web/src/main/resources/static/js/jlw/student/add.js b/web/src/main/resources/static/js/jlw/student/add.js index a247abf5..a76234d2 100644 --- a/web/src/main/resources/static/js/jlw/student/add.js +++ b/web/src/main/resources/static/js/jlw/student/add.js @@ -63,9 +63,7 @@ layui.define([ 'form', 'laydate', 'table','studentApi'], function(exports) { //根据所选学校查询院系 form.on('select(select_universitiesColleges)', function (obj) { - Lib.getUniversityFacultys($("select[name='universityFacultyId']"),obj.value); - - + Lib.getUniversityFacultys($("select[name='classId']"),obj.value); }); //查询专业 form.on('select(select_universityFacultyIds)', function (obj) { diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js index b5468228..5d52e164 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js @@ -20,19 +20,19 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { teacherOpenCourseMergeCourseInfoTable = table.render({ elem : '#teacherOpenCourseMergeCourseInfoTable', height : Lib.getTableHeight(1), - cellMinWidth: 100, + method : 'post', url : Common.ctxPath + '/jlw/teacherOpenCourseMergeCourseInfo/list.json' // 数据接口 ,page : Lib.tablePage // 开启分页 - ,toolbar: '#toolbar_teacherOpenCourseMergeCourseInfo' //自定义头部左侧工具栏 - ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 + /*,toolbar: '#toolbar_teacherOpenCourseMergeCourseInfo' //自定义头部左侧工具栏 + ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/ ,limit : 10, cols : [ [ // 表头 { type : 'checkbox', }, - { + /*{ field : 'teacherOpenCourseMergeCourseInfoId', title : 'ID', align:"center", @@ -48,13 +48,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hideField :false, hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'], }, - { - field : 'courseInfoName', - title : '名称（课程名 或 章名 或 节名）', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['courseInfoName'])?false:sx_['courseInfoName'], - }, { field : 'courseInfoThumbnail', title : '课程缩略图', @@ -159,11 +152,36 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { align:"center", hideField :false, hide:$.isEmpty(sx_['userId'])?false:sx_['userId'], - } - ,{ - field : 'operation_',title : '操作',align:"center", templet: function (d) { - var htm = ''; - htm += ''; + }*/ + { + field : 'courseInfoName', + title : '课程名称', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['courseInfoName'])?false:sx_['courseInfoName'], + }, + { + field : 'courseInfoName1', + title : '上课教师', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['courseInfoName'])?false:sx_['courseInfoName'], + }, + { + field : 'courseInfoName1', + title : '上课班级', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['courseInfoName'])?false:sx_['courseInfoName'], + }, + { + field : 'operation_',title : '操作',align:"center",width:480, templet: function (d) { + var htm = '签到'; + htm += '章节'; + htm += '课程实操'; + htm += '作业'; + htm += '考试'; + htm += '互动'; return htm; } } diff --git a/web/src/main/resources/static/js/jlw/universitiesColleges/index.js b/web/src/main/resources/static/js/jlw/universitiesColleges/index.js index f9f6cea1..b7d94548 100644 --- a/web/src/main/resources/static/js/jlw/universitiesColleges/index.js +++ b/web/src/main/resources/static/js/jlw/universitiesColleges/index.js @@ -118,7 +118,6 @@ layui.define(['form', 'laydate', 'table'], function (exports) { }, initTableTool: table.on('tool(universitiesCollegesTable)', function (obj) { var data = obj.data; if (obj.event === 'edit') { - console.log(data) var url = "/jlw/universitiesColleges/add.do?universitiesCollegesId=" + data.universitiesCollegesId; Common.openDlg(url, "院校信息/编辑院校"); } else if (obj.event === "del") { diff --git a/web/src/main/resources/templates/jlw/competition/add.html b/web/src/main/resources/templates/jlw/competition/add.html index 38993e2d..7e8dc067 100644 --- a/web/src/main/resources/templates/jlw/competition/add.html +++ b/web/src/main/resources/templates/jlw/competition/add.html @@ -108,9 +108,9 @@
- -
-
- -
-
-
-
-
-
-
@@ -410,6 +394,23 @@
+ +
+
+ +
+
+
+
+
+
+
+
diff --git a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html index e6832aca..9f80570a 100644 --- a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html +++ b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html @@ -208,11 +208,9 @@ }else if (obj.event === 'updateResources') {//上传资源 layer.open({ title: '在线调试' - ,content: '配置各种参数，试试效果' - , btn: ['确定', '关闭'] + ,content: '\n' + + '' , shadeClose:true - , success:function () {} - , yes: function (index, layero) {} , btn2: function (index, layero) { layer.close(index); } diff --git a/web/src/main/resources/templates/jlw/schoolClass/add.html b/web/src/main/resources/templates/jlw/schoolClass/add.html index 8d67c0fd..47e2cec2 100644 --- a/web/src/main/resources/templates/jlw/schoolClass/add.html +++ b/web/src/main/resources/templates/jlw/schoolClass/add.html @@ -31,7 +31,7 @@
- +
diff --git a/web/src/main/resources/templates/jlw/student/add.html b/web/src/main/resources/templates/jlw/student/add.html index 74bb6e44..aebfc322 100644 --- a/web/src/main/resources/templates/jlw/student/add.html +++ b/web/src/main/resources/templates/jlw/student/add.html @@ -11,8 +11,10 @@
- +
@@ -28,7 +30,7 @@
-
+
-->
@@ -40,35 +42,38 @@
-
--> +
+ + + +
- -
- *班级是： +
+ -
+
- - - +
- -
- *班级不是： +
+ -
+
-
@@ -82,7 +87,7 @@
- +
@@ -112,7 +117,7 @@
- +
diff --git a/web/src/main/resources/templates/jlw/studentClientLink/applicationAdmin.html b/web/src/main/resources/templates/jlw/studentClientLink/applicationAdmin.html index 03b6fbc2..ca743fdf 100644 --- a/web/src/main/resources/templates/jlw/studentClientLink/applicationAdmin.html +++ b/web/src/main/resources/templates/jlw/studentClientLink/applicationAdmin.html @@ -57,24 +57,16 @@ type : 'checkbox', fixed:'left', }, - { - field : 'resourcesApplicationId', - title : '序号', - width : 60,align:"center" - }, { field : 'applicationName', title : '应用名称',align:"center",width:300 }, { - field : 'applicationLink', - title : '应用链接',align:"center" - },{ - field : 'linkSecretKey', - title : '应用秘钥',align:"center" - },{ + title : '应用管理员端链接',align:"center" + }, + { field : 'userId',title : '操作',align:"center", width:150,templet: function (d) { var htm = '编辑'; htm += '删除'; diff --git a/web/src/main/resources/templates/jlw/studentClientLink/applicationOther.html b/web/src/main/resources/templates/jlw/studentClientLink/applicationOther.html index 86be1bfd..ac5b0f65 100644 --- a/web/src/main/resources/templates/jlw/studentClientLink/applicationOther.html +++ b/web/src/main/resources/templates/jlw/studentClientLink/applicationOther.html @@ -57,11 +57,6 @@ type : 'checkbox', fixed:'left', }, - { - field : 'resourcesApplicationId', - title : '序号', - width : 60,align:"center" - }, { field : 'applicationName', @@ -72,9 +67,14 @@ field : 'applicationLink', title : '应用链接',align:"center" },{ - field : 'linkSecretKey', - title : '应用秘钥',align:"center" - },{ + field : 'studentClientLinkImg', + title : '应用图片',align:"center" + }, + { + field : 'studentClientLinkDesc', + title : '应用描述',align:"center" + }, + { field : 'userId',title : '操作',align:"center", width:150,templet: function (d) { var htm = '编辑'; htm += '删除'; diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/index.html index f6cfdbe3..62f8545f 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/index.html @@ -1,6 +1,19 @@ + +
+ 新增 + 删除 +
diff --git a/web/src/main/resources/templates/jlw/universitiesColleges/add.html b/web/src/main/resources/templates/jlw/universitiesColleges/add.html index 2cb8431e..955a96b1 100644 --- a/web/src/main/resources/templates/jlw/universitiesColleges/add.html +++ b/web/src/main/resources/templates/jlw/universitiesColleges/add.html @@ -28,21 +28,23 @@
-
- -
- +
+
+ +
+ +
-
-
- -
- +
+ +
+ +
@@ -115,8 +117,6 @@ layui.use(['add','upload','form'], function(){ upload = layui.upload,form = layui.form; universitiesCollegesAdd.init(); - console.log('${universitiesColleges.universitiesCollegesProvince}') - console.log('${universitiesColleges.universitiesCollegesCity}') $.Reappearance($("#receivingAddress"),'${universitiesColleges.universitiesCollegesProvince}','${universitiesColleges.universitiesCollegesCity}');//返显区域 form.render(); //上传LOGO