tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
Mlxa0324
parent e37bc45d8a e626848548
commit 0fb131e777
14 changed files with 128 additions and 104 deletions

8
web/src/main/java/cn/jlw/Interceptor/GetFile.java
Unescape Escape View File

@ -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();
}

6
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java
Unescape Escape View File

@ -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;

2
web/src/main/resources/static/js/jlw/courseInfo/index.js
Unescape Escape View File

@ -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 = {

4
web/src/main/resources/static/js/jlw/student/add.js
Unescape Escape View File

@ -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) {

50
web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js
Unescape Escape View File

@ -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 = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
}*/
{
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 = '<a class="layui-table-link" lay-event="qd">签到</a>';
htm += '<a class="layui-table-link" lay-event="zj">章节</a>';
htm += '<a class="layui-table-link" lay-event="kcsc">课程实操</a>';
htm += '<a class="layui-table-link" lay-event="zy">作业</a>';
htm += '<a class="layui-table-link" lay-event="ks">考试</a>';
htm += '<a class="layui-table-link" lay-event="hd" style="margin-right: 0px;">互动</a>';
return htm;
}
}

1
web/src/main/resources/static/js/jlw/universitiesColleges/index.js
Unescape Escape View File

@ -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") {

37
web/src/main/resources/templates/jlw/competition/add.html
Unescape Escape View File

@ -108,9 +108,9 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li lay-id="0" class="layui-this">大赛概况</li>
<li lay-id="1">大赛任务</li>
<li lay-id="1" ${sign=='1'?'':'style="display:none"'}>竞赛时间</li>
<li lay-id="2" ${sign=='1'?'':'style="display:none"'}>竞赛时间</li>
<li lay-id="2">大赛任务</li>
<li lay-id="3" ${sign=='1'?'':'style="display:none"'}>成绩权重</li>
<li lay-id="4" ${sign=='1'?'':'style="display:none"'} class="cjwt">常见问题</li>
<li lay-id="5" ${sign=='1'?'':'style="display:none"'} class="dsdt">大赛动态</li>
@ -356,22 +356,6 @@
</div>
</div>
<!--大赛任务-->
<div class="layui-tab-item">
<div class="layui-tab layui-tab-brief" lay-filter="dsrw_demoTabBrief">
<ul class="layui-tab-title">
<li lay-id="0" class="layui-this">初赛</li>
<li lay-id="1">决赛</li>
<li lay-id="2">冠军邀请赛</li>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="edit_nav"><i class="layui-icon"></i></button>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show" id="dsrw_view"></div>
<div class="layui-tab-item" id="dsrw_view1"></div>
<div class="layui-tab-item" id="dsrw_view2"></div>
</div>
</div>
</div>
<!--竞赛时间-->
<div class="layui-tab-item">
<div class="layui-row">
@ -410,6 +394,23 @@
</div>
</div>
</div>
<!--大赛任务-->
<div class="layui-tab-item">
<div class="layui-tab layui-tab-brief" lay-filter="dsrw_demoTabBrief">
<ul class="layui-tab-title">
<li lay-id="0" class="layui-this">初赛</li>
<li lay-id="1">决赛</li>
<li lay-id="2">冠军邀请赛</li>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="edit_nav"><i class="layui-icon"></i></button>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show" id="dsrw_view"></div>
<div class="layui-tab-item" id="dsrw_view1"></div>
<div class="layui-tab-item" id="dsrw_view2"></div>
</div>
</div>
</div>
<!--成绩权重-->
<div class="layui-tab-item" ${sign=='1'?'':'style="display:none"'}>
<div style="margin: 0 60px 30px;;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;padding: 15px 20px 20px;">

6
web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
Unescape Escape View File

