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

班级添加

Browse Source
beetlsql3-dev
姚丹ab 2 years ago
parent 9585cd65e9
commit 2ac0bacd9c
6 changed files with 90 additions and 41 deletions
Show Stats Download Patch File Download Diff File

10
web/src/main/java/com/ibeetl/jlw/web/TeachingManagementController.java
Unescape Escape View File

@ -13,7 +13,9 @@ import com.ibeetl.admin.core.util.TimeTool;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.jlw.entity.TeachingManagement;
import com.ibeetl.jlw.entity.UniversitiesColleges;
import com.ibeetl.jlw.service.TeachingManagementService;
import com.ibeetl.jlw.service.UniversitiesCollegesService;
import com.ibeetl.jlw.web.query.TeachingManagementQuery;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
@ -59,6 +61,7 @@ public class TeachingManagementController{
@Autowired private TeachingManagementService teachingManagementService;
@Autowired private UniversitiesCollegesService universitiesCollegesService;
@Autowired FileService fileService;
/* 前端接口 */
@ -118,7 +121,7 @@ public class TeachingManagementController{
@GetMapping(MODEL + "/add.do")
@Function("teachingManagement.add")
public ModelAndView add(Long teacherMergeClassThirdId) {
public ModelAndView add(Long teacherMergeClassThirdId, @SCoreUser CoreUser coreUser) {
ModelAndView view = new ModelAndView("/jlw/teachingManagement/add.html");
if(null != teacherMergeClassThirdId){
TeachingManagement teachingManagement = teachingManagementService.queryById(teacherMergeClassThirdId);
@ -126,6 +129,11 @@ public class TeachingManagementController{
}else {
view.addObject("teachingManagement", new TeachingManagement());
}
// 如果是学校管理员则查询所在院校的信息
if (coreUser.isUniAdmin()) {
UniversitiesColleges universitiesColleges = universitiesCollegesService.getByOrgId(coreUser.getOrgId());
view.addObject("universitiesCollegesInfo", universitiesColleges);
}
return view;
}

66
web/src/main/resources/static/js/jlw/competition/add.js
Unescape Escape View File

@ -208,10 +208,10 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
var sign = this.getAttribute('lay-id');
//切换相应位置tab
$(".layui-tab-briefs .layui-this").removeClass("layui-this");
$(".layui-tab-briefs .layui-tab-title li:eq(" + sign + ")").addClass("layui-this");
$(".layui-tab-briefs .layui-show").removeClass("layui-show");
$(".layui-tab-briefs .layui-tab-contents .layui-tab-itemInfo:eq(" + sign + ")").addClass("layui-show");
$(".tabClick .layui-this").removeClass("layui-this");
$(".tabClick .layui-tab-title li:eq(" + sign + ")").addClass("layui-this");
$(".tabClick .layui-show").removeClass("layui-show");
$(".tabClick .layui-tab-contents .layui-tab-itemInfo:eq(" + sign + ")").addClass("layui-show");
loadView(sign);
});
@ -264,20 +264,20 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
//上一步
$(".syb").click(function () {
saveInfo(1);
var i = $(".layui-tab-briefs .layui-this").attr("lay-id");//当前操作tab位置
var i = $(".tabClick .layui-this").attr("lay-id");//当前操作tab位置
//切换相应位置tab
var showSign = $("input[name='sign']").val();
$(".layui-tab-briefs .layui-this").removeClass("layui-this");
// if (showSign == '2' && i == 7) {//1:金融 2:模拟交易大赛
// i = 3;
// }else if(showSign == '2' && i == 2){
// i = 1;
// }
$(".layui-tab-briefs .layui-tab-title li:eq(" + (Number(i) - 1) + ")").addClass("layui-this");
$(".layui-tab-briefs .layui-show").removeClass("layui-show");
$(".layui-tab-briefs .layui-tab-contents .layui-tab-itemInfo:eq(" + (Number(i) - 1) + ")").addClass("layui-show");
$(".tabClick .layui-this").removeClass("layui-this");
if (showSign == '2' && i == 7) {//1:金融 2:模拟交易大赛
i = 3;
}else if(showSign == '2' && i == 2){
i = 1;
}
$(".tabClick .layui-tab-title li:eq(" + (Number(i) - 1) + ")").addClass("layui-this");
$(".tabClick .layui-show").removeClass("layui-show");
$(".tabClick .layui-tab-contents .layui-tab-itemInfo:eq(" + (Number(i) - 1) + ")").addClass("layui-show");
loadView(i - 1);
});
@ -286,21 +286,21 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
$(".xyb").click(function () {
saveInfo(1);
var showSign = $("input[name='sign']").val();
var i = $(".layui-tab-briefs .layui-this").attr("lay-id");//当前操作tab位置
var i = $(".tabClick .layui-this").attr("lay-id");//当前操作tab位置
//切换相应位置tab
$(".layui-tab-briefs .layui-this").removeClass("layui-this");
// if (showSign == '2' && i == 2) {//1:金融 2:模拟交易大赛
// i = 6;
// }else if(showSign == '2' && i == 0){
// i = 1;
//
// }
$(".layui-tab-briefs .layui-tab-title li:eq(" + (Number(i) + 1) + ")").addClass("layui-this");
$(".layui-tab-briefs .layui-show").removeClass("layui-show");
$(".layui-tab-briefs .layui-tab-contents .layui-tab-itemInfo:eq(" + (Number(i) + 1) + ")").addClass("layui-show");
$(".tabClick .layui-this").removeClass("layui-this");
if (showSign == '2' && i == 2) {//1:金融 2:模拟交易大赛
i = 6;
}else if(showSign == '2' && i == 0){
i = 1;
}
$(".tabClick .layui-tab-title li:eq(" + (Number(i) + 1) + ")").addClass("layui-this");
$(".tabClick .layui-show").removeClass("layui-show");
$(".tabClick .layui-tab-contents .layui-tab-itemInfo:eq(" + (Number(i) + 1) + ")").addClass("layui-show");
loadView(Number(i) + 1);
});
@ -1858,10 +1858,10 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
function isCompetition() {
var competitionId = $("input[name='competitionId']").val(); //为空时则需要先添加大赛概况才能继续下一步
if ($.isEmpty(competitionId)) {
$(".layui-tab-briefs .layui-this").removeClass("layui-this");
$(".layui-tab-briefs .layui-tab-title li:eq(0)").addClass("layui-this");
$(".layui-tab-briefs .layui-show").removeClass("layui-show");
$(".layui-tab-briefs .layui-tab-contents .layui-tab-itemInfo:eq(0)").addClass("layui-show");
$(".tabClick .layui-this").removeClass("layui-this");
$(".tabClick .layui-tab-title li:eq(0)").addClass("layui-this");
$(".tabClick .layui-show").removeClass("layui-show");
$(".tabClick .layui-tab-contents .layui-tab-itemInfo:eq(0)").addClass("layui-show");
layer.msg("请先添加大赛概况并保存！", {
offset: ['50%'],
@ -1883,7 +1883,7 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
});
function saveInfo(t, on) {
var i = $(".layui-tab-briefs .layui-this").attr("lay-id");//当前操作tab位置
var i = $(".tabClick .layui-this").attr("lay-id");//当前操作tab位置
if (on === 0 || (on !== "" && on != null)) {
i = on;
}

6
web/src/main/resources/static/js/jlw/teachingManagement/add.js
Unescape Escape View File

@ -33,6 +33,10 @@ layui.define([ 'form', 'laydate', 'table','teachingManagementApi'], function(exp
});
}
}
};
//查询专业
form.on('select(select_universityFaculty)', function (obj) {
Lib.getUniversitySystems($("select[name='universitySystemId']"),obj.value);
});
exports('add',view);
});

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

