From 6fc8d84657664ab380cb215ef3c96b9817ebd2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Mon, 24 Oct 2022 20:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../static/js/jlw/competition/add.js | 43 ++++++++++++-------
.../templates/jlw/competition/add.html | 16 ++++++-
2 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/web/src/main/resources/static/js/jlw/competition/add.js b/web/src/main/resources/static/js/jlw/competition/add.js
index 29d4a3fd..73a9d5e9 100644
--- a/web/src/main/resources/static/js/jlw/competition/add.js
+++ b/web/src/main/resources/static/js/jlw/competition/add.js
@@ -206,7 +206,14 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
var sign = this.getAttribute('lay-id');
loadView(sign);
});
-
+ var onSign1 = 0; //当前显示的tab
+ element.on('tab(dsrw_demoTabBrief)', function () {
+ //saveInfo(1, onSign1);
+ var sign = this.getAttribute('lay-id');
+ //console.log(sign)
+ loadDSRW('', '', sign);
+ //loadView(sign);
+ });
//切换大赛模式 1：个人赛 2：团队赛
form.on('select(select_competitionType)', function (obj) {
competitionType_ = obj.value;
@@ -253,8 +260,8 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
//切换相应位置tab
var showSign = $("input[name='sign']").val();
$(".layui-tab-brief .layui-this").removeClass("layui-this");
- if(showSign == '2'&&i==7){//1:金融 2:模拟交易大赛
- i=2;
+ if (showSign == '2' && i == 7) {//1:金融 2:模拟交易大赛
+ i = 2;
}
$(".layui-tab-brief .layui-tab-title li:eq(" + (i - 1) + ")").addClass("layui-this");
$(".layui-tab-brief .layui-show").removeClass("layui-show");
@@ -271,9 +278,9 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
//切换相应位置tab
$(".layui-tab-brief .layui-this").removeClass("layui-this");
- console.log(showSign == '2'&&i==1)
- if(showSign == '2'&&i==1){//1:金融 2:模拟交易大赛
- i=6;
+
+ if (showSign == '2' && i == 1) {//1:金融 2:模拟交易大赛
+ i = 6;
}
$(".layui-tab-brief .layui-tab-title li:eq(" + (Number(i) + 1) + ")").addClass("layui-this");
$(".layui-tab-brief .layui-show").removeClass("layui-show");
@@ -375,7 +382,7 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
$(".sbx").css("margin-left", 60);
}
//保存的位置显示
- if (sign == 0 || sign == 3 || sign == 4 ||sign == 9 || sign == 10 || sign == 11 ) {
+ if (sign == 0 || sign == 3 || sign == 4 || sign == 9 || sign == 10 || sign == 11) {
$(".bc").removeClass("bc_c").removeClass("bc_c_").addClass("bc_r").show();
} else if (sign == 2 || sign == 5) {
$(".bc").addClass("bc_c").removeClass("bc_c_").removeClass("bc_r").show();
@@ -1336,7 +1343,7 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
pd_fz: ""
};
- function loadDSRW(tag, input_key) { //tag == 1 抽题
+ function loadDSRW(tag, input_key, nav) { //tag == 1 抽题
var ct1QuestionIds = $("input[name='ct1QuestionIds']").val();
var ct2QuestionIds = $("input[name='ct2QuestionIds']").val();
var singleChoiceNum = $("input[name='singleChoiceNum']").val();//单选题数量
@@ -1372,10 +1379,7 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
fzMap['jsfz_' + v.resourcesCompetitionId] = v.stepScore;
}
});
-
- var getTpl = dsrw_demo.innerHTML
- , view = document.getElementById('dsrw_view');
- laytpl(getTpl).render({
+ var data = {
cT1QuestionList: ret.data.cT1QuestionList,
ct1QuestionTotalScore: ret.data.ct1QuestionTotalScore,
cT2QuestionList: ret.data.cT2QuestionList,
@@ -1384,11 +1388,20 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
ct2QuestionIds: ret.ct2QuestionIds,
fzMap: fzMap,
timeInfo: timeInfo
- }, function (html) {
+ };
+ var getTpl = dsrw_demo.innerHTML,
+ view = document.getElementById('dsrw_view');
+ if (nav == '1') {
+ view = document.getElementById('dsrw_view1');
+ } else if (nav == '2') {
+ view = document.getElementById('dsrw_view2');
+ }
+
+ laytpl(getTpl).render(data, function (html) {
view.innerHTML = html;
jiSuanZF();
if (tag == 1) {
- var str = $("input[name='" + input_key + "']").val()
+ var str = $("input[name='" + input_key + "']").val();
$("input[name='" + input_key + "']").val("").focus().val(str);
}
$(".kgt_select").click(kgt_select);//客观题选择
@@ -1841,7 +1854,7 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi',
//保存相应数据
$(".bc").click(function () {
- layer.confirm('是否保存？？', {icon: 3, title:'提示'}, function(index){
+ layer.confirm('是否保存？？', {icon: 3, title: '提示'}, function (index) {
saveInfo();
//layer.close(index);
});
diff --git a/web/src/main/resources/templates/jlw/competition/add.html b/web/src/main/resources/templates/jlw/competition/add.html
index 754013ca..38993e2d 100644
--- a/web/src/main/resources/templates/jlw/competition/add.html
+++ b/web/src/main/resources/templates/jlw/competition/add.html
@@ -357,8 +357,20 @@
</div>
<!--大赛任务-->
- <div class="layui-tab-item" id="dsrw_view">
-
+ <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">