@ -208,11 +208,9 @@
}else if (obj.event === 'updateResources') {//上传资源
layer.open({
title: '在线调试'
,content: '配置各种参数，试试效果'
, btn: ['确定', '关闭']
,content: '<input type="radio" name="sex" value="nan" title="男">\n' +
'<input type="radio" name="sex" value="nv" title="女" checked>'
, shadeClose:true
, success:function () {}
, yes: function (index, layero) {}
, btn2: function (index, layero) {
layer.close(index);
}

2
web/src/main/resources/templates/jlw/schoolClass/add.html
Unescape Escape View File

@ -31,7 +31,7 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>专业：</label>
<label class="layui-form-label"><span class="req">*</span>所属专业：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId}"
id="universitySystemId" name="universitySystemId"/>

35
web/src/main/resources/templates/jlw/student/add.html
Unescape Escape View File

@ -11,8 +11,10 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>所属院校：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesColleges"/>
<layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}"
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesColleges"/>
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightOffAdd bg_button">去添加</button>
@ -28,7 +30,7 @@
</div>
</div>
</div>
</div>
</div>-->
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
@ -40,35 +42,38 @@
</div>
<button type="button" class="layui-btn layui-btn-sm rightOffUniversityAdd bg_button">去添加</button>
</div>
</div>-->
</div>
<!--#}else{-->
<input type="hidden" name="universitiesCollegesId" value="${universitiesCollegesId}">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>班级：</label>
<label class="layui-form-label"><span class="req">*</span>班级是：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${student.classId}" type="school_class.class_name.class_status=1,university_system_id=${universitySystemId}"
<layui:simpleDictSelect style='layui-input-inline' value="${student.classId}"
type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}"
id="classId" name="classId"/>
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightOffClassAdd bg_button">去添加</button>
</div>
</div>
<!--#}else{-->
<input type="hidden" name="universitiesCollegesId" value="${universitiesCollegesId}">
<!--#}-->
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>班级：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${student.classId}" type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}"
<label class="layui-form-label"><span class="req" >*</span>班级不是：</label>
<div class="layui-input-inline" value="${beTeacher}">
<layui:simpleDictSelect style='layui-input-inline' value="${student.classId}"
type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}"
id="classId" name="classId"/>
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightOffClassAdd bg_button">去添加</button>
</div>
</div>
<!--#}-->
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
@ -82,7 +87,7 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>学生学号：</label>
<label class="layui-form-label"><span class="req">*</span>学号：</label>
<div class="layui-input-inline">
<input type="text" name="studentSn" value="${student.studentSn}" class="layui-input" >
</div>
@ -112,7 +117,7 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">学生微信号：</label>
<label class="layui-form-label">微信号：</label>
<div class="layui-input-inline">
<input type="text" name="studentWeixinInfo" value="${student.studentWeixinInfo}" class="layui-input" >
</div>

14
web/src/main/resources/templates/jlw/studentClientLink/applicationAdmin.html
Unescape Escape View File

@ -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 = '<a class="layui-table-link" lay-event="edit">编辑</a>';
htm += '<a class="layui-table-link" lay-event="del">删除</a>';

16
web/src/main/resources/templates/jlw/studentClientLink/applicationOther.html
Unescape Escape View File

@ -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 = '<a class="layui-table-link" lay-event="edit">编辑</a>';
htm += '<a class="layui-table-link" lay-event="del">删除</a>';

13
web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/index.html
Unescape Escape View File

@ -1,6 +1,19 @@
<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseMergeCourseInfo/"}){ -->
<style>
/* 分页确定按钮*/
.layui-laypage-btn{
color: white!important;
}
.layui-table a {
margin-right: 50px;
}
</style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}">
</layui:searchForm>
<div class="layui-btn-group">
<layui:accessButton function="student.add" action="add"><i class="layui-icon">&#xe61f;</i>新增</layui:accessButton>
<layui:accessButton function="student.query" action="refresh" class="layui-btn-danger"><i class="layui-icon">&#xe640;</i>删除</layui:accessButton>
</div>
<table id="teacherOpenCourseMergeCourseInfoTable" lay-filter="teacherOpenCourseMergeCourseInfoTable"></table>
<!--#} -->

8
web/src/main/resources/templates/jlw/universitiesColleges/add.html
Unescape Escape View File

@ -28,7 +28,8 @@
</select>
</div>
</div>
<div class="layui-inline" id="receivingAddress">
<div id="receivingAddress">
<div class="layui-inline layui-form-item" >
<label class="layui-form-label"><span class="req">*</span>所属省份：</label>
<div class="layui-input-inline">
<select name="universitiesCollegesProvince" class="province" lay-verify="required" lay-search
@ -37,7 +38,7 @@
</select>
</div>
</div>
<div class="layui-inline">
<div class="layui-inline layui-form-item">
<label class="layui-form-label"><span class="req">*</span>所属城市：</label>
<div class="layui-input-inline">
<select name="universitiesCollegesCity" class="city" lay-verify="required" lay-search lay-filter="city">
@ -45,6 +46,7 @@
</select>
</div>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>院校联系人：</label>
<div class="layui-input-inline">
@ -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

Write Preview
Loading…
Cancel
Save