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
姚丹ab 2 years ago
parent 4721d153e1 6b50a2bb24
commit 3b4b7c1d46
17 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File

4
admin-console/src/main/resources/templates/admin/user/edit.html
Unescape Escape View File

@ -51,7 +51,6 @@
id="jobType1" name="jobType1" value="${user.jobType1}" group="job_type"/>
</div>
</div>
<!--#if(session["core:user"].id != user.id){ -->
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label">用户状态</label>
@ -68,8 +67,7 @@
<div class="layui-form-mid layui-word-aux">禁用时用户无法登陆系统</div>
</div>
</div>
<!--#} -->
<!-- <div class="layui-row">-->
<!-- <layui:attachment name="attachmentId" batchFileUUID="${user.attachmentId}" isNew="false" bizId="${user.id}" bizType="User"/>-->
<!-- </div>-->

1
web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java
Unescape Escape View File

@ -250,6 +250,7 @@ public class UniversitiesCollegesController{
header.put("universitiesCollegesContactsEmail", "联系人邮箱");
header.put("addTime", "添加时间");
param.setUniversitiesCollegesStatus(1);
List<UniversitiesColleges> datas = universitiesCollegesService.getValues(param);
List<Map<String, Object>> maps = BeanCopyUtil.baseEntity2MapWithParallel(datas);

4
web/src/main/resources/application-prod.properties
Unescape Escape View File

@ -8,8 +8,8 @@ springext.cache.redis.ttl=300
logging.level.root=ERROR
#logging.level.root=DEBUG
logging.level.org.springframework.web=DEBUG
logging.level.org.springframework.web.servlet.mvc.method.annotation=DEBUG
logging.level.org.springframework.web=ERROR
logging.level.org.springframework.web.servlet.mvc.method.annotation=ERROR
logging.file.name = my.log
logging.pattern.console=%-4relative [%thread] %-5level %logger{256} %M %L - %msg%n

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

@ -113,7 +113,7 @@
<label class="layui-form-label">课程名称</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds" name="courseInfoId_0"
layFilter="select_courseInfoIds"/>
</div>

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

@ -46,7 +46,7 @@
<label class="layui-form-label"><span class="req">*</span>归属课程：</label>
<div class="layui-input-block">
<layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}"
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds" name="courseInfoId" layFilter="select_courseInfoIds"/>
</div>
</div>

2
web/src/main/resources/templates/jlw/handsOn/index.html
Unescape Escape View File

@ -13,7 +13,7 @@
<label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoId" name="courseInfoId"
layFilter="select_courseInfoIds"/>
</div>

2
web/src/main/resources/templates/jlw/handsOn/index1.html
Unescape Escape View File

@ -4,7 +4,7 @@
<label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds" name="courseInfoId_0"
layFilter="select_courseInfoIds"/>
</div>

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

@ -39,7 +39,7 @@
<label class="layui-form-label">归属课程：</label>
<div class="layui-input-block">
<layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}"
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds" name="courseInfoId_0" layFilter="select_courseInfoIds"/>
</div>
</div>

2
web/src/main/resources/templates/jlw/resourcesCompetition/index.html
Unescape Escape View File

@ -13,7 +13,7 @@
<label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds" name="courseInfoId_0"
layFilter="select_courseInfoIds"/>
</div>

4
web/src/main/resources/templates/jlw/resourcesInfo/index.html
Unescape Escape View File

@ -41,7 +41,7 @@
<label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoId" name="courseInfoId_1"
layFilter="select_courseInfoIds_"/>
</div>
@ -82,7 +82,7 @@
<label class="layui-form-label">归属课程：</label>
<div class="layui-input-block">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseId" name="courseId" layFilter="select_courseId"/>
</div>
</div>

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

@ -8,7 +8,7 @@
<div class="layui-inline">
<label class="layui-form-label">归属课程：</label>
<div class="layui-input-inline" style="margin-left: 30px;">
<layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
<layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds" name="courseInfoId_0" layFilter="select_courseInfoIds"/>
</div>
</div>

6
web/src/main/resources/templates/jlw/resourcesQuestion/index.html
Unescape Escape View File

@ -19,7 +19,7 @@
<label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds" name="courseInfoId_0"
layFilter="select_courseInfoIds"/>
</div>
@ -63,7 +63,7 @@
<label class="layui-form-label">课程：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds1" name="courseInfoIds_1"
layFilter="select_courseInfoIds"/>
</div>
@ -91,7 +91,7 @@
<label class="layui-form-label">课程：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds" name="courseInfoIds_2"
layFilter="select_courseInfoIds_"/>
</div>

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

@ -38,7 +38,7 @@
<div class="layui-form-item">
<label class="layui-form-label">归属课程：</label>
<div class="layui-input-block">
<layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
<layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds" name="courseInfoId_0" layFilter="select_courseInfoIds"/>
</div>
</div>

2
web/src/main/resources/templates/jlw/resourcesTraining/index.html
Unescape Escape View File

@ -13,7 +13,7 @@
<label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="courseInfoIds" name="courseInfoId_0"
layFilter="select_courseInfoIds"/>
</div>

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

@ -7,7 +7,7 @@
<label class="layui-form-label">知识点归属课程</label>
<div class="layui-input-inline">
<!-- <input type="text" id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseKnowledgePoint.teacherOpenCourseId}" class="layui-input" >-->
<layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseKnowledgePoint.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
<layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseKnowledgePoint.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="teacherOpenCourseId" name="teacherOpenCourseId" layFilter="select_courseInfoIds"/>
</div>
</div>

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

@ -90,7 +90,7 @@
<div class="layui-inline">
<label class="layui-form-label">知识点归属课程</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseScoreDashboard.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
<layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseScoreDashboard.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="teacherOpenCourseId" name="teacherOpenCourseId" layFilter="select_courseInfoIds"/>
</div>
</div>

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

@ -264,7 +264,7 @@
<div class="layui-inline">
<label class="layui-form-label">知识点归属课程</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseScoreWeight.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
<layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseScoreWeight.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
id="teacherOpenCourseId" name="teacherOpenCourseId" layFilter="select_courseInfoIds"/>
</div>
</div>

Write Preview
Loading…
Cancel
Save