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

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;
@@ -271,7 +278,7 @@ 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;
         }
@@ -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 data = {
-            var getTpl = dsrw_demo.innerHTML
-                , view = document.getElementById('dsrw_view');
-            laytpl(getTpl).render({
                 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);//客观题选择

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">