@ -105,7 +105,7 @@
<button type="button" class="layui-btn bg_button bc bc_r">保存</button>
<input type="hidden" name="competitionId" value="${competition.competitionId}"/>
<input type="hidden" name="sign" value="${sign}"/>
<div class="layui-tab layui-tab-briefs" lay-filter="docDemoTabBrief">
<div class="layui-tab layui-tab-brief tabClick" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li lay-id="0" class="layui-this">大赛概况</li>
<li lay-id="1" ${sign=='1'?'':'style="display:none"'}>竞赛时间</li>

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

@ -24,7 +24,7 @@
<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="${universityFacultyId}" type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${schoolClass.universitiesCollegesId}"
<layui:simpleDictSelect style='layui-input-inline' type="university_faculty.university_faculty_name.university_faculty_status=1,find_in_set(org_id, ${user.get().orgId!''})"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFacultyIds"/>
</div>
</div>
@ -33,9 +33,9 @@
<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>所属专业：${universityFacultyId}</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}"
<layui:simpleDictSelect style='layui-input-inline' type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universitiesCollegesInfo.universitiesCollegesId}"
id="universitySystemId" name="universitySystemId"/>
</div>
</div>

41
web/src/main/resources/templates/jlw/teachingManagement/add.html
Unescape Escape View File

@ -1,7 +1,44 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teachingManagement/"}){ -->
<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
<form class="layui-form" id="addForm">
<div class="layui-row">
<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">
<input type="text" value="${universitiesCollegesInfo.universitiesCollegesName}"
class="layui-input" disabled="disabled" style="background-color: #e7e7e7">
<input type="hidden" name="universitiesCollegesId"
value="${universitiesCollegesInfo.universitiesCollegesId}" class="layui-input">
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">所属院系：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${schoolClass.universitiesCollegesId}"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFaculty"/>
</div>
</div>
</div>
</div>
<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' type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId}"
id="universitySystemId" name="universitySystemId" layFilter="select_universitySystemId" />
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightOffUniversityAdd bg_button">去添加</button>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">院系信息</label>

Write Preview
Loading…
Cancel
Save