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 be6dda96..eb8d3981 100644
--- a/web/src/main/resources/static/js/jlw/competition/add.js
+++ b/web/src/main/resources/static/js/jlw/competition/add.js
@@ -1,4 +1,4 @@
-layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','tree'], function(exports) {
+layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', 'tree'], function (exports) {
     var form = layui.form;
     var competitionApi = layui.competitionApi;
     var index = layui.index;
@@ -18,18 +18,22 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     var tag_ = 0; //用于判断是否第一次加载编辑对话框的树结构 避免多次加载
     var getTreeByCourseLabelTypes = []; //编辑对话框的树结构 数据
 
-    if(!$.isEmpty($("input[name='competitionId']").val())){
-        var ret = Common.getAjax("/jlw/competition/view.json",{competitionId:$("input[name='competitionId']").val(),part: 1});
-        if(ret.code == 0){
+    if (!$.isEmpty($("input[name='competitionId']").val())) {
+        var ret = Common.getAjax("/jlw/competition/view.json", {
+            competitionId: $("input[name='competitionId']").val(),
+            part: 1
+        });
+        if (ret.code == 0) {
             $("#competitionGeneralization textarea").val(Lib.repLaceltgt(ret.data.competitionGeneralizationOriginal));
-        }else {
-            layer.msg(ret.msg, {icon: 2,time: 1500});
+        } else {
+            layer.msg(ret.msg, {icon: 2, time: 1500});
         }
     }
     var editor1 = Lib.editorMd("competitionGeneralization"),//大赛概况
         editor2,//获奖名单
         editor3,//动态内容
-        editor4;//常见问题
+        editor4,//常见问题
+        editor12;//校园风采
 
     //上传LOGO
     upload.render({
@@ -37,7 +41,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
         , url: Common.ctxPath + "/jlw/file/update.do"
         , done: function (res) {//每成功一次调用
             $("#logo").hide();
-            layui.$('#uploadDemoView').removeClass('layui-hide').find('img').attr('src',Common.ctxPath + res.data.src);
+            layui.$('#uploadDemoView').removeClass('layui-hide').find('img').attr('src', Common.ctxPath + res.data.src);
             $("input[name='competitionLogo']").val(res.data.src);
         }
     });
@@ -47,7 +51,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
         , url: Common.ctxPath + "/jlw/file/update.do"
         , done: function (res) {//每成功一次调用
             $("#competitionCarouselImage1").hide();
-            layui.$('#competitionCarouselImage1_1').removeClass('layui-hide').find('img').attr('src',Common.ctxPath + res.data.src);
+            layui.$('#competitionCarouselImage1_1').removeClass('layui-hide').find('img').attr('src', Common.ctxPath + res.data.src);
             $("input[name='competitionCarouselImage1']").val(res.data.src);
         }
     });
@@ -57,7 +61,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
         , url: Common.ctxPath + "/jlw/file/update.do"
         , done: function (res) {//每成功一次调用
             $("#competitionCarouselImage2").hide();
-            layui.$('#competitionCarouselImage2_1').removeClass('layui-hide').find('img').attr('src',Common.ctxPath + res.data.src);
+            layui.$('#competitionCarouselImage2_1').removeClass('layui-hide').find('img').attr('src', Common.ctxPath + res.data.src);
             $("input[name='competitionCarouselImage2']").val(res.data.src);
         }
     });
@@ -67,7 +71,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
         , url: Common.ctxPath + "/jlw/file/update.do"
         , done: function (res) {//每成功一次调用
             $("#competitionCarouselImage3").hide();
-            layui.$('#competitionCarouselImage3_1').removeClass('layui-hide').find('img').attr('src',Common.ctxPath + res.data.src);
+            layui.$('#competitionCarouselImage3_1').removeClass('layui-hide').find('img').attr('src', Common.ctxPath + res.data.src);
             $("input[name='competitionCarouselImage3']").val(res.data.src);
         }
     });
@@ -78,7 +82,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
         , url: Common.ctxPath + "/jlw/file/update.do"
         , done: function (res) {//每成功一次调用
             $("#newsPicture").hide();
-            layui.$('#uploadDemoView_1').removeClass('layui-hide').find('img').attr('src',Common.ctxPath + res.data.src);
+            layui.$('#uploadDemoView_1').removeClass('layui-hide').find('img').attr('src', Common.ctxPath + res.data.src);
             $("input[name='competitionNewsPicture']").val(res.data.src);
         }
     });
