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 2 years ago
parent d66f27ea72 8f11ab26d6
commit d8b3391c3f
2 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File

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

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

30
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-brief" lay-filter="docDemoTabBrief">
<div class="layui-tab layui-tab-briefs" 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>
@ -123,9 +123,9 @@
<li lay-id="11" class="cjwt" ${sign=='2'?'':'style="display:none"'}>大赛新闻</li>
<li lay-id="12" class="cjwt" ${sign=='2'?'':'style="display:none"'}>院校风采</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-contents" style="margin-top: 10px;">
<!--大赛概况0-->
<div class="layui-tab-item layui-show">
<div class="layui-tab-item layui-tab-itemInfo layui-show">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>大赛名称：</label>
@ -357,7 +357,7 @@
</div>
<!--竞赛时间-->
<div class="layui-tab-item">
<div class="layui-tab-item layui-tab-itemInfo">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">竞赛阶段：</label>
@ -395,7 +395,7 @@
</div>
</div>
<!--大赛任务-->
<div class="layui-tab-item">
<div class="layui-tab-item layui-tab-itemInfo">
<div class="layui-tab layui-tab-brief" lay-filter="dsrw_demoTabBrief">
<ul class="layui-tab-title">
<li lay-id="0" class="layui-this">初赛</li>
@ -412,7 +412,7 @@
</div>
<!--成绩权重-->
<div class="layui-tab-item" ${sign=='1'?'':'style="display:none"'}>
<div class="layui-tab-item layui-tab-itemInfo" ${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;">
<div class="layui-row">
<label class="layui-form-label"></label>
@ -503,7 +503,7 @@
</div>
</div>
<!-- 常见问题4 competitionCommonProblem-->
<div class="layui-tab-item">
<div class="layui-tab-item layui-tab-itemInfo">
<div style="min-width: 1200px;">
<div class="layui-row">
<div class="layui-inline" style="width: 96%;">
@ -528,7 +528,7 @@
</div>
</div>
<!--大赛动态5 动态内容：competitionNewsContent 动态图片：competitionNewsPicture-->
<div class="layui-tab-item">
<div class="layui-tab-item layui-tab-itemInfo">
<div style="min-width: 1200px;">
<blockquote class="layui-elem-quote">新增动态</blockquote>
<div class="layui-row" style="margin-left: 90px">
@ -606,7 +606,7 @@
</div>
</div>
<!--获奖名单 competitionAwardList-->
<div class="layui-tab-item">
<div class="layui-tab-item layui-tab-itemInfo">
<div style="min-width: 1200px;">
<div class="layui-row">
<div class="layui-inline" style="width: 96%;">
@ -633,22 +633,22 @@
</div>
<!--赛组管理-->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
<div class="layui-tab-item layui-tab-itemInfo" ${sign=='2'?'':'style="display:none"'}>
</div>
<!--赛制赛程-->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
<div class="layui-tab-item layui-tab-itemInfo" ${sign=='2'?'':'style="display:none"'}>
</div>
<!--交易规则-->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
<div class="layui-tab-item layui-tab-itemInfo" ${sign=='2'?'':'style="display:none"'}>
</div>
<!--奖项设置-->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
<div class="layui-tab-item layui-tab-itemInfo" ${sign=='2'?'':'style="display:none"'}>
</div>
<!--大赛新闻11-->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
<div class="layui-tab-item layui-tab-itemInfo" ${sign=='2'?'':'style="display:none"'}>
</div>
<!--院校风采12-->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
<div class="layui-tab-item layui-tab-itemInfo" ${sign=='2'?'':'style="display:none"'}>
<div style="min-width: 1200px;">
<blockquote class="layui-elem-quote">新增风采</blockquote>
<div class="layui-row">

Write Preview
Loading…
Cancel
Save