@@ -86,12 +90,12 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
 
     laydate.render({
         elem: '#enrollRange'
-        ,range: "至" //或 range: '~' 来自定义分割字符
-        ,type: 'datetime'
-        ,trigger: 'click'
-        ,format: 'yyyy-MM-dd HH:mm'
-        ,done: function(value, date, endDate){
-            if(!$.isEmpty(value)){
+        , range: "至" //或 range: '~' 来自定义分割字符
+        , type: 'datetime'
+        , trigger: 'click'
+        , format: 'yyyy-MM-dd HH:mm'
+        , done: function (value, date, endDate) {
+            if (!$.isEmpty(value)) {
                 $("#addForm input[name='competitionEnrollStartTime']").val(value.split(" 至 ")[0]);
                 $("#addForm input[name='competitionEnrollEndTime']").val(value.split(" 至 ")[1]);
             }
@@ -99,12 +103,12 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     });
     laydate.render({
         elem: '#enrollRange2'
-        ,range: "至" //或 range: '~' 来自定义分割字符
-        ,type: 'datetime'
-        ,trigger: 'click'
-        ,format: 'yyyy-MM-dd HH:mm'
-        ,done: function(value, date, endDate){
-            if(!$.isEmpty(value)){
+        , range: "至" //或 range: '~' 来自定义分割字符
+        , type: 'datetime'
+        , trigger: 'click'
+        , format: 'yyyy-MM-dd HH:mm'
+        , done: function (value, date, endDate) {
+            if (!$.isEmpty(value)) {
                 $("#addForm input[name='competitionFreetrialStartTime']").val(value.split(" 至 ")[0]);
                 $("#addForm input[name='competitionFreetrialEndTime']").val(value.split(" 至 ")[1]);
             }
@@ -112,15 +116,15 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     });
     laydate.render({
         elem: '#contestRange'
-        ,range: "至" //或 range: '~' 来自定义分割字符
-        ,type: 'datetime'
-        ,format: 'yyyy-MM-dd HH:mm'
-        ,done: function(value, date, endDate){
-            if(!$.isEmpty(value)){
+        , range: "至" //或 range: '~' 来自定义分割字符
+        , type: 'datetime'
+        , format: 'yyyy-MM-dd HH:mm'
+        , done: function (value, date, endDate) {
+            if (!$.isEmpty(value)) {
                 $("#addForm input[name='competitionContestStartTime']").val(value.split(" 至 ")[0]);
                 $("#addForm input[name='competitionContestEndTime']").val(value.split(" 至 ")[1]);
                 //$(".renWu").show();
-            }else {
+            } else {
                 $("#addForm input[name='competitionContestStartTime']").val("");
                 $("#addForm input[name='competitionContestEndTime']").val("");
                 // $(".renWu").hide();
@@ -132,14 +136,14 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
 
     laydate.render({
         elem: '#renwu3'
-        ,range: "至" //或 range: '~' 来自定义分割字符
-        ,type: 'datetime'
-        ,format: 'yyyy-MM-dd HH:mm'
-        ,done: function(value, date, endDate){
-            if(!$.isEmpty(value)){
+        , range: "至" //或 range: '~' 来自定义分割字符
+        , type: 'datetime'
+        , format: 'yyyy-MM-dd HH:mm'
+        , done: function (value, date, endDate) {
+            if (!$.isEmpty(value)) {
                 $("#addForm input[name='competitionTaskThreeStartTime']").val(value.split(" 至 ")[0]);
                 $("#addForm input[name='competitionTaskThreeEndTime']").val(value.split(" 至 ")[1]);
-            }else {
+            } else {
                 $("#addForm input[name='competitionTaskThreeStartTime']").val("");
                 $("#addForm input[name='competitionTaskThreeEndTime']").val("");
             }
@@ -147,26 +151,26 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     });
 
     var view = {
-        init:function(){
-            Lib.initGenrealForm($("#addForm"),form);
+        init: function () {
+            Lib.initGenrealForm($("#addForm"), form);
             this.initSubmit();
         },
-        initSubmit:function(){
-            $("#addButton").click(function(){
+        initSubmit: function () {
+            $("#addButton").click(function () {
                 saveInfo(1);//先保存再发布
                 var param = {
-                    competitionStatus:1,
-                    competitionId:$("input[name='competitionId']").val()
+                    competitionStatus: 1,
+                    competitionId: $("input[name='competitionId']").val()
                 }
-                if($.isEmpty(param.competitionId)){
+                if ($.isEmpty(param.competitionId)) {
                     layer.msg("请先添加大赛!", {
                         offset: ['50%'],
                         icon: 2,
                         time: 1500 //2秒关闭(如果不配置,默认是3秒)
                     });
-                    return ;
+                    return;
                 }
-                var ret = Common.postAjax("/jlw/competition/editCompetitionStatus.json",param);
+                var ret = Common.postAjax("/jlw/competition/editCompetitionStatus.json", param);
                 layer.msg(ret.code == 0 ? "发布成功!" : ret.msg, {
                     offset: ['50%'],
                     icon: ret.code == 0 ? 1 : 2,
@@ -178,8 +182,8 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                     }
                 });
             });
-        
-            $("#addButton-cancel").click(function(){
+
+            $("#addButton-cancel").click(function () {
                 Lib.closeFrame();
             });
         }
@@ -187,8 +191,8 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
 
     //监听tab切换
     var onSign = 0; //当前显示的tab
-    element.on('tab(docDemoTabBrief)', function(){
-        saveInfo(1,onSign);
+    element.on('tab(docDemoTabBrief)', function () {
+        saveInfo(1, onSign);
         var sign = this.getAttribute('lay-id');
         loadView(sign);
     });
@@ -196,24 +200,24 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     //切换大赛模式 1:个人赛 2:团队赛
     form.on('select(select_competitionType)', function (obj) {
         competitionType_ = obj.value;
-        if(competitionType_ == 1){
+        if (competitionType_ == 1) {
             $(".competitionTeamLimit").hide();
             $("input[name='competitionTeamLimit_1'],input[name='competitionTeamLimit_2']").val("");
-        }else if(competitionType_ == 2){
+        } else if (competitionType_ == 2) {
             $(".competitionTeamLimit").show();
         }
     });
 
     //提交保存数据
-    function submitInfo(param,t){
+    function submitInfo(param, t) {
         var url = "/jlw/competition/add.json";
-        if(!$.isEmpty(param.competitionId)){
+        if (!$.isEmpty(param.competitionId)) {
             url = "/jlw/competition/edit.json";
         }
-        var ret = Common.postAjax(url,param);
-        if(ret.code == 0){
-            if(t != 1){
-                layer.msg("保存成功!",{
+        var ret = Common.postAjax(url, param);
+        if (ret.code == 0) {
+            if (t != 1) {
+                layer.msg("保存成功!", {
                     offset: ['50%'],
                     icon: 1,
                     time: 1500 //2秒关闭(如果不配置,默认是3秒)
@@ -222,8 +226,8 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             $("input[name='competitionId']").val(ret.data);
             parent.Lib.tableRefresh();
             //showTitle();
-        }else {
-            layer.msg(ret.msg,{
+        } else {
+            layer.msg(ret.msg, {
                 offset: ['50%'],
                 icon: 2,
                 time: 1500 //2秒关闭(如果不配置,默认是3秒)
@@ -233,131 +237,166 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     }
 
     //上一步
-    $(".syb").click(function (){
+    $(".syb").click(function () {
         saveInfo(1);
         var i = $(".layui-tab-brief .layui-this").attr("lay-id");//当前操作tab位置
         //切换相应位置tab
         $(".layui-tab-brief .layui-this").removeClass("layui-this");
-        $(".layui-tab-brief .layui-tab-title li:eq("+ (i - 1) +")").addClass("layui-this");
+        $(".layui-tab-brief .layui-tab-title li:eq(" + (i - 1) + ")").addClass("layui-this");
         $(".layui-tab-brief .layui-show").removeClass("layui-show");
-        $(".layui-tab-brief .layui-tab-content .layui-tab-item:eq("+ (i - 1) +")").addClass("layui-show");
+        $(".layui-tab-brief .layui-tab-content .layui-tab-item:eq(" + (i - 1) + ")").addClass("layui-show");
         loadView(i - 1);
 
     });
 
     //下一步
-    $(".xyb").click(function (){
+    $(".xyb").click(function () {
         saveInfo(1);
         var i = $(".layui-tab-brief .layui-this").attr("lay-id");//当前操作tab位置
 
         //切换相应位置tab
         $(".layui-tab-brief .layui-this").removeClass("layui-this");
-        $(".layui-tab-brief .layui-tab-title li:eq("+ (Number(i) + 1) +")").addClass("layui-this");
+        $(".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-brief .layui-tab-content .layui-tab-item:eq(" + (Number(i) + 1) + ")").addClass("layui-show");
 
         loadView(Number(i) + 1);
     });
 
     //上一步下一步 时 加载 //sign = 0:大赛概况 1:竞赛时间 2:参赛学员 3:大赛任务 4:成绩权重 5:大赛评委
-    function loadView(sign){
+    //part 代表部分值 1大赛概况 2竞赛时间 3参赛学员 4大赛任务 5成绩权重 6大赛评委 7获奖名单 8大赛动态 9常见问题
+    function loadView(sign) {
         onSign = sign;
-        if(sign == 0){
+        if (sign == 0) {
             $(".syb").hide();
             $(".xyb").show();
             $(".sbx").show();
-        }else if(sign == 1 || sign == 2 || sign == 3 || sign == 4
+        } else if (sign == 1 || sign == 2 || sign == 3 || sign == 4
+            || sign == 5
             || sign == 6
             || sign == 7
-            || sign == 8
-            || sign == 5 ){
+            || sign == 9
+            || sign == 10
+            || sign == 11) {
             $(".syb").show();
             $(".xyb").show();
             $(".sbx").show();
-            if(sign == 3){
+            if (sign == 3) {
                 loadDSRW();
             }
-            if(sign == 8 && $.isEmpty(editor2)){
-                if(!$.isEmpty($("input[name='competitionId']").val())){
-                    var ret = Common.getAjax("/jlw/competition/view.json",{competitionId:$("input[name='competitionId']").val(),part: 7});
-                    if(ret.code == 0){
-                        $("#competitionAwardList textarea").val(Lib.repLaceltgt(ret.data.competitionAwardListOriginal));
-                    }else {
-                        layer.msg(ret.msg, {icon: 2,time: 1500});
+            if (sign == 6 && $.isEmpty(editor4)) {
+                if (!$.isEmpty($("input[name='competitionId']").val())) {
+                    var ret = Common.getAjax("/jlw/competition/view.json", {
+                        competitionId: $("input[name='competitionId']").val(),
+                        part: 9
+                    });
+                    if (ret.code == 0) {
+                        $("#competitionCommonProblem textarea").val(Lib.repLaceltgt(ret.data.competitionCommonProblemOriginal));
+                    } else {
+                        layer.msg(ret.msg, {icon: 2, time: 1500});
                     }
                 }
-                editor2 = Lib.editorMd("competitionAwardList");
+                editor4 = Lib.editorMd("competitionCommonProblem");
             }
-            if(sign == 6 && $.isEmpty(editor4)){
-                if(!$.isEmpty($("input[name='competitionId']").val())){
-                    var ret = Common.getAjax("/jlw/competition/view.json",{competitionId:$("input[name='competitionId']").val(),part: 9});
-                    if(ret.code == 0){
-                        $("#competitionCommonProblem textarea").val(Lib.repLaceltgt(ret.data.competitionCommonProblemOriginal));
-                    }else {
-                        layer.msg(ret.msg, {icon: 2,time: 1500});
+            if (sign == 7 && $.isEmpty(editor3)) {
+                if (!$.isEmpty($("input[name='competitionId']").val())) {
+                    var ret = Common.getAjax("/jlw/competition/view.json", {
+                        competitionId: $("input[name='competitionId']").val(),
+                        part: 8
+                    });
+                    if (ret.code == 0) {
+                        $("#competitionNewsContent textarea").val(Lib.repLaceltgt(ret.data.competitionAwardListOriginal));
+                    } else {
+                        layer.msg(ret.msg, {icon: 2, time: 1500});
                     }
                 }
-                editor4 = Lib.editorMd("competitionCommonProblem");
+                editor3 = Lib.editorMd("competitionNewsContent");
             }
-        }else if(sign == 8){
+        } else if (sign == 8 || sign == 12) {
             $(".syb").show();
             $(".xyb").hide();
             $(".sbx").show();
-            if($.isEmpty(editor3)) {
-                editor3 = Lib.editorMd("competitionNewsContent");
+            if (sign == 8 && $.isEmpty(editor2)) {
+                if (!$.isEmpty($("input[name='competitionId']").val())) {
+                    var ret = Common.getAjax("/jlw/competition/view.json", {
+                        competitionId: $("input[name='competitionId']").val(),
+                        part: 7
+                    });
+                    if (ret.code == 0) {
+                        $("#competitionAwardList textarea").val(Lib.repLaceltgt(ret.data.competitionAwardListOriginal));
+                    } else {
+                        layer.msg(ret.msg, {icon: 2, time: 1500});
+                    }
+                }
+                editor2 = Lib.editorMd("competitionAwardList");
             }
-        }else{
+            if (sign == 12 && $.isEmpty(editor12)) {
+                if (!$.isEmpty($("input[name='competitionId']").val())) {
+                    var ret = Common.getAjax("/jlw/competition/view.json", {
+                        competitionId: $("input[name='competitionId']").val(),
+                        part: 7
+                    });
+                    if (ret.code == 0) {
+                        $("#competitionXYFC textarea").val(Lib.repLaceltgt(ret.data.competitionAwardListOriginal));
+                    } else {
+                        layer.msg(ret.msg, {icon: 2, time: 1500});
+                    }
+                }
+                editor12 = Lib.editorMd("competitionXYFC");
+            }
+        } else {
             $(".sbx").hide();
         }
-        if(sign == 2 || sign == 5){//上一步、保存、下一步的位置
-            $(".sbx").css("margin-left",0);
-        }else if(sign == 0 || sign == 1){
-            $(".sbx").css("margin-left",190);
-        }else {
-            $(".sbx").css("margin-left",60);
+        if (sign == 2 || sign == 5) {//上一步、保存、下一步的位置
+            $(".sbx").css("margin-left", 0);
+        } else if (sign == 0 || sign == 1) {
+            $(".sbx").css("margin-left", 190);
+        } else {
+            $(".sbx").css("margin-left", 60);
         }
         //保存的位置显示
-        if(sign == 0 || sign == 3 || sign == 4){
+        if (sign == 0 || sign == 3 || sign == 4) {
             $(".bc").removeClass("bc_c").removeClass("bc_c_").addClass("bc_r").show();
-        }else if(sign == 2 || sign == 5){
+        } else if (sign == 2 || sign == 5) {
             $(".bc").addClass("bc_c").removeClass("bc_c_").removeClass("bc_r").show();
-        }else if(sign == 1){
+        } else if (sign == 1) {
             $(".bc").removeClass("bc_c").addClass("bc_c_").removeClass("bc_r").show();
-        }else {
+        } else {
             $(".bc").hide();
         }
     }
+
     //保存获奖名单
-    $("#addCompetitionAwardList").click(function (){
+    $("#addCompetitionAwardList").click(function () {
         var competitionAwardList = editor2.getPreviewedHTML();//获奖名单 html
         var competitionAwardListOriginal = Lib.repLaceString(editor2.getMarkdown());//获奖名单 Markdown 源码
         var param = {
-            competitionAwardList:competitionAwardList,
-            competitionAwardListOriginal:competitionAwardListOriginal,
-            competitionId:$("input[name='competitionId']").val()
+            competitionAwardList: competitionAwardList,
+            competitionAwardListOriginal: competitionAwardListOriginal,
+            competitionId: $("input[name='competitionId']").val()
         }
         submitInfo(param);
     });
 
     //保存大赛动态
-    $("#addCompetitionNews").click(function (){
+    $("#addCompetitionNews").click(function () {
         var competitionNewsContent = editor3.getPreviewedHTML();//动态内容 html
         var competitionNewsContentOriginal = Lib.repLaceString(editor3.getMarkdown());//动态内容 Markdown 源码
-        if($.isEmpty(competitionNewsContent)){
-            layer.msg("请填写大赛动态详情!",{icon:2});
-            return ;
+        if ($.isEmpty(competitionNewsContent)) {
+            layer.msg("请填写大赛动态详情!", {icon: 2});
+            return;
         }
         var competitionNewsPicture = $("input[name='competitionNewsPicture']").val();//动态图片
-        if($.isEmpty(competitionNewsPicture)){
-            layer.msg("请上传动态图!",{icon:2});
-            return ;
+        if ($.isEmpty(competitionNewsPicture)) {
+            layer.msg("请上传动态图!", {icon: 2});
+            return;
         }
-        var ret = Common.postAjax("/jlw/competitionNews/add.json",{
-            competitionNewsContent:competitionNewsContent,
-            competitionNewsContentOriginal:competitionNewsContentOriginal,
-            competitionNewsPicture:competitionNewsPicture,
-                competitionId:$("input[name='competitionId']").val()
-            });
+        var ret = Common.postAjax("/jlw/competitionNews/add.json", {
+            competitionNewsContent: competitionNewsContent,
+            competitionNewsContentOriginal: competitionNewsContentOriginal,
+            competitionNewsPicture: competitionNewsPicture,
+            competitionId: $("input[name='competitionId']").val()
+        });
         layer.msg(ret.code == 0 ? "保存成功!" : ret.msg, {
             offset: ['50%'],
             icon: ret.code == 0 ? 1 : 2,
@@ -367,10 +406,10 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                 var htm = '<li class="layui-timeline-item" style="padding-bottom:0;">' +
                     '          <i class="layui-icon layui-timeline-axis">&#xe63f;</i>' +
                     '          <div class="layui-timeline-content layui-text">' +
-                    '               <h3 class="layui-timeline-title">'+ret.data.competitionNewsAddTime+'</h3>' +
+                    '               <h3 class="layui-timeline-title">' + ret.data.competitionNewsAddTime + '</h3>' +
                     '               <div>' +
-                    '                   <img src="'+(Common.ctxPath + ret.data.competitionNewsPicture)+'" style="width: 200px;height: 110px;display: block;float: left;margin-right: 20px;" />' +
-                    '                   <div class="newC"><div class="markdown-body editormd-preview-container" style="width: auto;">'+ret.data.competitionNewsContent+'</div></div>' +
+                    '                   <img src="' + (Common.ctxPath + ret.data.competitionNewsPicture) + '" style="width: 200px;height: 110px;display: block;float: left;margin-right: 20px;" />' +
+                    '                   <div class="newC"><div class="markdown-body editormd-preview-container" style="width: auto;">' + ret.data.competitionNewsContent + '</div></div>' +
                     '               </div>' +
                     '          </div>' +
                     '      </li>';
@@ -379,27 +418,27 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                 $("input[name='competitionNewsPicture']").val("");//动态图片
 
                 $("#newsPicture").show();
-                layui.$('#uploadDemoView_1').addClass('layui-hide').find('img').attr('src',"");
+                layui.$('#uploadDemoView_1').addClass('layui-hide').find('img').attr('src', "");
             }
         });
     });
 
-     //保存常见问题
-    $("#addCommonProblem").click(function (){
+    //保存常见问题
+    $("#addCommonProblem").click(function () {
 
         var competitionCommonProblem = editor4.getPreviewedHTML();//常见问题内容 html
         var competitionCommonProblemOriginal = Lib.repLaceString(editor4.getMarkdown());//常见问题内容 Markdown 源码
         var param = {
-            competitionCommonProblem:competitionCommonProblem,
-            competitionCommonProblemOriginal:competitionCommonProblemOriginal,
-            competitionId:$("input[name='competitionId']").val()
+            competitionCommonProblem: competitionCommonProblem,
+            competitionCommonProblemOriginal: competitionCommonProblemOriginal,
+            competitionId: $("input[name='competitionId']").val()
         }
         submitInfo(param);
     });
 
 
     //显示获奖名单、大赛动态、常见问题
-    function showTitle(){
+    function showTitle() {
         $(".hjmd,.dsdt,.cjwt").show();
     }
 
@@ -409,12 +448,12 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     $(".see_competition_user").click(see_c_user);
     //移除参赛学员 (个人)
     $(".del_competition_user").click(del_c_user);
-    $(".export_gr").click(function (){ //导出个人赛参赛人员信息
-        window.open(Common.ctxPath + "/jlw/competition/export.json?competitionId="+ $("input[name='competitionId']").val()+"&beCompetitionStudent=1");
+    $(".export_gr").click(function () { //导出个人赛参赛人员信息
+        window.open(Common.ctxPath + "/jlw/competition/export.json?competitionId=" + $("input[name='competitionId']").val() + "&beCompetitionStudent=1");
     });
 
-    $(".export_td").click(function (){ //导出团队赛参赛人员信息
-        window.open(Common.ctxPath + "/jlw/competition/export.json?competitionId="+ $("input[name='competitionId']").val()+"&beCompetitionStudent=1");
+    $(".export_td").click(function () { //导出团队赛参赛人员信息
+        window.open(Common.ctxPath + "/jlw/competition/export.json?competitionId=" + $("input[name='competitionId']").val() + "&beCompetitionStudent=1");
     });
 
 
@@ -429,24 +468,24 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     //搜索未参赛人 (团队)
     $(".select_student_td").click(select_student_td);
 
-    function select_student(){
+    function select_student() {
         var studentTempJson = new Array();
-        $.each(studentTempMap,function(i,item){
+        $.each(studentTempMap, function (i, item) {
             studentTempJson.push({
-                studentsId:item.studentsId,
-                teamName:item.teamName,
-                studentsIds:item.studentsIds
+                studentsId: item.studentsId,
+                teamName: item.teamName,
+                studentsIds: item.studentsIds
             });
         });
-        var si = onTag == 1?3:onTag == 3?2:onTag == 4?3:"";
+        var si = onTag == 1 ? 3 : onTag == 3 ? 2 : onTag == 4 ? 3 : "";
         competitionStuTable[onTag].reload({
             where: {
-                studentTempJson:JSON.stringify(studentTempJson),
-                competitionId:$("input[name='competitionId']").val(),
-                beCompetitionStudent:1,
-                studentName:$(".csyh input[name='studentName']").val(),
-                classIds:!$.isEmpty(treeList[si])?treeList[si].getValue('value').join(","):"",
-                studentStatuses:"1,2"
+                studentTempJson: JSON.stringify(studentTempJson),
+                competitionId: $("input[name='competitionId']").val(),
+                beCompetitionStudent: 1,
+                studentName: $(".csyh input[name='studentName']").val(),
+                classIds: !$.isEmpty(treeList[si]) ? treeList[si].getValue('value').join(",") : "",
+                studentStatuses: "1,2"
             },
             page: {
                 curr: 1
@@ -454,23 +493,23 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
         });
     }
 
-    function select_student_no(){
+    function select_student_no() {
         var studentTempJson = new Array();
-        $.each(studentTempMap,function(i,item){
+        $.each(studentTempMap, function (i, item) {
             studentTempJson.push({
-                studentsId:item.studentsId,
-                teamName:item.teamName,
-                studentsIds:item.studentsIds
+                studentsId: item.studentsId,
+                teamName: item.teamName,
+                studentsIds: item.studentsIds
             });
         });
-        var si = onTag == 1?3:onTag == 3?2:onTag == 4?3:"";
+        var si = onTag == 1 ? 3 : onTag == 3 ? 2 : onTag == 4 ? 3 : "";
         competitionStuTable[onTag].reload({
             where: {
-                studentTempJson:JSON.stringify(studentTempJson),
-                competitionId:$("input[name='competitionId']").val(),
-                beCompetitionStudent:2,
-                studentName:$(".csyh input[name='studentName_no']").val(),
-                classIds:!$.isEmpty(treeList[si])?treeList[si].getValue('value').join(","):""
+                studentTempJson: JSON.stringify(studentTempJson),
+                competitionId: $("input[name='competitionId']").val(),
+                beCompetitionStudent: 2,
+                studentName: $(".csyh input[name='studentName_no']").val(),
+                classIds: !$.isEmpty(treeList[si]) ? treeList[si].getValue('value').join(",") : ""
             },
             page: {
                 curr: 1
@@ -478,47 +517,48 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
         });
     }
 
-    function select_student_td(){
+    function select_student_td() {
         var studentTempJson = new Array();
-        $.each(studentTempMap,function(i,item){
+        $.each(studentTempMap, function (i, item) {
             studentTempJson.push({
-                studentsId:item.studentsId,
-                teamName:item.teamName,
-                studentsIds:item.studentsIds
+                studentsId: item.studentsId,
+                teamName: item.teamName,
+                studentsIds: item.studentsIds
             });
         });
-        var si = onTag == 1?3:onTag == 3?2:onTag == 4?3:"";
+        var si = onTag == 1 ? 3 : onTag == 3 ? 2 : onTag == 4 ? 3 : "";
         competitionStuTable[onTag].reload({
             where: {
-                studentTempJson:JSON.stringify(studentTempJson),
-                competitionId:$("input[name='competitionId']").val(),
-                beCompetitionStudent:1,
-                studentName:$(".csyh input[name='studentName_td']").val(),
-                classIds:!$.isEmpty(treeList[si])?treeList[si].getValue('value').join(","):"",
-                studentStatuses:"1,2"
+                studentTempJson: JSON.stringify(studentTempJson),
+                competitionId: $("input[name='competitionId']").val(),
+                beCompetitionStudent: 1,
+                studentName: $(".csyh input[name='studentName_td']").val(),
+                classIds: !$.isEmpty(treeList[si]) ? treeList[si].getValue('value').join(",") : "",
+                studentStatuses: "1,2"
             },
             page: {
                 curr: 1
             }
         });
     }
-    function search_dz(){
+
+    function search_dz() {
         var studentTempJson = new Array();
-        $.each(studentTempMap,function(i,item){
+        $.each(studentTempMap, function (i, item) {
             studentTempJson.push({
-                studentsId:item.studentsId,
-                teamName:item.teamName,
-                studentsIds:item.studentsIds
+                studentsId: item.studentsId,
+                teamName: item.teamName,
+                studentsIds: item.studentsIds
             });
         });
-        var si = onTag == 1?3:onTag == 3?2:onTag == 4?3:"";
+        var si = onTag == 1 ? 3 : onTag == 3 ? 2 : onTag == 4 ? 3 : "";
         competitionStuTable[onTag].reload({
             where: {
-                studentTempJson:JSON.stringify(studentTempJson),
-                competitionId:$("input[name='competitionId']").val(),
-                beCompetitionStudent:2,
-                studentName:$(".csyh input[name='studentName_td']").val(),
-                classIds:!$.isEmpty(treeList[si])?treeList[si].getValue('value').join(","):""
+                studentTempJson: JSON.stringify(studentTempJson),
+                competitionId: $("input[name='competitionId']").val(),
+                beCompetitionStudent: 2,
+                studentName: $(".csyh input[name='studentName_td']").val(),
+                classIds: !$.isEmpty(treeList[si]) ? treeList[si].getValue('value').join(",") : ""
             },
             page: {
                 curr: 1
@@ -535,13 +575,13 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     var treeList = [];
     //监听是否允许自主报名切换 1:允许 2:不允许
     form.on('radio(zzbm)', function (obj) {
-        if(obj.value == 1){
+        if (obj.value == 1) {
             $(".demo1").show();
             $(".demo4").show();
-            if($.isEmpty(treeList[1])){
+            if ($.isEmpty(treeList[1])) {
                 treeList[1] = xmSelect.render({
                     el: document.querySelector('#demo1'),
-                    name:"onCourseInfoId",
+                    name: "onCourseInfoId",
                     autoRow: true,
                     theme: {
                         color: '#1e9fff',
@@ -566,19 +606,19 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                     },
                     filterable: true,
                     height: '300px',
-                    data: function(){
+                    data: function () {
                         return getTreeByCourseLabelTypes
                     },
                 });
             }
-        }else {
+        } else {
             $(".demo1").hide();
             $(".demo4").hide();
         }
     });
 
     //选择参赛人
-    function see_c_user(){
+    function see_c_user() {
         layer.open({
             type: 1,
             title: "选择参赛学员",
@@ -591,53 +631,53 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                 loadCompetitionUser(1);
             }, yes: function (index) {
                 var studentTempJson = new Array();
-                if(!$.isEmpty(competitionStuIds_no)){
-                    if((competitionStuIds_no +"").indexOf(",") < 0){
+                if (!$.isEmpty(competitionStuIds_no)) {
+                    if ((competitionStuIds_no + "").indexOf(",") < 0) {
                         studentTempJson.push({
-                            studentsId:competitionStuIds_no
+                            studentsId: competitionStuIds_no
                         });
-                    }else {
+                    } else {
                         var info = (competitionStuIds_no).split(",");
-                        for(var i = 0;i<info.length;i++){
+                        for (var i = 0; i < info.length; i++) {
                             studentTempJson.push({
-                                studentsId:info[i]
+                                studentsId: info[i]
                             });
                         }
                     }
                 }
 
                 //将当前选择的合并入已选map
-                $.each(studentTempMap,function(i,item){
+                $.each(studentTempMap, function (i, item) {
                     studentTempJson.push({
-                        studentsId:item.studentsId,
-                        teamName:item.teamName,
-                        studentsIds:item.studentsIds
+                        studentsId: item.studentsId,
+                        teamName: item.teamName,
+                        studentsIds: item.studentsIds
                     });
                 });
-                loadCompetitionUser(0,studentTempJson);
+                loadCompetitionUser(0, studentTempJson);
 
                 layer.close(index);
             }, btn2: function (index, layero) {
                 layer.close(index);
-            },end:function (){
+            }, end: function () {
                 competitionStuIds_no = "";
             }
         });
     }
 
     //移除参赛学员
-    function del_c_user(){
+    function del_c_user() {
         layer.confirm('是否确定移除参赛学生?', function (index) {
-            if($.isEmpty(competitionStuIds)){
+            if ($.isEmpty(competitionStuIds)) {
                 layer.msg("请选择需要移除的参赛学员!", {
                     offset: ['50%'],
                     icon: 2,
                     time: 1500 //2秒关闭(如果不配置,默认是3秒)
                 });
-                return ;
+                return;
             }
-            var info = (competitionStuIds+"").split(",");
-            for(var i = 0 ;i<info.length;i++){
+            var info = (competitionStuIds + "").split(",");
+            for (var i = 0; i < info.length; i++) {
                 delete studentTempMap[info[i]];//删除map
             }
             layer.msg("移除成功!", {
@@ -647,128 +687,135 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             });
             competitionStuIds = "";//清空
             var studentTempJson = new Array();
-            $.each(studentTempMap,function(i,item){
+            $.each(studentTempMap, function (i, item) {
                 studentTempJson.push({
-                    studentsId:item.studentsId,
-                    teamName:item.teamName,
-                    studentsIds:item.studentsIds
+                    studentsId: item.studentsId,
+                    teamName: item.teamName,
+                    studentsIds: item.studentsIds
                 });
             });
-            if($.isEmptyObject(studentTempMap)){
-                studentTempJson = {"studentsId":-1};
+            if ($.isEmptyObject(studentTempMap)) {
+                studentTempJson = {"studentsId": -1};
             }
-            loadCompetitionUser(0,studentTempJson);
+            loadCompetitionUser(0, studentTempJson);
         });
     }
 
     //加载已报名参赛的人员名单 list tag = 个人赛(0:已选参赛人 1:未选参赛人)  团队赛(2:已选参赛人 3:选队长 4:未选参赛人团队)
     var onTag = 0;
-    function loadCompetitionUser(tag,jsons){
+
+    function loadCompetitionUser(tag, jsons) {
         onTag = tag;
-        if(tag_ == 0){
+        if (tag_ == 0) {
             getTreeByCourseLabelTypes = Common.getAjax("/jlw/universitiesColleges/getValuesWithClassList.json").data;
             tag_ = 1;
         }
         var studentTempJson = new Array();
-        if((tag == 1 || tag == 3 || tag == 4)&& !$.isEmpty(studentTempMap)){
-            $.each(studentTempMap,function(i,item){
+        if ((tag == 1 || tag == 3 || tag == 4) && !$.isEmpty(studentTempMap)) {
+            $.each(studentTempMap, function (i, item) {
                 studentTempJson.push({
-                    studentsId:item.studentsId,
-                    teamName:item.teamName,
-                    studentsIds:item.studentsIds
+                    studentsId: item.studentsId,
+                    teamName: item.teamName,
+                    studentsIds: item.studentsIds
                 });
             });
-        }else {
+        } else {
             studentTempJson = jsons;
         }
         competitionStuTable[tag] = table.render({
-            elem : tag == 0?'#studentTable':tag==1 || tag == 4 ?"#studentTable_no":tag == 2?'#studentTable_td':tag ==3?"#studentTable_no_dz":"",
-            height : Lib.getTableHeight(),
+            elem: tag == 0 ? '#studentTable' : tag == 1 || tag == 4 ? "#studentTable_no" : tag == 2 ? '#studentTable_td' : tag == 3 ? "#studentTable_no_dz" : "",
+            height: Lib.getTableHeight(),
             cellMinWidth: 100,
-            method : 'post',
-            even:true,
+            method: 'post',
+            even: true,
             //skin:'nob',
-            where:{
-                studentTempJson:JSON.stringify(studentTempJson),
-                competitionId:$("input[name='competitionId']").val(),
-                beCompetitionStudent:tag == 0 || tag == 2?1:tag ==1 || tag == 3|| tag == 4?2:'',
-                studentStatuses:tag == 0 || tag == 2 ?'1,2':""
+            where: {
+                studentTempJson: JSON.stringify(studentTempJson),
+                competitionId: $("input[name='competitionId']").val(),
+                beCompetitionStudent: tag == 0 || tag == 2 ? 1 : tag == 1 || tag == 3 || tag == 4 ? 2 : '',
+                studentStatuses: tag == 0 || tag == 2 ? '1,2' : ""
             },
-            url : Common.ctxPath + '/jlw/student/list.json' // 数据接口
-            ,page : Lib.tablePage // 开启分页
-            ,limit : 10,
-            cols : [ [ // 表头
-                {type:'checkbox'},
+            url: Common.ctxPath + '/jlw/student/list.json' // 数据接口
+            , page: Lib.tablePage // 开启分页
+            , limit: 10,
+            cols: [[ // 表头
+                {type: 'checkbox'},
                 {
-                    field : 'studentName',
-                    title : '学生姓名',align: "center",hide:tag == 2?true:false
+                    field: 'studentName',
+                    title: '学生姓名', align: "center", hide: tag == 2 ? true : false
                 },
                 {
-                    field : 'studentSn',
-                    title : '学生学号',align: "center",hide:tag == 2?true:false
+                    field: 'studentSn',
+                    title: '学生学号', align: "center", hide: tag == 2 ? true : false
                 },
                 {
-                    field : 'classIdText',
-                    title : '班级名称',align: "center",hide:tag == 2?true:false
-                },{
-                    field : 'teamName',edit: 'text',
-                    title : '团队名称',align: "center",style:"text-align: left;",hide:tag == 2?false:true,width:220,templet:function(d){
-                        if(!$.isEmpty(studentTempMap[d.studentId])){
+                    field: 'classIdText',
+                    title: '班级名称', align: "center", hide: tag == 2 ? true : false
+                }, {
+                    field: 'teamName',
+                    edit: 'text',
+                    title: '团队名称',
+                    align: "center",
+                    style: "text-align: left;",
+                    hide: tag == 2 ? false : true,
+                    width: 220,
+                    templet: function (d) {
+                        if (!$.isEmpty(studentTempMap[d.studentId])) {
                             return (studentTempMap[d.studentId]['teamName'] || '') + "<span style='margin-left: 20px;cursor: pointer;color: #1E9FFF;;float: right;'>编辑</span>";
-                        }else {
+                        } else {
                             return (d.teamName || ' ') + "<span style='margin-left: 20px;cursor: pointer;color: #1E9FFF;float: right;'>编辑</span>";
                         }
                     }
-                },{
-                    field : 'studentName',
-                    title : '队长',align: "center",hide:tag == 2?false:true,width:100
-                },{
-                    field : 'teamStudentNames',
-                    title : '组员',align: "center",hide:tag == 2?false:true,templet:function (d) {
-                        if(!$.isEmpty(d.teamStudentNames)){
+                }, {
+                    field: 'studentName',
+                    title: '队长', align: "center", hide: tag == 2 ? false : true, width: 100
+                }, {
+                    field: 'teamStudentNames',
+                    title: '组员', align: "center", hide: tag == 2 ? false : true, templet: function (d) {
+                        if (!$.isEmpty(d.teamStudentNames)) {
                             var html = "";
                             var teamStudentsIds = d.teamStudentsIds.split(",");
-                            $.each(d.teamStudentNames.split(","),function(n,v) {
-                                html += "<span class='dy' style='min-width: 70px;'>"+v+"<i studentId='"+d.studentId+"' teamStudentsIds='"+teamStudentsIds[n]+"' class='layui-icon'>&#x1007;</i></span>";
-                                if(n < d.teamStudentNames.split(",").length - 1){
+                            $.each(d.teamStudentNames.split(","), function (n, v) {
+                                html += "<span class='dy' style='min-width: 70px;'>" + v + "<i studentId='" + d.studentId + "' teamStudentsIds='" + teamStudentsIds[n] + "' class='layui-icon'>&#x1007;</i></span>";
+                                if (n < d.teamStudentNames.split(",").length - 1) {
                                     html += "<span class='dy'>/</span>";
                                 }
                             });
                             return html;
-                        }else {
+                        } else {
                             return "";
                         }
                     }
-                },{
-                    field : 'classIdText',width:100,
-                    title : '操作',align: "center",hide:tag == 2?false:true,templet:function (d){
+                }, {
+                    field: 'classIdText', width: 100,
+                    title: '操作', align: "center", hide: tag == 2 ? false : true, templet: function (d) {
                         return '<a style="color:#1E9FFF;cursor: pointer;" lay-event="edit">选择组员</a>';
                     }
                 }
-            ] ],done: function (res, curr, count) {
-                if(tag == 2){ //团队赛
-                    $("td[data-field='teamName']").click(function (){ //监听点击团队编辑时只有编辑显示
+            ]], done: function (res, curr, count) {
+                if (tag == 2) { //团队赛
+                    $("td[data-field='teamName']").click(function () { //监听点击团队编辑时只有编辑显示
                         var this_ = $(this);
-                        setTimeout(function (){
-                            if(this_.find("input").val() == " 编辑" || this_.find("input").val() == "编辑"){
-                              this_.find("input").val(this_.find("input").val().replace("编辑","").replace(/ /g,""));
+                        setTimeout(function () {
+                            if (this_.find("input").val() == " 编辑" || this_.find("input").val() == "编辑") {
+                                this_.find("input").val(this_.find("input").val().replace("编辑", "").replace(/ /g, ""));
                             }
-                        },1);
+                        }, 1);
                     });
-                    $(".dy i").click(function (){
+                    $(".dy i").click(function () {
                         var studentId = $(this).attr("studentId");//队长ID
                         var teamStudentsIds = $(this).attr("teamStudentsIds");//队员ID
-                        studentTempMap[studentId].studentsIds  = Lib.stringRemove(studentTempMap[studentId].studentsIds,teamStudentsIds);
+                        studentTempMap[studentId].studentsIds = Lib.stringRemove(studentTempMap[studentId].studentsIds, teamStudentsIds);
                         $(this).parent().next().remove();
                         $(this).parent().remove();
                     });
                 }
 
-                if(!$.isEmpty(res.classIds) && res.classIds != -1){
-                    if($.isEmpty(treeList[1])){
+                if (!$.isEmpty(res.classIds) && res.classIds != -1) {
+                    if ($.isEmpty(treeList[1])) {
                         treeList[1] = xmSelect.render({
                             el: document.querySelector('#demo1'),
-                            name:"onCourseInfoId",
+                            name: "onCourseInfoId",
                             autoRow: true,
                             theme: {
                                 color: '#1e9fff',
@@ -779,7 +826,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                                 showLine: true,
                                 simple: false,
                                 indent: 20,
-                            },model: {
+                            }, model: {
                                 label: {
                                     type: 'block',
                                     block: {
@@ -792,17 +839,17 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                             },
                             filterable: true,
                             height: '300px',
-                            data: function(){
+                            data: function () {
                                 return getTreeByCourseLabelTypes
                             },
-                            hide:function(){
+                            hide: function () {
                                 loadTreeList4();
                             }
                         });
-                        loadTreeList4(res.classIds,res.excludedStudentIds);
+                        loadTreeList4(res.classIds, res.excludedStudentIds);
                     }
-                    $("input[name='classIds'][value='1']").prop("checked",true);
-                    $("input[name='classIds'][value='2']").prop("checked",false);
+                    $("input[name='classIds'][value='1']").prop("checked", true);
+                    $("input[name='classIds'][value='2']").prop("checked", false);
                     $(".demo1").show();
                     $(".demo4").show();
                     treeList[1].append(res.classIds.split(","));
@@ -810,25 +857,25 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                 }
 
                 //tag = 个人赛(0:已选参赛人 1:未选参赛人)  团队赛(2:已选参赛人 3:选队长 4:未选参赛人团队)
-                if(tag == 0 || tag == 2){
+                if (tag == 0 || tag == 2) {
                     studentTempMap = res.studentTempMap;
                 }
-                var ta = tag == 0?'studentTable':tag==1 || tag == 4 ?"studentTable_no":tag == 2?'studentTable_td':tag ==3?"studentTable_no_dz":"";
-                if(tag == 0){
-                    Lib.tableFX(this,table.cache[ta],competitionStuIds,'studentId'); //回显
-                }else if(tag ==3){
-                    Lib.tableFX(this,table.cache[ta],competitionStuIds_no_dz,'studentId'); //回显
-                }else if(tag == 1 || tag == 2 || tag ==4){
-                    Lib.tableFX(this,table.cache[ta],competitionStuIds_no,'studentId'); //回显
+                var ta = tag == 0 ? 'studentTable' : tag == 1 || tag == 4 ? "studentTable_no" : tag == 2 ? 'studentTable_td' : tag == 3 ? "studentTable_no_dz" : "";
+                if (tag == 0) {
+                    Lib.tableFX(this, table.cache[ta], competitionStuIds, 'studentId'); //回显
+                } else if (tag == 3) {
+                    Lib.tableFX(this, table.cache[ta], competitionStuIds_no_dz, 'studentId'); //回显
+                } else if (tag == 1 || tag == 2 || tag == 4) {
+                    Lib.tableFX(this, table.cache[ta], competitionStuIds_no, 'studentId'); //回显
                 }
             }
         });
-        if(tag == 1 || tag == 3 || tag == 4){ //选择队长对话框
-            var si = tag == 1?3:tag == 3?2:tag == 4?3:"";
-            if($.isEmpty(treeList[si])){
+        if (tag == 1 || tag == 3 || tag == 4) { //选择队长对话框
+            var si = tag == 1 ? 3 : tag == 3 ? 2 : tag == 4 ? 3 : "";
+            if ($.isEmpty(treeList[si])) {
                 treeList[si] = xmSelect.render({
-                    el: document.querySelector('#demo'+si),
-                    name:"onCourseInfoId",
+                    el: document.querySelector('#demo' + si),
+                    name: "onCourseInfoId",
                     autoRow: true,
                     theme: {
                         color: '#1e9fff',
@@ -842,21 +889,21 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                     },
                     filterable: true,
                     height: '300px',
-                    data: function(){
+                    data: function () {
                         return getTreeByCourseLabelTypes
                     }
                 });
                 $("#demo" + si + " .xm-search").addClass("layui-row").append
-                    ('<button type="button" class="layui-btn bg_button layui-btn-sm all_'+si+'" style="float: right;">全班</button>')
-                    .find("input").css("width","300px").css("float","left");
-                $('#demo' +si+' .all_'+si).click(function (){
-                    if((tag == 1 || tag == 3 || tag == 4) && treeList[si].getValue("value").length > 0){
-                        var ret = Common.getAjax("/jlw/competition/getListByClassIds.json",{classIds:treeList[si].getValue("value").join(",")});
-                        if(ret.code == 0){
-                            if(tag == 3 && !$.isEmpty(ret.data)){
+                ('<button type="button" class="layui-btn bg_button layui-btn-sm all_' + si + '" style="float: right;">全班</button>')
+                    .find("input").css("width", "300px").css("float", "left");
+                $('#demo' + si + ' .all_' + si).click(function () {
+                    if ((tag == 1 || tag == 3 || tag == 4) && treeList[si].getValue("value").length > 0) {
+                        var ret = Common.getAjax("/jlw/competition/getListByClassIds.json", {classIds: treeList[si].getValue("value").join(",")});
+                        if (ret.code == 0) {
+                            if (tag == 3 && !$.isEmpty(ret.data)) {
                                 competitionStuIds_no_dz = ret.data;
                             }
-                            if((tag == 1 || tag == 4) && !$.isEmpty(ret.data)){
+                            if ((tag == 1 || tag == 4) && !$.isEmpty(ret.data)) {
                                 competitionStuIds_no = ret.data;
                             }
                             competitionStuTable[onTag].reload({
@@ -864,20 +911,20 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                                     curr: 1
                                 }
                             });
-                        }else {
+                        } else {
                             layer.msg(ret.msg);
                         }
                     }
                 });
 
 
-            }else {
+            } else {
                 treeList[si].setValue([]);
             }
         }
 
         //编辑队名
-        table.on('edit(studentTable_td)', function(obj){ //注:edit是固定事件名,test是table原始容器的属性 lay-filter="对应的值"
+        table.on('edit(studentTable_td)', function (obj) { //注:edit是固定事件名,test是table原始容器的属性 lay-filter="对应的值"
             // console.log(obj.value); //得到修改后的值
             // console.log(obj.field); //当前编辑的字段名
             // console.log(obj.data); //所在行的所有相关数据
@@ -885,137 +932,137 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
         });
 
         //监听选择与取消已报名学生 注:实现了分页也可以选择
-        table.on('checkbox(studentTable)', function(obj){
-            if(obj.checked){ //选中
+        table.on('checkbox(studentTable)', function (obj) {
+            if (obj.checked) { //选中
                 var student = obj.data;
-                if(obj.type == "all"){//全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.checkStatus('studentTable').data;
-                    for(var i = 0; i < checkStatus.length;i++){
-                        if((","+competitionStuIds+",").indexOf(checkStatus[i].studentId) < 0){
-                            if(!$.isEmpty(competitionStuIds)){
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        if (("," + competitionStuIds + ",").indexOf(checkStatus[i].studentId) < 0) {
+                            if (!$.isEmpty(competitionStuIds)) {
                                 competitionStuIds += "," + checkStatus[i].studentId;
-                            }else {
+                            } else {
                                 competitionStuIds = checkStatus[i].studentId;
                             }
                         }
                     }
-                }else {
-                    if(!$.isEmpty(competitionStuIds)){
+                } else {
+                    if (!$.isEmpty(competitionStuIds)) {
                         competitionStuIds += "," + obj.data.studentId;
-                    }else {
+                    } else {
                         competitionStuIds = obj.data.studentId;
                     }
                 }
-            }else{//取消全选
-                if(obj.type == "all"){//全选
+            } else {//取消全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.cache["studentTable"];
-                    for(var i = 0; i<checkStatus.length;i++){
-                        competitionStuIds = Lib.stringRemove(competitionStuIds,checkStatus[i].studentId);
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        competitionStuIds = Lib.stringRemove(competitionStuIds, checkStatus[i].studentId);
                     }
-                }else {
-                    competitionStuIds = Lib.stringRemove(competitionStuIds,obj.data.studentId);
+                } else {
+                    competitionStuIds = Lib.stringRemove(competitionStuIds, obj.data.studentId);
                 }
             }
         });
 
         //监听选择与取消已报名学生 注:实现了分页也可以选择
-        table.on('checkbox(studentTable_no)', function(obj){
-            if(obj.checked){ //选中
+        table.on('checkbox(studentTable_no)', function (obj) {
+            if (obj.checked) { //选中
                 var student = obj.data;
-                if(obj.type == "all"){//全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.checkStatus('studentTable_no').data;
-                    for(var i = 0; i < checkStatus.length;i++){
-                        if((","+competitionStuIds_no+",").indexOf(checkStatus[i].studentId) < 0){
-                            if(!$.isEmpty(competitionStuIds_no)){
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        if (("," + competitionStuIds_no + ",").indexOf(checkStatus[i].studentId) < 0) {
+                            if (!$.isEmpty(competitionStuIds_no)) {
                                 competitionStuIds_no += "," + checkStatus[i].studentId;
-                            }else {
+                            } else {
                                 competitionStuIds_no = checkStatus[i].studentId;
                             }
                         }
                     }
-                }else {
-                    if(!$.isEmpty(competitionStuIds_no)){
+                } else {
+                    if (!$.isEmpty(competitionStuIds_no)) {
                         competitionStuIds_no += "," + obj.data.studentId;
-                    }else {
+                    } else {
                         competitionStuIds_no = obj.data.studentId;
                     }
                 }
-            }else{//取消全选
-                if(obj.type == "all"){//全选
+            } else {//取消全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.cache["studentTable"];
-                    for(var i = 0; i<checkStatus.length;i++){
-                        competitionStuIds_no = Lib.stringRemove(competitionStuIds_no,checkStatus[i].studentId);
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        competitionStuIds_no = Lib.stringRemove(competitionStuIds_no, checkStatus[i].studentId);
                     }
-                }else {
-                    competitionStuIds_no = Lib.stringRemove(competitionStuIds_no,obj.data.studentId);
+                } else {
+                    competitionStuIds_no = Lib.stringRemove(competitionStuIds_no, obj.data.studentId);
                 }
             }
         });
 
         //监听选择与取消已报名学生 注:实现了分页也可以选择
-        table.on('checkbox(studentTable_td)', function(obj){
-            if(obj.checked){ //选中
+        table.on('checkbox(studentTable_td)', function (obj) {
+            if (obj.checked) { //选中
                 var student = obj.data;
-                if(obj.type == "all"){//全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.checkStatus('studentTable_td').data;
-                    for(var i = 0; i < checkStatus.length;i++){
-                        if((","+competitionStuIds+",").indexOf(checkStatus[i].studentId) < 0){
-                            if(!$.isEmpty(competitionStuIds)){
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        if (("," + competitionStuIds + ",").indexOf(checkStatus[i].studentId) < 0) {
+                            if (!$.isEmpty(competitionStuIds)) {
                                 competitionStuIds += "," + checkStatus[i].studentId;
-                            }else {
+                            } else {
                                 competitionStuIds = checkStatus[i].studentId;
                             }
                         }
                     }
-                }else {
-                    if(!$.isEmpty(competitionStuIds)){
+                } else {
+                    if (!$.isEmpty(competitionStuIds)) {
                         competitionStuIds += "," + obj.data.studentId;
-                    }else {
+                    } else {
                         competitionStuIds = obj.data.studentId;
                     }
                 }
-            }else{//取消全选
-                if(obj.type == "all"){//全选
+            } else {//取消全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.cache["studentTable_td"];
-                    for(var i = 0; i<checkStatus.length;i++){
-                        competitionStuIds = Lib.stringRemove(competitionStuIds,checkStatus[i].studentId);
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        competitionStuIds = Lib.stringRemove(competitionStuIds, checkStatus[i].studentId);
                     }
-                }else {
-                    competitionStuIds = Lib.stringRemove(competitionStuIds,obj.data.studentId);
+                } else {
+                    competitionStuIds = Lib.stringRemove(competitionStuIds, obj.data.studentId);
                 }
             }
         });
 
         //监听选择与取消已报名学生 注:实现了分页也可以选择
-        table.on('checkbox(studentTable_no_dz)', function(obj){
-            if(obj.checked){ //选中
+        table.on('checkbox(studentTable_no_dz)', function (obj) {
+            if (obj.checked) { //选中
                 var student = obj.data;
-                if(obj.type == "all"){//全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.checkStatus('studentTable_no_dz').data;
-                    for(var i = 0; i < checkStatus.length;i++){
-                        if((","+competitionStuIds_no_dz+",").indexOf(checkStatus[i].studentId) < 0){
-                            if(!$.isEmpty(competitionStuIds_no_dz)){
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        if (("," + competitionStuIds_no_dz + ",").indexOf(checkStatus[i].studentId) < 0) {
+                            if (!$.isEmpty(competitionStuIds_no_dz)) {
                                 competitionStuIds_no_dz += "," + checkStatus[i].studentId;
-                            }else {
+                            } else {
                                 competitionStuIds_no_dz = checkStatus[i].studentId;
                             }
                         }
                     }
-                }else {
-                    if(!$.isEmpty(competitionStuIds_no_dz)){
+                } else {
+                    if (!$.isEmpty(competitionStuIds_no_dz)) {
                         competitionStuIds_no_dz += "," + obj.data.studentId;
-                    }else {
+                    } else {
                         competitionStuIds_no_dz = obj.data.studentId;
                     }
                 }
-            }else{//取消全选
-                if(obj.type == "all"){//全选
+            } else {//取消全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.cache["studentTable_no_dz"];
-                    for(var i = 0; i<checkStatus.length;i++){
-                        competitionStuIds_no_dz = Lib.stringRemove(competitionStuIds_no_dz,checkStatus[i].studentId);
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        competitionStuIds_no_dz = Lib.stringRemove(competitionStuIds_no_dz, checkStatus[i].studentId);
                     }
-                }else {
-                    competitionStuIds_no_dz = Lib.stringRemove(competitionStuIds_no_dz,obj.data.studentId);
+                } else {
+                    competitionStuIds_no_dz = Lib.stringRemove(competitionStuIds_no_dz, obj.data.studentId);
                 }
             }
         });
@@ -1030,25 +1077,25 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
 
     }
 
-    function loadTreeList4(cIds,excludedStudentIds){
-        if($.isEmpty(cIds)){
+    function loadTreeList4(cIds, excludedStudentIds) {
+        if ($.isEmpty(cIds)) {
             cIds = treeList[1].getValue('valueStr');
         }
-        if(!$.isEmpty(cIds)){
-            var ret = Common.getAjax("/jlw/student/getValues.json",{classIds:cIds});
-            if(ret.code == 0){
+        if (!$.isEmpty(cIds)) {
+            var ret = Common.getAjax("/jlw/student/getValues.json", {classIds: cIds});
+            if (ret.code == 0) {
                 treeList[4] = xmSelect.render({
                     el: "#demo4",
-                    name:"excludedStudentIds",
+                    name: "excludedStudentIds",
                     autoRow: true,
                     theme: {
                         color: '#1e9fff',
                     },
                     filterable: true,
                     height: '300px',
-                    data: function(){
+                    data: function () {
                         return ret.data;
-                    },model: {
+                    }, model: {
                         label: {
                             type: 'block',
                             block: {
@@ -1060,21 +1107,21 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                         }
                     }
                 });
-                if(!$.isEmpty(excludedStudentIds)) {
+                if (!$.isEmpty(excludedStudentIds)) {
                     treeList[4].append(excludedStudentIds.split(","));
                 }
             }
-        }else {
+        } else {
             treeList[4] = xmSelect.render({
                 el: "#demo4",
-                name:"excludedStudentIds",
+                name: "excludedStudentIds",
                 autoRow: true,
                 theme: {
                     color: '#1e9fff',
                 },
                 filterable: true,
                 height: '300px',
-                data: function(){
+                data: function () {
                     return []
                 }
             });
@@ -1083,7 +1130,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     }
 
     //选择队长
-    function see_dz(){
+    function see_dz() {
         layer.open({
             type: 1,
             title: "选择队长",
@@ -1096,53 +1143,54 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                 loadCompetitionUser(3);
             }, yes: function (index) {
                 var studentTempJson = new Array();
-                if(!$.isEmpty(competitionStuIds_no_dz)){
-                    if((competitionStuIds_no_dz +"").indexOf(",") < 0){
+                if (!$.isEmpty(competitionStuIds_no_dz)) {
+                    if ((competitionStuIds_no_dz + "").indexOf(",") < 0) {
                         studentTempJson.push({
-                            studentsId:competitionStuIds_no_dz
+                            studentsId: competitionStuIds_no_dz
                         });
-                    }else {
+                    } else {
                         var info = (competitionStuIds_no_dz).split(",");
-                        for(var i = 0;i<info.length;i++){
+                        for (var i = 0; i < info.length; i++) {
                             studentTempJson.push({
-                                studentsId:info[i]
+                                studentsId: info[i]
                             });
                         }
                     }
                 }
 
                 //将当前选择的合并入已选map
-                $.each(studentTempMap,function(i,item){
+                $.each(studentTempMap, function (i, item) {
                     studentTempJson.push({
-                        studentsId:item.studentsId,
-                        teamName:item.teamName,
-                        studentsIds:item.studentsIds
+                        studentsId: item.studentsId,
+                        teamName: item.teamName,
+                        studentsIds: item.studentsIds
                     });
                 });
 
-                loadCompetitionUser(2,studentTempJson);
+                loadCompetitionUser(2, studentTempJson);
 
                 layer.close(index);
             }, btn2: function (index, layero) {
                 layer.close(index);
-            },end:function (){
+            }, end: function () {
                 competitionStuIds_no_dz = "";
             }
         });
     }
+
     //移除团队
-    function del_td(){
+    function del_td() {
         layer.confirm('是否确定移除参赛团队?', function (index) {
-            if($.isEmpty(competitionStuIds)){
+            if ($.isEmpty(competitionStuIds)) {
                 layer.msg("请选择需要移除的参赛团队!", {
                     offset: ['50%'],
                     icon: 2,
                     time: 1500 //2秒关闭(如果不配置,默认是3秒)
                 });
-                return ;
+                return;
             }
-            var info = (competitionStuIds+"").split(",");
-            for(var i = 0 ;i<info.length;i++){
+            var info = (competitionStuIds + "").split(",");
+            for (var i = 0; i < info.length; i++) {
                 delete studentTempMap[info[i]];
             }
             layer.msg("移除成功!", {
@@ -1152,20 +1200,20 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             });
             competitionStuIds = "";//清空
             var studentTempJson = new Array();
-            $.each(studentTempMap,function(i,item){
+            $.each(studentTempMap, function (i, item) {
                 studentTempJson.push({
-                    studentsId:item.studentsId,
-                    teamName:item.teamName,
-                    studentsIds:item.studentsIds
+                    studentsId: item.studentsId,
+                    teamName: item.teamName,
+                    studentsIds: item.studentsIds
                 });
             });
             console.log(studentTempMap);
-            loadCompetitionUser(2,studentTempJson);
+            loadCompetitionUser(2, studentTempJson);
         });
     }
 
     //选择组员
-    function see_zy(studentId){
+    function see_zy(studentId) {
         layer.open({
             type: 1,
             title: "选择参赛学员",
@@ -1180,37 +1228,38 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             }, yes: function (index) {
                 var studentTempJson = new Array();
                 //将当前选择的合并入已选map
-                $.each(studentTempMap,function(i,item){
+                $.each(studentTempMap, function (i, item) {
                     var ids = "";
-                    if(item.studentsId == studentId){
-                        if(!$.isEmpty(item.studentsIds)){
+                    if (item.studentsId == studentId) {
+                        if (!$.isEmpty(item.studentsIds)) {
                             ids = item.studentsIds;
-                            if(!$.isEmpty(competitionStuIds_no)){
+                            if (!$.isEmpty(competitionStuIds_no)) {
                                 ids += "," + competitionStuIds_no;
                             }
-                        }else {
+                        } else {
                             ids = competitionStuIds_no;
                         }
-                    }else {
+                    } else {
                         ids = item.studentsIds;
                     }
                     studentTempJson.push({
-                        studentsId:item.studentsId,
-                        teamName:item.teamName,
-                        studentsIds:ids
+                        studentsId: item.studentsId,
+                        teamName: item.teamName,
+                        studentsIds: ids
                     });
                 });
 
-                loadCompetitionUser(2,studentTempJson);
+                loadCompetitionUser(2, studentTempJson);
 
                 layer.close(index);
             }, btn2: function (index, layero) {
                 layer.close(index);
-            },end:function (){
+            }, end: function () {
                 competitionStuIds_no = "";
             }
         });
     }
+
     //参赛学员 结束js
 
 
@@ -1218,73 +1267,74 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
 
     //加载大赛任务数据
     var fzMap = {
-        dx_fz:"",
-        dxx_fz:"",
-        pd_fz:""
+        dx_fz: "",
+        dxx_fz: "",
+        pd_fz: ""
     };
-    function loadDSRW(tag,input_key){ //tag == 1 抽题
+
+    function loadDSRW(tag, input_key) { //tag == 1 抽题
         var ct1QuestionIds = $("input[name='ct1QuestionIds']").val();
         var ct2QuestionIds = $("input[name='ct2QuestionIds']").val();
         var singleChoiceNum = $("input[name='singleChoiceNum']").val();//单选题数量
         var multipleChoiceNum = $("input[name='multipleChoiceNum']").val();//多选题数量
         var judgeNum = $("input[name='judgeNum']").val();//判断题数量
-        if(tag != 1){
+        if (tag != 1) {
             singleChoiceNum = "";
             multipleChoiceNum = "";
             judgeNum = "";
-        }else {
-            if($.isEmpty(singleChoiceNum)){
+        } else {
+            if ($.isEmpty(singleChoiceNum)) {
                 singleChoiceNum = -1;
             }
-            if($.isEmpty(multipleChoiceNum)){
+            if ($.isEmpty(multipleChoiceNum)) {
                 multipleChoiceNum = -1;
             }
-            if($.isEmpty(judgeNum)){
+            if ($.isEmpty(judgeNum)) {
                 judgeNum = -1;
             }
         }
-        var ret = Common.getAjax("/jlw/competition/view.json",{
-            competitionId:$("input[name='competitionId']").val(),
-            part:4,
-            ct1QuestionIds:ct1QuestionIds,
-            ct2QuestionIds:ct2QuestionIds,
-            singleChoiceNum:singleChoiceNum,
-            multipleChoiceNum:multipleChoiceNum,
-            judgeNum:judgeNum
+        var ret = Common.getAjax("/jlw/competition/view.json", {
+            competitionId: $("input[name='competitionId']").val(),
+            part: 4,
+            ct1QuestionIds: ct1QuestionIds,
+            ct2QuestionIds: ct2QuestionIds,
+            singleChoiceNum: singleChoiceNum,
+            multipleChoiceNum: multipleChoiceNum,
+            judgeNum: judgeNum
         });
-        if(ret.code == 0){
-            $.each(ret.data.cT2QuestionList,function (k,v){
-                if(!$.isEmpty(v.stepScore)){
-                    fzMap['jsfz_'+v.resourcesCompetitionId] = v.stepScore;
+        if (ret.code == 0) {
+            $.each(ret.data.cT2QuestionList, function (k, v) {
+                if (!$.isEmpty(v.stepScore)) {
+                    fzMap['jsfz_' + v.resourcesCompetitionId] = v.stepScore;
                 }
             });
 
             var getTpl = dsrw_demo.innerHTML
-                ,view = document.getElementById('dsrw_view');
+                , view = document.getElementById('dsrw_view');
             laytpl(getTpl).render({
-                cT1QuestionList:ret.data.cT1QuestionList,
-                ct1QuestionTotalScore:ret.data.ct1QuestionTotalScore,
-                cT2QuestionList:ret.data.cT2QuestionList,
-                ct2QuestionTotalScore:ret.data.ct2QuestionTotalScore,
+                cT1QuestionList: ret.data.cT1QuestionList,
+                ct1QuestionTotalScore: ret.data.ct1QuestionTotalScore,
+                cT2QuestionList: ret.data.cT2QuestionList,
+                ct2QuestionTotalScore: ret.data.ct2QuestionTotalScore,
                 ct1QuestionIds: ret.ct1QuestionIds,
                 ct2QuestionIds: ret.ct2QuestionIds,
-                fzMap:fzMap,
-                timeInfo:timeInfo
-            }, function(html){
+                fzMap: fzMap,
+                timeInfo: timeInfo
+            }, function (html) {
                 view.innerHTML = html;
                 jiSuanZF();
-                if(tag == 1){
-                    var str = $("input[name='"+input_key+"']").val()
-                    $("input[name='"+input_key+"']").val("").focus().val(str);
+                if (tag == 1) {
+                    var str = $("input[name='" + input_key + "']").val()
+                    $("input[name='" + input_key + "']").val("").focus().val(str);
                 }
                 $(".kgt_select").click(kgt_select);//客观题选择
 
                 $(".jsal_select").click(jsal_select);//竞赛案例设置
 
                 //编辑客观题分值
-                $(".kgfz").bind('input propertychange', function() {
+                $(".kgfz").bind('input propertychange', function () {
                     var zf = 0;
-                    $(".kgfz").each(function (i,key){
+                    $(".kgfz").each(function (i, key) {
                         var xj = Number($(key).val() * Number($(key).parent().prev().find("input").val()));
                         $(this).parent().next().html(xj);
                         zf = Number(zf) + xj;
@@ -1296,46 +1346,46 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                 });
 
                 //编辑竞赛题分值
-                $(".jsfz").bind('input propertychange', function() {
+                $(".jsfz").bind('input propertychange', function () {
                     var zf = 0;
-                    $(".jsfz").each(function (i,key){
+                    $(".jsfz").each(function (i, key) {
                         var xj = Number($(key).val() * Number($(key).parent().prev().html()));
                         $(this).parent().next().html(xj);
                         zf = Number(zf) + xj;
                     });
                     $(".jszf").html(zf);
-                    fzMap["jsfz_"+$(this).attr("ids")] = $(this).val();
+                    fzMap["jsfz_" + $(this).attr("ids")] = $(this).val();
                 });
 
                 //编辑客观题随机抽题数量
                 var handle = "";
                 var inputKey = "";
-                $(".sjct").bind('input propertychange', function() {
-                    if(!$.isEmpty(handle)){
+                $(".sjct").bind('input propertychange', function () {
+                    if (!$.isEmpty(handle)) {
                         clearTimeout(handle);
                     }
                     inputKey = $(this).prop("name");
-                    handle = setTimeout(function (){
-                        loadDSRW(1,inputKey);
-                    },500);
+                    handle = setTimeout(function () {
+                        loadDSRW(1, inputKey);
+                    }, 500);
                 });
                 var minTime = $("input[name='competitionContestStartTime']").val();
                 var maxTime = $("input[name='competitionContestEndTime']").val();
                 laydate.render({
                     elem: '#renwu1'
-                    ,range: "至" //或 range: '~' 来自定义分割字符
-                    ,type: 'datetime'
-                    ,min:$.isEmpty(minTime)?0:minTime +":00"
-                    ,max:$.isEmpty(maxTime)?'2099-12-31 00:00:00':maxTime +":00"
-                    ,format: 'yyyy-MM-dd HH:mm'
-                    ,done: function(value, date, endDate){
-                        if(!$.isEmpty(value)){
+                    , range: "至" //或 range: '~' 来自定义分割字符
+                    , type: 'datetime'
+                    , min: $.isEmpty(minTime) ? 0 : minTime + ":00"
+                    , max: $.isEmpty(maxTime) ? '2099-12-31 00:00:00' : maxTime + ":00"
+                    , format: 'yyyy-MM-dd HH:mm'
+                    , done: function (value, date, endDate) {
+                        if (!$.isEmpty(value)) {
                             timeInfo.competitionTaskOneStartTime = value.split(" 至 ")[0];
                             timeInfo.competitionTaskOneEndTime = value.split(" 至 ")[1];
                             timeInfo.renwu1 = value;
                             $("#addForm input[name='competitionTaskOneStartTime']").val(value.split(" 至 ")[0]);
                             $("#addForm input[name='competitionTaskOneEndTime']").val(value.split(" 至 ")[1]);
-                        }else {
+                        } else {
                             timeInfo.competitionTaskOneStartTime = "";
                             timeInfo.competitionTaskOneEndTime = "";
                             timeInfo.renwu1 = "";
@@ -1346,19 +1396,19 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                 });
                 laydate.render({
                     elem: '#renwu2'
-                    ,range: "至" //或 range: '~' 来自定义分割字符
-                    ,type: 'datetime'
-                    ,min:$.isEmpty(minTime)?0:minTime +":00"
-                    ,max:$.isEmpty(maxTime)?'2099-12-31 00:00:00':maxTime +":00"
-                    ,format: 'yyyy-MM-dd HH:mm'
-                    ,done: function(value, date, endDate){
-                        if(!$.isEmpty(value)){
+                    , range: "至" //或 range: '~' 来自定义分割字符
+                    , type: 'datetime'
+                    , min: $.isEmpty(minTime) ? 0 : minTime + ":00"
+                    , max: $.isEmpty(maxTime) ? '2099-12-31 00:00:00' : maxTime + ":00"
+                    , format: 'yyyy-MM-dd HH:mm'
+                    , done: function (value, date, endDate) {
+                        if (!$.isEmpty(value)) {
                             timeInfo.competitionTaskSecondStartTime = value.split(" 至 ")[0];
                             timeInfo.competitionTaskSecondEndTime = value.split(" 至 ")[1];
                             timeInfo.renwu2 = value;
                             $("#addForm input[name='competitionTaskSecondStartTime']").val(value.split(" 至 ")[0]);
                             $("#addForm input[name='competitionTaskSecondEndTime']").val(value.split(" 至 ")[1]);
-                        }else {
+                        } else {
                             timeInfo.competitionTaskSecondStartTime = "";
                             timeInfo.competitionTaskSecondEndTime = "";
                             timeInfo.renwu2 = "";
@@ -1368,10 +1418,10 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                     }
                 });
                 //竞赛案例预览
-                $(".jsyl").click(function (){
+                $(".jsyl").click(function () {
                     var resourcesCompetitionId = $(this).attr("resourcesCompetitionId");
                     var courseInfoId = $(this).attr("courseInfoId");
-                    window.open(Common.ctxPath + "/jlw/resourcesCompetition/competitionCase.do?courseInfoId="+courseInfoId+"&resourcesCompetitionId="+resourcesCompetitionId)
+                    window.open(Common.ctxPath + "/jlw/resourcesCompetition/competitionCase.do?courseInfoId=" + courseInfoId + "&resourcesCompetitionId=" + resourcesCompetitionId)
                 });
             });
         }
@@ -1379,16 +1429,16 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     }
 
     //计算各个总分
-    function jiSuanZF(){
-        var zf1 = 0,zf2 = 0;
-        $(".kgfz").each(function (i,key){
+    function jiSuanZF() {
+        var zf1 = 0, zf2 = 0;
+        $(".kgfz").each(function (i, key) {
             var xj = Number($(key).val() * Number($(key).parent().prev().find("input").val()));
             $(this).parent().next().html(xj);
             zf1 = Number(zf1) + xj;
         });
         $(".kgtzf").html(zf1);
 
-        $(".jsfz").each(function (i,key){
+        $(".jsfz").each(function (i, key) {
             var xj = Number($(key).val() * Number($(key).parent().prev().html()));
             $(this).parent().next().html(xj);
             zf2 = Number(zf2) + xj;
@@ -1398,22 +1448,30 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     }
 
     //客观题选择
-    function kgt_select(){
-        var ret = Common.getAjax("/jlw/resourcesQuestion/getTreeByCourseLabelTypes.json",{courseLabelTypes:"应用课程类",competitionId:$("input[name='competitionId']").val(),ct1QuestionIds:$("input[name='ct1QuestionIds']").val() || '-1'});
-        openTiMu(1,ret);
+    function kgt_select() {
+        var ret = Common.getAjax("/jlw/resourcesQuestion/getTreeByCourseLabelTypes.json", {
+            courseLabelTypes: "应用课程类",
+            competitionId: $("input[name='competitionId']").val(),
+            ct1QuestionIds: $("input[name='ct1QuestionIds']").val() || '-1'
+        });
+        openTiMu(1, ret);
     }
 
     //竞赛案例设置
-    function jsal_select(){
-        var ret = Common.getAjax("/jlw/resourcesCompetition/getTreeByCourseLabelTypes.json",{courseLabelTypes:"应用课程类",competitionId:$("input[name='competitionId']").val(),ct2QuestionIds:$("input[name='ct2QuestionIds']").val() || '-1'});
-        openTiMu(2,ret);
+    function jsal_select() {
+        var ret = Common.getAjax("/jlw/resourcesCompetition/getTreeByCourseLabelTypes.json", {
+            courseLabelTypes: "应用课程类",
+            competitionId: $("input[name='competitionId']").val(),
+            ct2QuestionIds: $("input[name='ct2QuestionIds']").val() || '-1'
+        });
+        openTiMu(2, ret);
     }
 
     //打开题目选择对话框 sign = 1:选择客观题  2:选择竞赛案例
-    function openTiMu(sign,retInfo){
+    function openTiMu(sign, retInfo) {
         layer.open({
             type: 1,
-            title: sign == 1?"选择客观题":sign == 2?"选择竞赛案例":'',
+            title: sign == 1 ? "选择客观题" : sign == 2 ? "选择竞赛案例" : '',
             shadeClose: true,
             btn: ['确定', '关闭'],
             btnAlign: 'c',
@@ -1421,18 +1479,18 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             content: $("#kgt_dialog"),
             success: function (layero, index) {
                 var questionIds = "";
-                if(sign == 1){
+                if (sign == 1) {
                     questionIds = $("input[name='ct1QuestionIds']").val();
-                }else if(sign == 2){
+                } else if (sign == 2) {
                     questionIds = $("input[name='ct2QuestionIds']").val();
                 }
                 retInfo.sign = sign;//类型
                 retInfo.questionIds = questionIds;//已选题目IDS
-                sTree.loadTree($("#kgt_dialog"),retInfo);
+                sTree.loadTree($("#kgt_dialog"), retInfo);
             }, yes: function (index) {
-                if(sign == 1){
+                if (sign == 1) {
                     $("input[name='ct1QuestionIds']").val(sTree.getIds());
-                }else if(sign == 2){
+                } else if (sign == 2) {
                     $("input[name='ct2QuestionIds']").val(sTree.getIds());
                 }
                 layer.close(index);
@@ -1457,12 +1515,12 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     $(".search_t").click(search_t);//搜索大赛评委
     $(".search_t_no").click(search_t_no);//搜索大赛未添加评委
 
-    $(".export_pw").click(function (){ //导出评委
-        window.open(Common.ctxPath + "/jlw/competition/exportTeacher.json?competitionId="+ $("input[name='competitionId']").val()+"&beCompetitionJudge=1");
+    $(".export_pw").click(function () { //导出评委
+        window.open(Common.ctxPath + "/jlw/competition/exportTeacher.json?competitionId=" + $("input[name='competitionId']").val() + "&beCompetitionJudge=1");
     });
 
     //选择大赛评委
-    function select_pw(){
+    function select_pw() {
         layer.open({
             type: 1,
             title: "选择大赛评委",
@@ -1472,134 +1530,139 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             area: ['910px', '660px'],
             content: $("#teacher_no_dialog"),
             success: function (layero, index) {
-                loadTeacherTable(2,tempTeacherIds);
+                loadTeacherTable(2, tempTeacherIds);
             }, yes: function (index) {
-                loadTeacherTable(1,teacherIds_no +","+tempTeacherIds);
+                loadTeacherTable(1, teacherIds_no + "," + tempTeacherIds);
                 layer.close(index);
             }, btn2: function (index, layero) {
                 layer.close(index);
-            },end:function (){
+            }, end: function () {
                 teacherIds_no = "";
             }
         });
     }
 
     //加载大赛评委
-    function loadTeacherTable(tag,ids){
+    function loadTeacherTable(tag, ids) {
         teacherTable[tag] = table.render({
-            elem : tag == 1?'#teacherTable':tag==2?"#teacherTable_no":"",
-            height : Lib.getTableHeight(),
+            elem: tag == 1 ? '#teacherTable' : tag == 2 ? "#teacherTable_no" : "",
+            height: Lib.getTableHeight(),
             cellMinWidth: 100,
-            method : 'post',
-            even:true,
+            method: 'post',
+            even: true,
             //skin:'nob',
-            where:{
-                competitionId:$("input[name='competitionId']").val(),
-                beCompetitionJudge:tag,
-                tempTeacherIds:ids,
-                teacherStatuses:tag==1?"1,2":""
+            where: {
+                competitionId: $("input[name='competitionId']").val(),
+                beCompetitionJudge: tag,
+                tempTeacherIds: ids,
+                teacherStatuses: tag == 1 ? "1,2" : ""
             },
-            url : Common.ctxPath + '/jlw/teacher/list.json' // 数据接口
-            ,page : Lib.tablePage // 开启分页
-            ,limit : 10,
-            cols : [ [ // 表头
-                {type:'checkbox'},
+            url: Common.ctxPath + '/jlw/teacher/list.json' // 数据接口
+            , page: Lib.tablePage // 开启分页
+            , limit: 10,
+            cols: [[ // 表头
+                {type: 'checkbox'},
                 {
-                    field : 'teacherName', title : '教师姓名',align: "center",width:120
+                    field: 'teacherName', title: '教师姓名', align: "center", width: 120
                 },
                 // {
                 //     field : 'teacherSn', title : '教师编号',align: "center",width:120
                 // },
                 {
-                    field : 'teacherJobNumber', title : '工号',align: "center",width:120
+                    field: 'teacherJobNumber', title: '工号', align: "center", width: 120
                 },
                 {
-                    field : 'teacherMobile', title : '电话',align: "center"
+                    field: 'teacherMobile', title: '电话', align: "center"
                 },
                 {
-                    field : 'teacherEmail', title : '邮箱',align: "center"
+                    field: 'teacherEmail', title: '邮箱', align: "center"
                 },
                 {
-                    field : 'teacherEmail_', title : '操作',align: "center",hide:tag == 1?false:true,width:100,templet:function (d){
+                    field: 'teacherEmail_',
+                    title: '操作',
+                    align: "center",
+                    hide: tag == 1 ? false : true,
+                    width: 100,
+                    templet: function (d) {
                         return '<a style="color: #1E9FFF;cursor: pointer;" lay-event="yc_t">移除</a>';
                     }
                 }
-            ] ],done: function (res, curr, count) {
-                if(tag == 1){
+            ]], done: function (res, curr, count) {
+                if (tag == 1) {
                     tempTeacherIds = res.tempTeacherIds;
                 }
-                if(tag == 1){
-                    Lib.tableFX(this,table.cache['teacherTable'],teacherIds,'teacherId'); //回显
-                }else if(tag == 2){
-                    Lib.tableFX(this,table.cache['teacherTable_no'],teacherIds_no,'teacherId'); //回显
+                if (tag == 1) {
+                    Lib.tableFX(this, table.cache['teacherTable'], teacherIds, 'teacherId'); //回显
+                } else if (tag == 2) {
+                    Lib.tableFX(this, table.cache['teacherTable_no'], teacherIds_no, 'teacherId'); //回显
                 }
             }
         });
 
         //监听选择与取消已报名学生 注:实现了分页也可以选择
-        table.on('checkbox(teacherTable)', function(obj){
-            if(obj.checked){ //选中
+        table.on('checkbox(teacherTable)', function (obj) {
+            if (obj.checked) { //选中
                 var student = obj.data;
-                if(obj.type == "all"){//全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.checkStatus('teacherTable').data;
-                    for(var i = 0; i < checkStatus.length;i++){
-                        if((","+teacherIds+",").indexOf(checkStatus[i].teacherId) < 0){
-                            if(!$.isEmpty(teacherIds)){
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        if (("," + teacherIds + ",").indexOf(checkStatus[i].teacherId) < 0) {
+                            if (!$.isEmpty(teacherIds)) {
                                 teacherIds += "," + checkStatus[i].teacherId;
-                            }else {
+                            } else {
                                 teacherIds = checkStatus[i].teacherId;
                             }
                         }
                     }
-                }else {
-                    if(!$.isEmpty(teacherIds)){
+                } else {
+                    if (!$.isEmpty(teacherIds)) {
                         teacherIds += "," + obj.data.teacherId;
-                    }else {
+                    } else {
                         teacherIds = obj.data.teacherId;
                     }
                 }
-            }else{//取消全选
-                if(obj.type == "all"){//全选
+            } else {//取消全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.cache["teacherTable"];
-                    for(var i = 0; i<checkStatus.length;i++){
-                        teacherIds = Lib.stringRemove(teacherIds,checkStatus[i].teacherId);
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        teacherIds = Lib.stringRemove(teacherIds, checkStatus[i].teacherId);
                     }
-                }else {
-                    teacherIds = Lib.stringRemove(teacherIds,obj.data.teacherId);
+                } else {
+                    teacherIds = Lib.stringRemove(teacherIds, obj.data.teacherId);
                 }
             }
         });
 
         //监听选择与取消已报名学生 注:实现了分页也可以选择
-        table.on('checkbox(teacherTable_no)', function(obj){
-            if(obj.checked){ //选中
+        table.on('checkbox(teacherTable_no)', function (obj) {
+            if (obj.checked) { //选中
                 var student = obj.data;
-                if(obj.type == "all"){//全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.checkStatus('teacherTable_no').data;
-                    for(var i = 0; i < checkStatus.length;i++){
-                        if((","+teacherIds_no+",").indexOf(checkStatus[i].teacherId) < 0){
-                            if(!$.isEmpty(teacherIds_no)){
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        if (("," + teacherIds_no + ",").indexOf(checkStatus[i].teacherId) < 0) {
+                            if (!$.isEmpty(teacherIds_no)) {
                                 teacherIds_no += "," + checkStatus[i].teacherId;
-                            }else {
+                            } else {
                                 teacherIds_no = checkStatus[i].teacherId;
                             }
                         }
                     }
-                }else {
-                    if(!$.isEmpty(teacherIds_no)){
+                } else {
+                    if (!$.isEmpty(teacherIds_no)) {
                         teacherIds_no += "," + obj.data.teacherId;
-                    }else {
+                    } else {
                         teacherIds_no = obj.data.teacherId;
                     }
                 }
-            }else{//取消全选
-                if(obj.type == "all"){//全选
+            } else {//取消全选
+                if (obj.type == "all") {//全选
                     var checkStatus = table.cache["teacherTable"];
-                    for(var i = 0; i<checkStatus.length;i++){
-                        teacherIds_no = Lib.stringRemove(teacherIds_no,checkStatus[i].teacherId);
+                    for (var i = 0; i < checkStatus.length; i++) {
+                        teacherIds_no = Lib.stringRemove(teacherIds_no, checkStatus[i].teacherId);
                     }
-                }else {
-                    teacherIds_no = Lib.stringRemove(teacherIds_no,obj.data.teacherId);
+                } else {
+                    teacherIds_no = Lib.stringRemove(teacherIds_no, obj.data.teacherId);
                 }
             }
         });
@@ -1608,15 +1671,15 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             var data = obj.data;
             if (obj.event === 'yc_t') {
                 layer.confirm('是否确定移除评委?', function (index) {
-                    if($.isEmpty(data.teacherId)){
+                    if ($.isEmpty(data.teacherId)) {
                         layer.msg("请选择需要移除的评委!", {
                             offset: ['50%'],
                             icon: 2,
                             time: 1500 //2秒关闭(如果不配置,默认是3秒)
                         });
-                        return ;
+                        return;
                     }
-                    tempTeacherIds = Lib.stringRemove(tempTeacherIds,data.teacherId);
+                    tempTeacherIds = Lib.stringRemove(tempTeacherIds, data.teacherId);
                     layer.msg("移除成功!", {
                         offset: ['50%'],
                         icon: 1,
@@ -1624,7 +1687,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                     });
                     teacherIds = "";//清空
 
-                    loadTeacherTable(1,tempTeacherIds);
+                    loadTeacherTable(1, tempTeacherIds);
                 });
             }
 
@@ -1632,14 +1695,14 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     }
 
     //搜索
-    function search_t(){
+    function search_t() {
         teacherTable[1].reload({
             where: {
-                teacherName:$(".dspw input[name='teacherName']").val(),
-                competitionId:$("input[name='competitionId']").val(),
-                beCompetitionJudge:1,
-                tempTeacherIds:tempTeacherIds,
-                teacherStatuses:"1,2"
+                teacherName: $(".dspw input[name='teacherName']").val(),
+                competitionId: $("input[name='competitionId']").val(),
+                beCompetitionJudge: 1,
+                tempTeacherIds: tempTeacherIds,
+                teacherStatuses: "1,2"
             },
             page: {
                 curr: 1
@@ -1648,13 +1711,13 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     }
 
     //搜索
-    function search_t_no(){
+    function search_t_no() {
         teacherTable[2].reload({
             where: {
-                teacherName:$(".dspw input[name='teacherName_no']").val(),
-                competitionId:$("input[name='competitionId']").val(),
-                beCompetitionJudge:2,
-                tempTeacherIds:tempTeacherIds
+                teacherName: $(".dspw input[name='teacherName_no']").val(),
+                competitionId: $("input[name='competitionId']").val(),
+                beCompetitionJudge: 2,
+                tempTeacherIds: tempTeacherIds
             },
             page: {
                 curr: 1
@@ -1663,19 +1726,19 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
     }
 
     //移除评委
-    function del_pw(){
+    function del_pw() {
         layer.confirm('是否确定移除评委?', function (index) {
-            if($.isEmpty(teacherIds)){
+            if ($.isEmpty(teacherIds)) {
                 layer.msg("请选择需要移除的评委!", {
                     offset: ['50%'],
                     icon: 2,
                     time: 1500 //2秒关闭(如果不配置,默认是3秒)
                 });
-                return ;
+                return;
             }
-            var info = (teacherIds+"").split(",");
-            for(var i = 0 ;i<info.length;i++){
-                tempTeacherIds = Lib.stringRemove(tempTeacherIds,info[i]);
+            var info = (teacherIds + "").split(",");
+            for (var i = 0; i < info.length; i++) {
+                tempTeacherIds = Lib.stringRemove(tempTeacherIds, info[i]);
             }
             layer.msg("移除成功!", {
                 offset: ['50%'],
@@ -1684,7 +1747,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             });
             teacherIds = "";//清空
 
-            loadTeacherTable(1,tempTeacherIds);
+            loadTeacherTable(1, tempTeacherIds);
         });
     }
 
@@ -1693,9 +1756,9 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
 
 
     //判断是否是已经添加了大赛概况
-    function isCompetition(){
+    function isCompetition() {
         var competitionId = $("input[name='competitionId']").val(); //为空时则需要先添加大赛概况才能继续下一步
-        if($.isEmpty(competitionId)){
+        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");
@@ -1707,28 +1770,28 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
                 time: 1500 //2秒关闭(如果不配置,默认是3秒)
             });
             return false;
-        }else {
+        } else {
             return true;
         }
     }
 
     //保存相应数据
-    $(".bc").click(function (){
+    $(".bc").click(function () {
         saveInfo();
     });
 
-    function saveInfo(t,on){
+    function saveInfo(t, on) {
         var i = $(".layui-tab-brief .layui-this").attr("lay-id");//当前操作tab位置
-        if(on === 0 || (on !== "" && on != null) ){
+        if (on === 0 || (on !== "" && on != null)) {
             i = on;
         }
         var param = {
-            competitionId:($("input[name='competitionId']").val() || ''),
+            competitionId: ($("input[name='competitionId']").val() || ''),
             sign: $("input[name='sign']").val()
 
         }
         console.log(i)
-        if(i === '0'){//大赛概况
+        if (i === '0') {//大赛概况
             var competitionName = $("input[name='competitionName']").val();
             // if($.isEmpty(competitionName)){
             //     layer.msg("请填写大赛名称!", {
@@ -1776,7 +1839,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             param.competitionName = competitionName;
             param.competitionType = competitionType;
             param.competitionSponsorName = competitionSponsorName;
-            param.competitionTeamLimit = competitionType == 2?competitionTeamLimit_1 + "-" +competitionTeamLimit_2:'';
+            param.competitionTeamLimit = competitionType == 2 ? competitionTeamLimit_1 + "-" + competitionTeamLimit_2 : '';
             param.competitionLogo = competitionLogo;
             param.competitionFinalsLimit = competitionFinalsLimit;
             // param.competitionGeneralization = competitionGeneralization;
@@ -1804,7 +1867,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             param.competitionCarouselImage3 = competitionCarouselImage3;
             param.competitionHyperlinkUrl3 = competitionHyperlinkUrl3;
 
-        }else if( i === '1'){//竞赛时间
+        } else if (i === '1') {//竞赛时间
 
             var competitionContestStartTime = $("input[name='competitionContestStartTime']").val();
             var competitionContestEndTime = $("input[name='competitionContestEndTime']").val();
@@ -1818,7 +1881,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
 
             param.competitionTaskThreeStartTime = competitionTaskThreeStartTime;
             param.competitionTaskThreeEndTime = competitionTaskThreeEndTime;
-        }else if( i === '2'){//大赛任务
+        } else if (i === '2') {//大赛任务
             param.ct1QuestionIds = $("input[name='ct1QuestionIds']").val();//大赛任务一选中的题目
             param.ct2QuestionIds = $("input[name='ct2QuestionIds']").val(); //大赛任务二选中的题目
             param.ct1SingleChoiceSource = $("input[name='dx_fz']").val();//大赛任务一 单选题分值
@@ -1835,21 +1898,22 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
             param.competitionTaskSecondEndTime = competitionTaskSecondEndTime;
 
             var ct2QuestionSources = "";
-            $(".jsfz").each(function (i){
+            $(".jsfz").each(function (i) {
                 ct2QuestionSources += $(this).val();
-                if(i < $(".jsfz").length - 1){
+                if (i < $(".jsfz").length - 1) {
                     ct2QuestionSources += ",";
                 }
             });
             param.ct2QuestionSources = ct2QuestionSources; //大赛任务二选中的题目 步骤的分值
-        }else if( i === '3'){//成绩权重
+        } else if (i === '3') {//成绩权重
             var competition_weight_1 = $("input[name='competition_weight_1']").val();//客观题
             var competition_weight_2 = $("input[name='competition_weight_2']").val();//竞赛案例
             var competition_weight_3 = $("input[name='competition_weight_3']").val();//汇报答辩
-            param.competitionWeight = competition_weight_1 + "," + competition_weight_2 + ","+competition_weight_3;//成绩权重
+            param.competitionWeight = competition_weight_1 + "," + competition_weight_2 + "," + competition_weight_3;//成绩权重
             param.competitionDefenceScoreStandard = $("#editCDSFrame .layui-input-block ").html();//评分标准
         }
-        submitInfo(param,t);
+        submitInfo(param, t);
     }
-    exports('add',view);
+
+    exports('add', view);
 });
\ No newline at end of file
diff --git a/web/src/main/resources/static/js/jlw/competition/index.js b/web/src/main/resources/static/js/jlw/competition/index.js
index 70c679ca..7c188999 100644
--- a/web/src/main/resources/static/js/jlw/competition/index.js
+++ b/web/src/main/resources/static/js/jlw/competition/index.js
@@ -113,7 +113,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
         }, initTableTool: table.on('tool(competitionTable)', function (obj) {
             var data = obj.data;
             if (obj.event === 'edit') {
-                console.log(data)
                 var url = "/jlw/competition/add.do?competitionId="+data.competitionId+"&sign="+data.sign;
                 if(data.sign === '1'||data.sign === 1){
                     Common.openDlg(url,"大赛管理/编辑金融大数据大赛");
diff --git a/web/src/main/resources/templates/jlw/competition/add.html b/web/src/main/resources/templates/jlw/competition/add.html
index 9d11093c..88f649d5 100644
--- a/web/src/main/resources/templates/jlw/competition/add.html
+++ b/web/src/main/resources/templates/jlw/competition/add.html
@@ -1,20 +1,28 @@
 <!--# layout("/common/layout.html",{"jsBase":"/js/jlw/competition/"}){ -->
-<link rel="stylesheet" href="${ctxPath}/plugins/editorMd/css/editormd.css" />
+<link rel="stylesheet" href="${ctxPath}/plugins/editorMd/css/editormd.css"/>
 <script src="${ctxPath}/plugins/editorMd/editormd.min.js"></script>
 <link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
 <style>
-    #addForm .layui-inline{
+    #addForm .layui-inline {
         width: 48%;
-        margin-bottom:10px;
+        margin-bottom: 10px;
     }
-    .newC{
-        height: 110px;margin-bottom: 30px;overflow-y: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 5;-webkit-box-orient: vertical;
+
+    .newC {
+        height: 110px;
+        margin-bottom: 30px;
+        overflow-y: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 5;
+        -webkit-box-orient: vertical;
     }
-    .tdOn{
+
+    .tdOn {
         background-color: red !important;
     }
 
-    #editCDSFrame{ /*禁止汇报答辩评分标准text选择*/
+    #editCDSFrame { /*禁止汇报答辩评分标准text选择*/
 
         -moz-user-select: none; /*火狐*/
 
@@ -27,57 +35,76 @@
         user-select: none;
 
     }
-    #editCDSFrame tr td,.export_gr,.export_td,.export_pw{
+
+    #editCDSFrame tr td, .export_gr, .export_td, .export_pw {
         cursor: pointer;
     }
-    .dy{
+
+    .dy {
         margin-right: 10px;
         float: left;
     }
-    .dy i{
+
+    .dy i {
         cursor: pointer;
         color: red;
         display: none;
         position: absolute;
     }
+
     .dy:hover i {
         display: inline;
     }
 
     /*table自动换行*/
-    .layui-table-cell{
-        height:auto;
+    .layui-table-cell {
+        height: auto;
         /*overflow:visible;*/
         /*text-overflow:inherit;*/
-        white-space:normal;
+        white-space: normal;
     }
 
-    .renWuON{
+    .renWuON {
 
     }
-    .xm-label{
+
+    .xm-label {
         height: 36px;
         overflow-y: auto;
     }
-    #demo1 .xm-label,#demo4 .xm-label{
+
+    #demo1 .xm-label, #demo4 .xm-label {
         height: 65px;
         overflow-y: auto;
     }
-    .bc_c{
-        position: absolute;top: 0;left: 930px;
+
+    .bc_c {
+        position: absolute;
+        top: 0;
+        left: 930px;
+    }
+
+    .bc_r {
+        position: absolute;
+        top: 0;
+        right: 4%;
     }
-    .bc_r{
-        position: absolute;top: 0;right: 4%;
+
+    .bc_c_ {
+        position: absolute;
+        top: 0;
+        left: 768px;
     }
-    .bc_c_{
-        position: absolute;top: 0;left: 768px;
+
+    .layui-elem-quote {
+        border-left: 5px solid #1e9fff;
     }
 </style>
 <form class="layui-form" id="addForm" style="position: relative;">
-    <layui:submitButtons id="addButton" buttonType="" text="确认发布"/>
+    <layui:submitButtons id="addButton" buttonType="" text="发布"><i class="layui-icon">&#xe609;</i></layui:submitButtons>
     <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}" />
+    <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">
         <ul class="layui-tab-title">
             <li lay-id="0" class="layui-this">大赛概况</li>
@@ -104,48 +131,60 @@
                     <div class="layui-inline">
                         <label class="layui-form-label"><span class="req">*</span>大赛名称:</label>
                         <div class="layui-input-block">
-                            <input type="text" name="competitionName" value="${competition.competitionName}" placeholder="请输入大赛名称" autocomplete="off" class="layui-input">
+                            <input type="text" name="competitionName" value="${competition.competitionName}"
+                                   placeholder="请输入大赛名称" autocomplete="off" class="layui-input">
                         </div>
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label"><span class="req">*</span>大赛模式:</label>
                         <div class="layui-input-block">
                             <select name="competitionType" lay-filter="select_competitionType">
-                                <option value="1" ${competition.competitionType == null || competition.competitionType ==1?'selected':''} >个人赛</option>
-                                <option value="2" ${competition.competitionType ==2?'selected':''}>团队赛</option>
+                                <option value="1" ${competition.competitionType== null ||
+                                        competition.competitionType==1?'selected':''}>个人赛
+                                </option>
+                                <option value="2" ${competition.competitionType==2?'selected':''}>团队赛</option>
                             </select>
                         </div>
                     </div>
                 </div>
                 <div class="layui-row">
                     <div class="layui-inline">
-                        <label class="layui-form-label" style="line-height: 55px;"><span class="req">*</span>主办方名称:</label>
+                        <label class="layui-form-label" style="line-height: 55px;"><span
+                                class="req">*</span>主办方名称:</label>
                         <div class="layui-input-block">
-                            <textarea name="competitionSponsorName" style="min-height: 75px;" placeholder="请输入主办方名称" class="layui-textarea">${competition.competitionSponsorName}</textarea>
+                            <textarea name="competitionSponsorName" style="min-height: 75px;" placeholder="请输入主办方名称"
+                                      class="layui-textarea">${competition.competitionSponsorName}</textarea>
                         </div>
                     </div>
-                    <div class="layui-inline competitionTeamLimit" ${competition.competitionType == null || competition.competitionType ==1?'style="display:none"':''}>
+                    <div class="layui-inline competitionTeamLimit" ${competition.competitionType== null ||
+                         competition.competitionType==1?'style="display:none"':''}>
                         <label class="layui-form-label"><span class="req">*</span>团队人数范围:</label>
                         <div class="layui-input-block">
                             <!--# var competitionTeamLimit = splitString(competition.competitionTeamLimit,'-');-->
                             <!--# var len = splitLength(competition.competitionTeamLimit,'-');-->
                             <div class="layui-col-md5">
-                                <input type="text" name="competitionTeamLimit_1" value="${len >=1?competitionTeamLimit[0]:''}" autocomplete="off" class="layui-input">
+                                <input type="text" name="competitionTeamLimit_1"
+                                       value="${len >=1?competitionTeamLimit[0]:''}" autocomplete="off"
+                                       class="layui-input">
                             </div>
                             <div class="layui-col-md2">
                                 <hr style="padding-top:10px;"/>
                             </div>
                             <div class="layui-col-md5">
-                                <input type="text" name="competitionTeamLimit_2" value="${len >=2?competitionTeamLimit[1]:''}" autocomplete="off" class="layui-input">
+                                <input type="text" name="competitionTeamLimit_2"
+                                       value="${len >=2?competitionTeamLimit[1]:''}" autocomplete="off"
+                                       class="layui-input">
                             </div>
                         </div>
                     </div>
                 </div>
                 <div class="layui-row">
                     <div class="layui-inline">
-                        <label class="layui-form-label" style="line-height: 55px;"><span class="req">*</span>技术支持方:</label>
+                        <label class="layui-form-label" style="line-height: 55px;"><span
+                                class="req">*</span>技术支持方:</label>
                         <div class="layui-input-block">
-                            <textarea name="competitionTechnicalName" style="min-height: 75px;" placeholder="请输入技术支持方" class="layui-textarea">${competition.competitionTechnicalName}</textarea>
+                            <textarea name="competitionTechnicalName" style="min-height: 75px;" placeholder="请输入技术支持方"
+                                      class="layui-textarea">${competition.competitionTechnicalName}</textarea>
                         </div>
                     </div>
                     <div class="layui-inline" ${sign=='1'?'':'style="display:none"'}>
@@ -153,35 +192,51 @@
                         <div class="layui-input-block">
                             <!--# var start1 = simpleDateFormat(competition.competitionEnrollStartTime,'YMDHM');-->
                             <!--# var end1 = simpleDateFormat(competition.competitionEnrollEndTime,'YMDHM');-->
-                            <input type="text" id="enrollRange" autocomplete="off" value="${start1} ${start1 != null && end1 != null?'至':''} ${end1}" class="layui-input">
-                            <input type="hidden" name="competitionEnrollStartTime" value="${competition.competitionEnrollStartTime}" id="competitionEnrollStartTime" autocomplete="off" class="layui-input">
-                            <input type="hidden" name="competitionEnrollEndTime" value="${competition.competitionEnrollEndTime}" id="competitionEnrollEndTime" autocomplete="off" class="layui-input">
+                            <input type="text" id="enrollRange" autocomplete="off"
+                                   value="${start1} ${start1 != null && end1 != null?'至':''} ${end1}"
+                                   class="layui-input">
+                            <input type="hidden" name="competitionEnrollStartTime"
+                                   value="${competition.competitionEnrollStartTime}" id="competitionEnrollStartTime"
+                                   autocomplete="off" class="layui-input">
+                            <input type="hidden" name="competitionEnrollEndTime"
+                                   value="${competition.competitionEnrollEndTime}" id="competitionEnrollEndTime"
+                                   autocomplete="off" class="layui-input">
                         </div>
                     </div>
                     <div class="layui-inline" ${sign=='2'?'':'style="display:none"'}>
                         <label class="layui-form-label">决赛规则:</label>
                         <div class="layui-input-block" style="line-height: 38px;">
                             <span style="float: left;padding: 0 10px;">前</span>
-                            <input type="text" style="width: 100px;float: left;margin-right: 10px;" name="competitionFinalsLimit" value="${competition.competitionFinalsLimit}" autocomplete="off" class="layui-input">
+                            <input type="text" style="width: 100px;float: left;margin-right: 10px;"
+                                   name="competitionFinalsLimit" value="${competition.competitionFinalsLimit}"
+                                   autocomplete="off" class="layui-input">
                             名进入决赛(允许并列)
                         </div>
                     </div>
                 </div>
+
                 <div class="layui-row">
                     <div class="layui-inline">
                         <label class="layui-form-label" style="line-height: 64px;">大赛缩略图:</label>
                         <div class="layui-input-block">
-                            <input type="hidden" name="competitionLogo" value="${competition.competitionLogo}" class="layui-input" >
-                            <div class="layui-upload-drag" id="test10" style="width: 180px;height: 80px;padding: 0;float: left;">
-                                <span id="logo" ${competition.competitionLogo !=null&&competition.competitionLogo!=''?'style="display:none;"':''}>
+                            <input type="hidden" name="competitionLogo" value="${competition.competitionLogo}"
+                                   class="layui-input">
+                            <div class="layui-upload-drag" id="test10"
+                                 style="width: 180px;height: 80px;padding: 0;float: left;">
+                                <span id="logo" ${competition.competitionLogo
+                                      !=null&&competition.competitionLogo!=''?'style="display:none;"':''}>
                                     <i class="layui-icon"></i>
                                     <p>点击上传图片</p>
                                 </span>
-                                <div class="${competition.competitionLogo==null||competition.competitionLogo==''?'layui-hide':''}" id="uploadDemoView">
-                                    <img src="${ctxPath}${competition.competitionLogo}" alt="大赛LOGO" style="width: 180px;height: 80px;">
+                                <div class="${competition.competitionLogo==null||competition.competitionLogo==''?'layui-hide':''}"
+                                     id="uploadDemoView">
+                                    <img src="${ctxPath}${competition.competitionLogo}" alt="大赛LOGO"
+                                         style="width: 180px;height: 80px;">
                                 </div>
                             </div>
-                            <div class="layui-form-mid layui-word-aux" style="padding-left: 20px !important;margin-top: 20px;">像素大小:180*80</div>
+                            <div class="layui-form-mid layui-word-aux"
+                                 style="padding-left: 20px !important;margin-top: 20px;">像素大小:180*80
+                            </div>
                         </div>
                     </div>
                     <div class="layui-inline" ${sign=='1'?'':'style="display:none"'}>
@@ -189,9 +244,14 @@
                         <div class="layui-input-block">
                             <!--# var start = simpleDateFormat(competition.competitionFreetrialStartTime,'YMDHM');-->
                             <!--# var end = simpleDateFormat(competition.competitionFreetrialEndTime,'YMDHM');-->
-                            <input type="text" id="enrollRange2" autocomplete="off" value="${start} ${start != null && end != null?'至':''} ${end}" class="layui-input">
-                            <input type="hidden" name="competitionFreetrialStartTime" value="${competition.competitionFreetrialStartTime}" id="competitionFreetrialStartTime" autocomplete="off" class="layui-input">
-                            <input type="hidden" name="competitionFreetrialEndTime" value="${competition.competitionFreetrialEndTime}" id="competitionFreetrialEndTime" autocomplete="off" class="layui-input">
+                            <input type="text" id="enrollRange2" autocomplete="off"
+                                   value="${start} ${start != null && end != null?'至':''} ${end}" class="layui-input">
+                            <input type="hidden" name="competitionFreetrialStartTime"
+                                   value="${competition.competitionFreetrialStartTime}"
+                                   id="competitionFreetrialStartTime" autocomplete="off" class="layui-input">
+                            <input type="hidden" name="competitionFreetrialEndTime"
+                                   value="${competition.competitionFreetrialEndTime}" id="competitionFreetrialEndTime"
+                                   autocomplete="off" class="layui-input">
                         </div>
                     </div>
                 </div>
@@ -199,23 +259,32 @@
                     <div class="layui-inline">
                         <label class="layui-form-label" style="line-height: 64px;">大赛轮播图1:</label>
                         <div class="layui-input-block">
-                            <input type="hidden" name="competitionCarouselImage1" value="${competition.competitionCarouselImage1}" class="layui-input" >
-                            <div class="layui-upload-drag" id="test12" style="width: 180px;height: 80px;padding: 0;float: left;">
-                                <span id="competitionCarouselImage1" ${competition.competitionCarouselImage1 !=null&&competition.competitionCarouselImage1!=''?'style="display:none;"':''}>
+                            <input type="hidden" name="competitionCarouselImage1"
+                                   value="${competition.competitionCarouselImage1}" class="layui-input">
+                            <div class="layui-upload-drag" id="test12"
+                                 style="width: 180px;height: 80px;padding: 0;float: left;">
+                                <span id="competitionCarouselImage1" ${competition.competitionCarouselImage1
+                                      !=null&&competition.competitionCarouselImage1!=''?'style="display:none;"':''}>
                                     <i class="layui-icon"></i>
                                     <p>点击上传图片</p>
                                 </span>
-                                <div class="${competition.competitionCarouselImage1==null||competition.competitionCarouselImage1==''?'layui-hide':''}" id="competitionCarouselImage1_1">
-                                    <img src="${ctxPath}${competition.competitionCarouselImage1}" alt="大赛LOGO" style="width: 180px;height: 80px;">
+                                <div class="${competition.competitionCarouselImage1==null||competition.competitionCarouselImage1==''?'layui-hide':''}"
+                                     id="competitionCarouselImage1_1">
+                                    <img src="${ctxPath}${competition.competitionCarouselImage1}" alt="大赛LOGO"
+                                         style="width: 180px;height: 80px;">
                                 </div>
                             </div>
-                            <div class="layui-form-mid layui-word-aux" style="padding-left: 20px !important;margin-top: 20px;">像素大小:180*80</div>
+                            <div class="layui-form-mid layui-word-aux"
+                                 style="padding-left: 20px !important;margin-top: 20px;">像素大小:180*80
+                            </div>
                         </div>
                     </div>
                     <div class="layui-inline" ${sign=='1'?'':'style="display:none"'}>
                         <label class="layui-form-label">超链接网址:</label>
                         <div class="layui-input-block">
-                            <input type="text" name="competitionHyperlinkUrl1" value="${competition.competitionHyperlinkUrl1}" placeholder="请输入超链接网址" autocomplete="off" class="layui-input">
+                            <input type="text" name="competitionHyperlinkUrl1"
+                                   value="${competition.competitionHyperlinkUrl1}" placeholder="请输入超链接网址"
+                                   autocomplete="off" class="layui-input">
                         </div>
                     </div>
                 </div>
@@ -224,23 +293,32 @@
                     <div class="layui-inline">
                         <label class="layui-form-label" style="line-height: 64px;">大赛轮播图2:</label>
                         <div class="layui-input-block">
-                            <input type="hidden" name="competitionCarouselImage2" value="${competition.competitionCarouselImage2}" class="layui-input" >
-                            <div class="layui-upload-drag" id="test13" style="width: 180px;height: 80px;padding: 0;float: left;">
-                                <span id="competitionCarouselImage2" ${competition.competitionCarouselImage2 !=null&&competition.competitionCarouselImage2!=''?'style="display:none;"':''}>
+                            <input type="hidden" name="competitionCarouselImage2"
+                                   value="${competition.competitionCarouselImage2}" class="layui-input">
+                            <div class="layui-upload-drag" id="test13"
+                                 style="width: 180px;height: 80px;padding: 0;float: left;">
+                                <span id="competitionCarouselImage2" ${competition.competitionCarouselImage2
+                                      !=null&&competition.competitionCarouselImage2!=''?'style="display:none;"':''}>
                                     <i class="layui-icon"></i>
                                     <p>点击上传图片</p>
                                 </span>
-                                <div class="${competition.competitionCarouselImage2==null||competition.competitionCarouselImage2==''?'layui-hide':''}" id="competitionCarouselImage2_1">
-                                    <img src="${ctxPath}${competition.competitionCarouselImage2}" alt="大赛LOGO" style="width: 180px;height: 80px;">
+                                <div class="${competition.competitionCarouselImage2==null||competition.competitionCarouselImage2==''?'layui-hide':''}"
+                                     id="competitionCarouselImage2_1">
+                                    <img src="${ctxPath}${competition.competitionCarouselImage2}" alt="大赛LOGO"
+                                         style="width: 180px;height: 80px;">
                                 </div>
                             </div>
-                            <div class="layui-form-mid layui-word-aux" style="padding-left: 20px !important;margin-top: 20px;">像素大小:180*80</div>
+                            <div class="layui-form-mid layui-word-aux"
+                                 style="padding-left: 20px !important;margin-top: 20px;">像素大小:180*80
+                            </div>
                         </div>
                     </div>
                     <div class="layui-inline" ${sign=='1'?'':'style="display:none"'}>
                         <label class="layui-form-label">超链接网址:</label>
                         <div class="layui-input-block">
-                            <input type="text" name="competitionHyperlinkUrl2" value="${competition.competitionHyperlinkUrl2}" placeholder="请输入超链接网址" autocomplete="off" class="layui-input">
+                            <input type="text" name="competitionHyperlinkUrl2"
+                                   value="${competition.competitionHyperlinkUrl2}" placeholder="请输入超链接网址"
+                                   autocomplete="off" class="layui-input">
                         </div>
                     </div>
                 </div>
@@ -248,23 +326,32 @@
                     <div class="layui-inline">
                         <label class="layui-form-label" style="line-height: 64px;">大赛轮播图3:</label>
                         <div class="layui-input-block">
-                            <input type="hidden" name="competitionCarouselImage3" value="${competition.competitionCarouselImage3}" class="layui-input" >
-                            <div class="layui-upload-drag" id="test14" style="width: 180px;height: 80px;padding: 0;float: left;">
-                                <span id="competitionCarouselImage3" ${competition.competitionCarouselImage3 !=null&&competition.competitionCarouselImage3!=''?'style="display:none;"':''}>
+                            <input type="hidden" name="competitionCarouselImage3"
+                                   value="${competition.competitionCarouselImage3}" class="layui-input">
+                            <div class="layui-upload-drag" id="test14"
+                                 style="width: 180px;height: 80px;padding: 0;float: left;">
+                                <span id="competitionCarouselImage3" ${competition.competitionCarouselImage3
+                                      !=null&&competition.competitionCarouselImage3!=''?'style="display:none;"':''}>
                                     <i class="layui-icon"></i>
                                     <p>点击上传图片</p>
                                 </span>
-                                <div class="${competition.competitionCarouselImage3==null||competition.competitionCarouselImage3==''?'layui-hide':''}" id="competitionCarouselImage3_1">
-                                    <img src="${ctxPath}${competition.competitionCarouselImage3}" alt="大赛LOGO" style="width: 180px;height: 80px;">
+                                <div class="${competition.competitionCarouselImage3==null||competition.competitionCarouselImage3==''?'layui-hide':''}"
+                                     id="competitionCarouselImage3_1">
+                                    <img src="${ctxPath}${competition.competitionCarouselImage3}" alt="大赛LOGO"
+                                         style="width: 180px;height: 80px;">
                                 </div>
                             </div>
-                            <div class="layui-form-mid layui-word-aux" style="padding-left: 20px !important;margin-top: 20px;">像素大小:180*80</div>
+                            <div class="layui-form-mid layui-word-aux"
+                                 style="padding-left: 20px !important;margin-top: 20px;">像素大小:180*80
+                            </div>
                         </div>
                     </div>
                     <div class="layui-inline" ${sign=='1'?'':'style="display:none"'}>
                         <label class="layui-form-label">超链接网址:</label>
                         <div class="layui-input-block">
-                            <input type="text" name="competitionHyperlinkUrl3" value="${competition.competitionHyperlinkUrl3}" placeholder="请输入超链接网址" autocomplete="off" class="layui-input">
+                            <input type="text" name="competitionHyperlinkUrl3"
+                                   value="${competition.competitionHyperlinkUrl3}" placeholder="请输入超链接网址"
+                                   autocomplete="off" class="layui-input">
                         </div>
                     </div>
                 </div>
@@ -278,23 +365,34 @@
                         <div class="layui-input-block">
                             <!--# var startTime = simpleDateFormat(competition.competitionContestStartTime,'YMDHM');-->
                             <!--# var endTime = simpleDateFormat(competition.competitionContestEndTime,'YMDHM');-->
-                                <input type="text" id="contestRange" autocomplete="off" value="${startTime} ${startTime != null && endTime != null?'至':''} ${endTime}" class="layui-input">
-                                <input type="hidden" name="competitionContestStartTime" value="${startTime}" autocomplete="off" class="layui-input">
-                                <input type="hidden" name="competitionContestEndTime" value="${endTime}" autocomplete="off" class="layui-input">
+                            <input type="text" id="contestRange" autocomplete="off"
+                                   value="${startTime} ${startTime != null && endTime != null?'至':''} ${endTime}"
+                                   class="layui-input">
+                            <input type="hidden" name="competitionContestStartTime" value="${startTime}"
+                                   autocomplete="off" class="layui-input">
+                            <input type="hidden" name="competitionContestEndTime" value="${endTime}" autocomplete="off"
+                                   class="layui-input">
                         </div>
                     </div>
                 </div>
 
 
-                <div style="display: none" class="layui-row ${competition.competitionContestStartTime==''||competition.competitionContestStartTime==null?'renWu renWuON':'renWu'}">
+                <div style="display: none"
+                     class="layui-row ${competition.competitionContestStartTime==''||competition.competitionContestStartTime==null?'renWu renWuON':'renWu'}">
                     <div class="layui-inline">
                         <label class="layui-form-label">任务三:</label>
                         <div class="layui-input-block">
                             <!--# var start_3 = simpleDateFormat(competition.competitionTaskThreeStartTime,'YMDHM');-->
                             <!--# var end_3 = simpleDateFormat(competition.competitionTaskThreeEndTime,'YMDHM');-->
-                            <input type="text" id="renwu3" autocomplete="off" value="${start_3} ${start_3 != null && end_3 != null?'至':''} ${end_3}" class="layui-input">
-                            <input type="hidden" name="competitionTaskThreeStartTime" value="${competition.competitionTaskThreeStartTime}" autocomplete="off" class="layui-input">
-                            <input type="hidden" name="competitionTaskThreeEndTime" value="${competition.competitionTaskThreeEndTime}" autocomplete="off" class="layui-input">
+                            <input type="text" id="renwu3" autocomplete="off"
+                                   value="${start_3} ${start_3 != null && end_3 != null?'至':''} ${end_3}"
+                                   class="layui-input">
+                            <input type="hidden" name="competitionTaskThreeStartTime"
+                                   value="${competition.competitionTaskThreeStartTime}" autocomplete="off"
+                                   class="layui-input">
+                            <input type="hidden" name="competitionTaskThreeEndTime"
+                                   value="${competition.competitionTaskThreeEndTime}" autocomplete="off"
+                                   class="layui-input">
                         </div>
                     </div>
                 </div>
@@ -309,78 +407,89 @@
             <!--成绩权重4-->
             <div class="layui-tab-item" ${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;">
-                    <label class="layui-form-label">成绩权重设置:</label>
                     <div class="layui-row">
                         <label class="layui-form-label"></label>
                         <div class="layui-input-block">
                             <!--# var competitionWeight = splitString(competition.competitionWeight,',');-->
                             <!--# var l = splitLength(competition.competitionWeight,',');-->
-                           总分 <span style="margin: 0 20px;">=</span> 客观题
-                            <span style="margin: 0 20px;">x</span> <input value="${l >= 1?competitionWeight[0]:''}" name="competition_weight_1" style="text-align: center;width: 80px;line-height: 30px;" /><span style="padding-left: 10px;">%</span>
-                            <span style="margin: 0 20px;">+</span> 竞赛案例
-                            <span style="margin: 0 20px;">x</span> <input value="${l >= 2?competitionWeight[1]:''}" name="competition_weight_2" style="text-align: center;width: 80px;line-height: 30px;" /><span style="padding-left: 10px;">%</span>
-                            <span style="margin: 0 20px;">+</span> 汇报答辩
-                            <span style="margin: 0 20px;">x</span> <input value="${l >= 3?competitionWeight[2]:''}" name="competition_weight_3" style="text-align: center;width: 80px;line-height: 30px;" /><span style="padding-left: 10px;">%</span>
+                            总分 <span style="margin: 0 20px;">=</span> <!--客观题-->证券投资
+                            <span style="margin: 0 20px;">+</span> <input value="${l >= 1?competitionWeight[0]:''}"
+                                                                          name="competition_weight_1"
+                                                                          style="text-align: center;width: 80px;line-height: 30px;"/><span
+                                style="padding-left: 10px;">%</span>
+                            <span style="margin: 0 20px;">+</span> <!--竞赛案例-->金融实操
+                            <span style="margin: 0 20px;">x</span> <input value="${l >= 2?competitionWeight[1]:''}"
+                                                                          name="competition_weight_2"
+                                                                          style="text-align: center;width: 80px;line-height: 30px;"/><span
+                                style="padding-left: 10px;">%</span>
+                            <!--<span style="margin: 0 20px;">+</span> 汇报答辩
+                            <span style="margin: 0 20px;">x</span> <input value="${l >= 3?competitionWeight[2]:''}"
+                                                                          name="competition_weight_3"
+                                                                          style="text-align: center;width: 80px;line-height: 30px;"/><span
+                                style="padding-left: 10px;">%</span>-->
                         </div>
                     </div>
                 </div>
-                <div id="editCDSFrame" style="margin: 0 60px;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;padding: 15px 20px 20px;">
+                <div id="editCDSFrame"
+                     style="display:none;margin: 0 60px;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;padding: 15px 20px 20px;">
                     <label class="layui-form-label">
                         汇报答辩评分标准:
                     </label>
-                    <button type="button" class="layui-btn bg_button layui-btn-sm" id="editCompetitionDefenceScoreStandard">编辑</button>
+                    <button type="button" class="layui-btn bg_button layui-btn-sm"
+                            id="editCompetitionDefenceScoreStandard">编辑
+                    </button>
                     <button type="button" class="layui-btn bg_button layui-btn-sm" id="merge">合并</button>
                     <button type="button" class="layui-btn bg_button layui-btn-sm" id="againEdit">重新编辑</button>
                     <div class="layui-row">
                         <label class="layui-form-label"></label>
                         <div class="layui-input-block ">
                             <!--#if(competition.competitionDefenceScoreStandard != null && competition.competitionDefenceScoreStandard != ''){ -->
-                                ${competition.competitionDefenceScoreStandard}
+                            ${competition.competitionDefenceScoreStandard}
                             <!--#}else{ -->
-                                <table class="layui-table" style="width: 800px;">
-                                    <tr>
-                                        <th style="text-align: center;">标准</th>
-                                        <th style="text-align: center;">详情</th>
-                                        <th style="text-align: center;">权重</th>
-                                    </tr>
-                                    <tr>
-                                        <td rowspan="3" style="text-align: center;">表达能力</td>
-                                        <td>1、仪容仪表,合适的肢体语言</td>
-                                        <td rowspan="3" style="text-align: center;">25%</td>
-                                    </tr>
-                                    <tr>
-                                        <td>2、用词准确,表达清晰,语言流利</td>
-                                    </tr>
-                                    <tr>
-                                        <td>3、应变及反应能力</td>
-                                    </tr>
-                                    <tr>
-                                        <td rowspan="2" style="text-align: center;">知识的掌握与应用</td>
-                                        <td>1、知识的熟练掌握与应用</td>
-                                        <td rowspan="2" style="text-align: center;">25%</td>
-                                    </tr>
-                                    <tr>
-                                        <td>2、知识应用的准确性和正确性</td>
-                                    </tr>
-                                    <tr>
-                                        <td rowspan="2" style="text-align: center;">报告内容</td>
-                                        <td>1、报告内容内容需包含但不限于所给出的大纲内容;</td>
-                                        <td rowspan="2" style="text-align: center;">30%</td>
-                                    </tr>
-                                    <tr>
-                                        <td>2、报告内容需根据大赛期间的真实交易情况进行阐述</td>
-                                    </tr>
-                                    <tr>
-                                        <td style="text-align: center;">PPT的美化度</td>
-                                        <td>PPT的美观度</td>
-                                        <td style="text-align: center;">10%</td>
-                                    </tr>
-                                    <tr>
-                                        <td style="text-align: center;">综合评分</td>
-                                        <td>评委综合印象分</td>
-                                        <td style="text-align: center;">10%</td>
-                                    </tr>
-                                </table>
+                            <table class="layui-table" style="width: 800px;">
+                                <tr>
+                                    <th style="text-align: center;">标准</th>
+                                    <th style="text-align: center;">详情</th>
+                                    <th style="text-align: center;">权重</th>
+                                </tr>
+                                <tr>
+                                    <td rowspan="3" style="text-align: center;">表达能力</td>
+                                    <td>1、仪容仪表,合适的肢体语言</td>
+                                    <td rowspan="3" style="text-align: center;">25%</td>
+                                </tr>
+                                <tr>
+                                    <td>2、用词准确,表达清晰,语言流利</td>
+                                </tr>
+                                <tr>
+                                    <td>3、应变及反应能力</td>
+                                </tr>
+                                <tr>
+                                    <td rowspan="2" style="text-align: center;">知识的掌握与应用</td>
+                                    <td>1、知识的熟练掌握与应用</td>
+                                    <td rowspan="2" style="text-align: center;">25%</td>
+                                </tr>
+                                <tr>
+                                    <td>2、知识应用的准确性和正确性</td>
+                                </tr>
+                                <tr>
+                                    <td rowspan="2" style="text-align: center;">报告内容</td>
+                                    <td>1、报告内容内容需包含但不限于所给出的大纲内容;</td>
+                                    <td rowspan="2" style="text-align: center;">30%</td>
+                                </tr>
+                                <tr>
+                                    <td>2、报告内容需根据大赛期间的真实交易情况进行阐述</td>
+                                </tr>
+                                <tr>
+                                    <td style="text-align: center;">PPT的美化度</td>
+                                    <td>PPT的美观度</td>
+                                    <td style="text-align: center;">10%</td>
+                                </tr>
+                                <tr>
+                                    <td style="text-align: center;">综合评分</td>
+                                    <td>评委综合印象分</td>
+                                    <td style="text-align: center;">10%</td>
+                                </tr>
+                            </table>
                             <!--#} -->
                         </div>
                     </div>
@@ -417,6 +526,7 @@
             <!--大赛动态7 动态内容:competitionNewsContent  动态图片:competitionNewsPicture-->
             <div class="layui-tab-item">
                 <div style="min-width: 1200px;">
+                    <blockquote class="layui-elem-quote">新增动态</blockquote>
                     <div class="layui-row">
                         <div class="layui-inline" style="width: 96%;">
                             <label class="layui-form-label">动态内容:</label>
@@ -432,21 +542,31 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">动态图片:</label>
                             <div class="layui-input-block">
-                                <input type="hidden" name="competitionNewsPicture" value="${competition.competitionNewsPicture}" class="layui-input" >
-                                <div class="layui-upload-drag" id="test11" style="width: 180px;height: 80px;padding: 0;float: left;">
-                                <span id="newsPicture" ${competition.competitionNewsPicture!=null&&competition.competitionNewsPicture!=""?'style="display:none;"':''}>
+                                <input type="hidden" name="competitionNewsPicture"
+                                       value="${competition.competitionNewsPicture}" class="layui-input">
+                                <div class="layui-upload-drag" id="test11"
+                                     style="width: 180px;height: 80px;padding: 0;float: left;">
+                                <span id="newsPicture"
+                                      ${competition.competitionNewsPicture!=null&&competition.competitionNewsPicture!=""?'style="display:none;"':''}>
                                     <i class="layui-icon"></i>
                                     <p>点击上传图片</p>
                                 </span>
-                                    <div class="${competition.competitionNewsPicture == null||competition.competitionNewsPicture == ''?'layui-hide':''}" id="uploadDemoView_1">
-                                        <img src="${ctxPath}${competition.competitionNewsPicture}" alt="大赛LOGO" style="width: 180px;height: 80px;">
+                                    <div class="${competition.competitionNewsPicture == null||competition.competitionNewsPicture == ''?'layui-hide':''}"
+                                         id="uploadDemoView_1">
+                                        <img src="${ctxPath}${competition.competitionNewsPicture}" alt="大赛LOGO"
+                                             style="width: 180px;height: 80px;">
                                     </div>
                                 </div>
-                                <div class="layui-form-mid layui-word-aux" style="padding-left: 20px !important;margin-top: 20px;">像素大小:180*80</div>
+                                <div class="layui-form-mid layui-word-aux"
+                                     style="padding-left: 20px !important;margin-top: 20px;">像素大小:180*80
+                                </div>
                             </div>
                         </div>
-                        <button type="button" class="layui-btn bg_button" id="addCompetitionNews" style="float: right;margin-right: 4%;">新增动态</button>
+                        <button type="button" class="layui-btn bg_button" id="addCompetitionNews"
+                                style="float: right;margin-right: 4%;">完成
+                        </button>
                     </div>
+                    <blockquote class="layui-elem-quote">动态展示</blockquote>
                     <div class="layui-row">
                         <div class="layui-inline" style="width: 96%;">
                             <label class="layui-form-label"></label>
@@ -460,12 +580,15 @@
                                             <h3 class="layui-timeline-title">${competitionNewsAddTime}</h3>
                                             <div>
                                                 <!--#if(item.competitionNewsPicture != null){ -->
-                                                <img src="${ctxPath}${item.competitionNewsPicture}" style="width: 200px;height: 110px;display: block;float: left;margin-right: 20px;" />
+                                                <img src="${ctxPath}${item.competitionNewsPicture}"
+                                                     style="width: 200px;height: 110px;display: block;float: left;margin-right: 20px;"/>
                                                 <!--#}else{ -->
-                                                <img src="${ctxPath}/filesystem/temp/label/timg.jpg" style="width: 200px;height: 110px;display: block;float: left;margin-right: 20px;" />
+                                                <img src="${ctxPath}/filesystem/temp/label/timg.jpg"
+                                                     style="width: 200px;height: 110px;display: block;float: left;margin-right: 20px;"/>
                                                 <!--#} -->
                                                 <div class="newC">
-                                                    <div class="markdown-body editormd-preview-container" style="width: auto;">
+                                                    <div class="markdown-body editormd-preview-container"
+                                                         style="width: auto;">
                                                         ${item.competitionNewsContent}
                                                     </div>
                                                 </div>
@@ -506,23 +629,46 @@
                         <div class="layui-inline" style="width: 96%;">
                             <label class="layui-form-label"></label>
                             <div class="layui-input-block">
-                                <button type="button" class="layui-btn bg_button" id="addCompetitionAwardList">保存</button>
+                                <button type="button" class="layui-btn bg_button" id="addCompetitionAwardList">保存
+                                </button>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <!--   赛制赛程9         -->
+            <!--   交易规则9         -->
             <div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
             </div>
-            <!--   赛制赛程10         -->
+            <!--   奖项设置10         -->
             <div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
             </div>
-            <!--   赛制赛程11         -->
+            <!--   大赛新闻11         -->
             <div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
             </div>
-            <!--   赛制赛程12         -->
+            <!--   院校风采12         -->
             <div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
+                <div style="min-width: 1200px;">
+                    <div class="layui-row">
+                        <div class="layui-inline" style="width: 96%;">
+                            <label class="layui-form-label">新增风采:</label>
+                            <div class="layui-input-block">
+                                <div id="competitionXYFC">
+                                    <!--					competitionAwardList-->
+                                    <textarea
+                                            style="display:none;"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-row">
+                        <div class="layui-inline" style="width: 96%;">
+                            <label class="layui-form-label"></label>
+                            <div class="layui-input-block">
+                                <button type="button" class="layui-btn bg_button" id="addCompetitionXYFC">保存</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
 
 
@@ -536,25 +682,34 @@
 
 <script id="dsrw_demo" type="text/html">
     <div style="margin: 0 60px 30px;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;">
-        <input name="ct1QuestionIds" type="hidden" value="{{d.ct1QuestionIds || ''}}" />
+        <input name="ct1QuestionIds" type="hidden" value="{{d.ct1QuestionIds || ''}}"/>
         <label class="layui-form-label">客观题设置:</label>
         <div class="layui-row">
             <label class="layui-form-label">题库选择:</label>
             <div class="layui-input-block">
                 <button type="button" class="layui-btn bg_button kgt_select">选择</button>
-                <div style="margin-bottom: 0 !important;" class="layui-inline ${competition.competitionContestStartTime==''||competition.competitionContestStartTime==null?'renWu renWuON':'renWu'}">
+                <div style="margin-bottom: 0 !important;"
+                     class="layui-inline ${competition.competitionContestStartTime==''||competition.competitionContestStartTime==null?'renWu renWuON':'renWu'}">
                     <label class="layui-form-label">竞赛时间:</label>
                     <div class="layui-input-block">
                         <!--# var start_1 = simpleDateFormat(competition.competitionTaskOneStartTime,'YMDHM');-->
                         <!--# var end_1 = simpleDateFormat(competition.competitionTaskOneEndTime,'YMDHM');-->
                         {{# if($.isEmpty(d.timeInfo.competitionTaskOneStartTime)){}}
-                            <input type="text" id="renwu1" autocomplete="off" value="${start_1} ${start_1 != null && end_1 != null?'至':''} ${end_1}" class="layui-input">
-                            <input type="hidden" name="competitionTaskOneStartTime" value="${start_1}" autocomplete="off" class="layui-input">
-                            <input type="hidden" name="competitionTaskOneEndTime" value="${end_1}" autocomplete="off" class="layui-input">
+                        <input type="text" id="renwu1" autocomplete="off"
+                               value="${start_1} ${start_1 != null && end_1 != null?'至':''} ${end_1}"
+                               class="layui-input">
+                        <input type="hidden" name="competitionTaskOneStartTime" value="${start_1}" autocomplete="off"
+                               class="layui-input">
+                        <input type="hidden" name="competitionTaskOneEndTime" value="${end_1}" autocomplete="off"
+                               class="layui-input">
                         {{# }else{}}
-                            <input type="text" id="renwu1" autocomplete="off" value="{{d.timeInfo.renwu1}}" class="layui-input">
-                            <input type="hidden" name="competitionTaskOneStartTime" value="{{d.timeInfo.competitionTaskOneStartTime}}" autocomplete="off" class="layui-input">
-                            <input type="hidden" name="competitionTaskOneEndTime" value="{{d.timeInfo.competitionTaskOneEndTime}}" autocomplete="off" class="layui-input">
+                        <input type="text" id="renwu1" autocomplete="off" value="{{d.timeInfo.renwu1}}"
+                               class="layui-input">
+                        <input type="hidden" name="competitionTaskOneStartTime"
+                               value="{{d.timeInfo.competitionTaskOneStartTime}}" autocomplete="off"
+                               class="layui-input">
+                        <input type="hidden" name="competitionTaskOneEndTime"
+                               value="{{d.timeInfo.competitionTaskOneEndTime}}" autocomplete="off" class="layui-input">
                         {{# }}}
 
                     </div>
@@ -587,29 +742,41 @@
                         <td>单选题</td>
                         <td>{{!$.isEmpty(d.cT1QuestionList[1])?d.cT1QuestionList[1].totalNumber:''}}</td>
                         <td>
-                            <input type="text" name="singleChoiceNum" value="{{$.isEmpty(d.cT1QuestionList[1].choiceNumber) && d.cT1QuestionList[1].choiceNumber != 0?'':d.cT1QuestionList[1].choiceNumber}}" autocomplete="off" class="layui-input sjct" />
+                            <input type="text" name="singleChoiceNum"
+                                   value="{{$.isEmpty(d.cT1QuestionList[1].choiceNumber) && d.cT1QuestionList[1].choiceNumber != 0?'':d.cT1QuestionList[1].choiceNumber}}"
+                                   autocomplete="off" class="layui-input sjct"/>
                         </td>
                         <td>
-                            <input type="text" name="dx_fz" value="{{d.cT1QuestionList[1].questionScore || d.fzMap['dx_fz']}}" autocomplete="off" class="layui-input kgfz">
+                            <input type="text" name="dx_fz"
+                                   value="{{d.cT1QuestionList[1].questionScore || d.fzMap['dx_fz']}}" autocomplete="off"
+                                   class="layui-input kgfz">
                         </td>
-                        <td>{{d.cT1QuestionList[1].totalQuestionScore  || ''}}</td>
+                        <td>{{d.cT1QuestionList[1].totalQuestionScore || ''}}</td>
                     </tr>
                     <tr>
                         <td>多选题</td>
                         <td>{{d.cT1QuestionList[2].totalNumber}}</td>
                         <td>
-                            <input type="text" name="multipleChoiceNum" value="{{$.isEmpty(d.cT1QuestionList[2].choiceNumber) && d.cT1QuestionList[2].choiceNumber != 0?'':d.cT1QuestionList[2].choiceNumber}}" autocomplete="off" class="layui-input sjct" />
+                            <input type="text" name="multipleChoiceNum"
+                                   value="{{$.isEmpty(d.cT1QuestionList[2].choiceNumber) && d.cT1QuestionList[2].choiceNumber != 0?'':d.cT1QuestionList[2].choiceNumber}}"
+                                   autocomplete="off" class="layui-input sjct"/>
                         </td>
-                        <td><input type="text" name="dxx_fz" value="{{d.cT1QuestionList[2].questionScore  || d.fzMap['dxx_fz']}}" autocomplete="off" class="layui-input kgfz"></td>
-                        <td>{{d.cT1QuestionList[2].totalQuestionScore  || ''}}</td>
+                        <td><input type="text" name="dxx_fz"
+                                   value="{{d.cT1QuestionList[2].questionScore  || d.fzMap['dxx_fz']}}"
+                                   autocomplete="off" class="layui-input kgfz"></td>
+                        <td>{{d.cT1QuestionList[2].totalQuestionScore || ''}}</td>
                     </tr>
                     <tr>
                         <td>判断题</td>
                         <td>{{d.cT1QuestionList[3].totalNumber}}</td>
                         <td>
-                            <input type="text" name="judgeNum" value="{{$.isEmpty(d.cT1QuestionList[3].choiceNumber) && d.cT1QuestionList[3].choiceNumber != 0?'':d.cT1QuestionList[3].choiceNumber}}" autocomplete="off" class="layui-input sjct" />
+                            <input type="text" name="judgeNum"
+                                   value="{{$.isEmpty(d.cT1QuestionList[3].choiceNumber) && d.cT1QuestionList[3].choiceNumber != 0?'':d.cT1QuestionList[3].choiceNumber}}"
+                                   autocomplete="off" class="layui-input sjct"/>
                         </td>
-                        <td><input type="text" name="pd_fz" value="{{d.cT1QuestionList[3].questionScore|| d.fzMap['pd_fz']}}" autocomplete="off" class="layui-input kgfz"></td>
+                        <td><input type="text" name="pd_fz"
+                                   value="{{d.cT1QuestionList[3].questionScore|| d.fzMap['pd_fz']}}" autocomplete="off"
+                                   class="layui-input kgfz"></td>
                         <td>{{d.cT1QuestionList[3].totalQuestionScore || ''}}</td>
                     </tr>
                     <tr>
@@ -624,25 +791,35 @@
     </div>
 
     <div style="margin: 0 60px;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;">
-        <input name="ct2QuestionIds" type="hidden" value="{{d.ct2QuestionIds || ''}}" />
+        <input name="ct2QuestionIds" type="hidden" value="{{d.ct2QuestionIds || ''}}"/>
         <label class="layui-form-label">竞赛案例设置:</label>
         <div class="layui-row">
             <label class="layui-form-label">题库选择:</label>
             <div class="layui-input-block">
                 <button type="button" class="layui-btn bg_button jsal_select">选择</button>
-                <div style="margin-bottom: 0px !important;" class="layui-inline ${competition.competitionContestStartTime==''||competition.competitionContestStartTime==null?'renWu renWuON':'renWu'}">
+                <div style="margin-bottom: 0px !important;"
+                     class="layui-inline ${competition.competitionContestStartTime==''||competition.competitionContestStartTime==null?'renWu renWuON':'renWu'}">
                     <label class="layui-form-label">竞赛时间:</label>
                     <div class="layui-input-block">
                         <!--# var start_2 = simpleDateFormat(competition.competitionTaskSecondStartTime,'YMDHM');-->
                         <!--# var end_2 = simpleDateFormat(competition.competitionTaskSecondEndTime,'YMDHM');-->
                         {{# if($.isEmpty(d.timeInfo.competitionTaskSecondStartTime)){}}
-                            <input type="text" id="renwu2" autocomplete="off" value="${start_2} ${start_2 != null && end_2 != null?'至':''} ${end_2}" class="layui-input">
-                            <input type="hidden" name="competitionTaskSecondStartTime" value="${start_2}" autocomplete="off" class="layui-input">
-                            <input type="hidden" name="competitionTaskSecondEndTime" value="${end_2}" autocomplete="off" class="layui-input">
+                        <input type="text" id="renwu2" autocomplete="off"
+                               value="${start_2} ${start_2 != null && end_2 != null?'至':''} ${end_2}"
+                               class="layui-input">
+                        <input type="hidden" name="competitionTaskSecondStartTime" value="${start_2}" autocomplete="off"
+                               class="layui-input">
+                        <input type="hidden" name="competitionTaskSecondEndTime" value="${end_2}" autocomplete="off"
+                               class="layui-input">
                         {{# }else{}}
-                        <input type="text" id="renwu2" autocomplete="off" value="{{d.timeInfo.renwu2}}" class="layui-input">
-                        <input type="hidden" name="competitionTaskSecondStartTime" value="{{d.timeInfo.competitionTaskSecondStartTime}}" autocomplete="off" class="layui-input">
-                        <input type="hidden" name="competitionTaskSecondEndTime" value="{{d.timeInfo.competitionTaskSecondEndTime}}" autocomplete="off" class="layui-input">
+                        <input type="text" id="renwu2" autocomplete="off" value="{{d.timeInfo.renwu2}}"
+                               class="layui-input">
+                        <input type="hidden" name="competitionTaskSecondStartTime"
+                               value="{{d.timeInfo.competitionTaskSecondStartTime}}" autocomplete="off"
+                               class="layui-input">
+                        <input type="hidden" name="competitionTaskSecondEndTime"
+                               value="{{d.timeInfo.competitionTaskSecondEndTime}}" autocomplete="off"
+                               class="layui-input">
                         {{# }}}
                     </div>
                 </div>
@@ -669,19 +846,25 @@
                     </tr>
                     </thead>
                     <tbody>
-                    {{#  layui.each(d.cT2QuestionList, function(index, item){ }}
-                        <tr>
-                            <td>{{item.resourcesCompetitionName}}</td>
-                            <td>{{item.courseInfoName}}</td>
-                            <td>{{item.stepNumber || ''}}</td>
-                            <td><input type="text" ids="{{item.resourcesCompetitionId}}" value="{{item.stepScore || d.fzMap['jsfz_'+item.resourcesCompetitionId] || ''}}" autocomplete="off" class="layui-input jsfz"></td>
-                            <td>{{item.totalStepScore || ''}}</td>
-                            <td><a resourcesCompetitionId="{{item.resourcesCompetitionId}}" courseInfoId="{{item.courseInfoId}}" class="layui-btn bg_button layui-btn-sm jsyl">预览</a></td>
-                        </tr>
-                    {{#  }); }}
-                    {{#  if(d.cT2QuestionList.length === 0){ }}
-                    <tr><td colspan="6" class="t_c">暂无竞赛案例...</td></tr>
-                    {{#  } }}
+                    {{# layui.each(d.cT2QuestionList, function(index, item){ }}
+                    <tr>
+                        <td>{{item.resourcesCompetitionName}}</td>
+                        <td>{{item.courseInfoName}}</td>
+                        <td>{{item.stepNumber || ''}}</td>
+                        <td><input type="text" ids="{{item.resourcesCompetitionId}}"
+                                   value="{{item.stepScore || d.fzMap['jsfz_'+item.resourcesCompetitionId] || ''}}"
+                                   autocomplete="off" class="layui-input jsfz"></td>
+                        <td>{{item.totalStepScore || ''}}</td>
+                        <td><a resourcesCompetitionId="{{item.resourcesCompetitionId}}"
+                               courseInfoId="{{item.courseInfoId}}" class="layui-btn bg_button layui-btn-sm jsyl">预览</a>
+                        </td>
+                    </tr>
+                    {{# }); }}
+                    {{# if(d.cT2QuestionList.length === 0){ }}
+                    <tr>
+                        <td colspan="6" class="t_c">暂无竞赛案例...</td>
+                    </tr>
+                    {{# } }}
                     <tr>
                         <td colspan="6" style="padding-left: 50px;">
                             总分:<span class="jszf">{{d.ct2QuestionTotalScore}}</span>
@@ -698,92 +881,93 @@
 <script type="text/javascript" src="${ctxPath}/plugins/subjectTransfer.js?v=${jsVer}"></script>
 <script type="text/javascript" src="${ctxPath}/plugins/xm-select.js?v=${jsVer}"></script>
 <script>
-layui.use(['add'], function(){
-    var competitionAdd = layui.add;
-    competitionAdd.init();
-
-    $('#editCDSFrame').tableMergeCells(); //调用合并方法
-
-    //添加相应的行列
-    $("#editCompetitionDefenceScoreStandard").click(function (){
-        layer.open({
-            type: 1,
-            offset: 'auto',
-            title:'请输入需要添加的行数',
-            shadeClose:'true',
-            area: ['400px', '200px'],
-            scrollbar:'false',
-            btnAlign: 'c',
-            content: '<div style="padding: 20px 20px 0;"><div class="layui-form-item">' +
-                '    <label class="layui-form-label" style="width: 80px !important;">行数:</label>' +
-                '    <div class="layui-input-inline" style="width: 190px !important;">' +
-                '      <input type="text" id="rowNum" name="text" placeholder="请输入需要添加的行数" autocomplete="off" class="layui-input">' +
-                '    </div>' +
-                '  </div></div>',
-            btn: ['确定', '取消'],
-            yes: function(index,layero){
-                var htm = '<tr><td class="t_c"></td><td></td><td class="t_c"></td></tr>';
-                for (var i = 0;i < $("#rowNum").val();i++){
-                    $("#editCDSFrame table").append(htm);
-                }
-                $('#editCDSFrame').tableMergeCells(); //调用合并方法
-
-                $("#editCDSFrame tr td").unbind();
-                $("#editCDSFrame tr td").click(editTd);
-                layer.close(index);
-            }
-        });
-    });
+    layui.use(['add'], function () {
+        var competitionAdd = layui.add;
+        competitionAdd.init();
 
-    var htmlTable = $("#editCDSFrame .layui-input-block ").html();
-    //重新编辑汇报答辩评分标准
-    $("#againEdit").click(function (){
-        $("#editCDSFrame .layui-input-block ").html(htmlTable);
         $('#editCDSFrame').tableMergeCells(); //调用合并方法
-        $("#editCDSFrame tr td").unbind();
-        $("#editCDSFrame tr td").click(editTd);
-    });
 
-    //合并table td
-    $("#merge").click(function (){
-        layer.confirm('是否确定合并?',{title:'',shade: 0.01}, function (index) {
-            tableMerge();//合并
-            layer.close(index);
+        //添加相应的行列
+        $("#editCompetitionDefenceScoreStandard").click(function () {
+            layer.open({
+                type: 1,
+                offset: 'auto',
+                title: '请输入需要添加的行数',
+                shadeClose: 'true',
+                area: ['400px', '200px'],
+                scrollbar: 'false',
+                btnAlign: 'c',
+                content: '<div style="padding: 20px 20px 0;"><div class="layui-form-item">' +
+                    '    <label class="layui-form-label" style="width: 80px !important;">行数:</label>' +
+                    '    <div class="layui-input-inline" style="width: 190px !important;">' +
+                    '      <input type="text" id="rowNum" name="text" placeholder="请输入需要添加的行数" autocomplete="off" class="layui-input">' +
+                    '    </div>' +
+                    '  </div></div>',
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var htm = '<tr><td class="t_c"></td><td></td><td class="t_c"></td></tr>';
+                    for (var i = 0; i < $("#rowNum").val(); i++) {
+                        $("#editCDSFrame table").append(htm);
+                    }
+                    $('#editCDSFrame').tableMergeCells(); //调用合并方法
+
+                    $("#editCDSFrame tr td").unbind();
+                    $("#editCDSFrame tr td").click(editTd);
+                    layer.close(index);
+                }
+            });
+        });
+
+        var htmlTable = $("#editCDSFrame .layui-input-block ").html();
+        //重新编辑汇报答辩评分标准
+        $("#againEdit").click(function () {
+            $("#editCDSFrame .layui-input-block ").html(htmlTable);
+            $('#editCDSFrame').tableMergeCells(); //调用合并方法
+            $("#editCDSFrame tr td").unbind();
+            $("#editCDSFrame tr td").click(editTd);
         });
-    });
 
-    $("#editCDSFrame tr td").click(editTd);
-
-    function editTd(){
-        removeC();
-        var this_ = $(this);
-        layer.open({
-            type: 1,
-            offset: 'auto',
-            title:'',
-            shadeClose:'true',
-            area: ['500px', '200px'],
-            scrollbar:'false',
-            btnAlign: 'c',
-            content: '<div style="padding: 20px 20px 0;"><div class="layui-form-item">' +
-                '    <div class="layui-input-inline" style="width: 100% !important;">' +
-                '       <textarea id="rowValue" placeholder="请输入需要添加的行数" class="layui-textarea">'+this_.html()+'</textarea>'+
-                '    </div>' +
-                '  </div></div>',
-            btn: ['确定', '取消'],
-            yes: function(index,layero){
-                this_.html($("#rowValue").val());
+        //合并table td
+        $("#merge").click(function () {
+            layer.confirm('是否确定合并?', {title: '', shade: 0.01}, function (index) {
+                tableMerge();//合并
                 layer.close(index);
-            }
+            });
         });
-    }
+
+        $("#editCDSFrame tr td").click(editTd);
+
+        function editTd() {
+            removeC();
+            var this_ = $(this);
+            layer.open({
+                type: 1,
+                offset: 'auto',
+                title: '',
+                shadeClose: 'true',
+                area: ['500px', '200px'],
+                scrollbar: 'false',
+                btnAlign: 'c',
+                content: '<div style="padding: 20px 20px 0;"><div class="layui-form-item">' +
+                    '    <div class="layui-input-inline" style="width: 100% !important;">' +
+                    '       <textarea id="rowValue" placeholder="请输入需要添加的行数" class="layui-textarea">' + this_.html() + '</textarea>' +
+                    '    </div>' +
+                    '  </div></div>',
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    this_.html($("#rowValue").val());
+                    layer.close(index);
+                }
+            });
+        }
 
 
-});
+    });
 
-//textarea高度自适应
-function autoGrow (oField) {
-    oField.style.height = '60px';oField.style.height = oField.scrollHeight + "px";
-}
+    //textarea高度自适应
+    function autoGrow(oField) {
+        oField.style.height = '60px';
+        oField.style.height = oField.scrollHeight + "px";
+    }
 
 </script>