diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Competition.java b/web/src/main/java/com/ibeetl/jlw/entity/Competition.java index e4873bea..4d4b18fe 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Competition.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Competition.java @@ -167,7 +167,10 @@ public class Competition extends BaseEntity{ private String competitionFreetrialStartTime; //试玩阶段结束时间 private String competitionFreetrialEndTime; - + private String sign; + private String competitionSystemSchedule; + private String tradingRules; + public Competition(){ } @@ -607,4 +610,28 @@ public class Competition extends BaseEntity{ public void setCompetitionFreetrialEndTime(String competitionFreetrialEndTime) { this.competitionFreetrialEndTime = competitionFreetrialEndTime; } + + public String getSign() { + return sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public String getCompetitionSystemSchedule() { + return competitionSystemSchedule; + } + + public void setCompetitionSystemSchedule(String competitionSystemSchedule) { + this.competitionSystemSchedule = competitionSystemSchedule; + } + + public String getTradingRules() { + return tradingRules; + } + + public void setTradingRules(String tradingRules) { + this.tradingRules = tradingRules; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java index 4e670579..b0f213ca 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java @@ -95,6 +95,12 @@ public class CompetitionQuery extends PageParam { private String competitionFreetrialStartTime; @Query(name = "试玩阶段结束时间", display = false) private String competitionFreetrialEndTime; + @Query(name = "大赛类别", display = false) + private String sign; + @Query(name = "赛制赛程", display = false) + private String competitionSystemSchedule; + @Query(name = "交易规则", display = false) + private String tradingRules; private String competitionStudentsJson; //参赛学员json private String competitionNewsJson; //大赛动态json @@ -351,6 +357,9 @@ public class CompetitionQuery extends PageParam { pojo.setCompetitionHyperlinkUrl3(this.getCompetitionHyperlinkUrl3()); pojo.setCompetitionFreetrialStartTime(this.getCompetitionFreetrialStartTime()); pojo.setCompetitionFreetrialEndTime(this.getCompetitionFreetrialEndTime()); + pojo.setSign(this.getSign()); + pojo.setCompetitionSystemSchedule(this.getCompetitionSystemSchedule()); + pojo.setTradingRules(this.getTradingRules()); return pojo; } @@ -586,4 +595,28 @@ public class CompetitionQuery extends PageParam { public void setCompetitionFreetrialEndTime(String competitionFreetrialEndTime) { this.competitionFreetrialEndTime = competitionFreetrialEndTime; } + + public String getSign() { + return sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public String getCompetitionSystemSchedule() { + return competitionSystemSchedule; + } + + public void setCompetitionSystemSchedule(String competitionSystemSchedule) { + this.competitionSystemSchedule = competitionSystemSchedule; + } + + public String getTradingRules() { + return tradingRules; + } + + public void setTradingRules(String tradingRules) { + this.tradingRules = tradingRules; + } } diff --git a/web/src/main/resources/sql/jlw/competition.md b/web/src/main/resources/sql/jlw/competition.md index 55bee684..9e873d9b 100644 --- a/web/src/main/resources/sql/jlw/competition.md +++ b/web/src/main/resources/sql/jlw/competition.md @@ -44,6 +44,7 @@ queryByCondition c.competition_hyperlink_url3, c.competition_freetrial_start_time, c.competition_freetrial_end_time, + c.sign,c.competition_system_schedule,c.trading_rules, @if(showCompetitionGeneralization == 1){ c.competition_generalization, @} @@ -254,7 +255,7 @@ queryByCondition2Student c.competition_carousel_image3, c.competition_hyperlink_url3, c.competition_freetrial_start_time, - c.competition_freetrial_end_time, + c.competition_freetrial_end_time,c.sign,c.competition_system_schedule,c.trading_rules, @if(showCompetitionGeneralization == 1){ c.competition_generalization, @} @@ -478,7 +479,7 @@ getCompetitionValues c.competition_carousel_image3, c.competition_hyperlink_url3, c.competition_freetrial_start_time, - c.competition_freetrial_end_time, + c.competition_freetrial_end_time,c.sign,c.competition_system_schedule,c.trading_rules, (SELECT COUNT(*) FROM competition_students WHERE competition_id = c.competition_id) competition_student_number, CASE WHEN c.competition_type = 2 THEN (SELECT COUNT(*) FROM competition_students WHERE competition_id = c.competition_id AND is_captain = 1) ELSE NULL END competition_team_number, -- 1报名未开始 2报名中 3报名结束或大赛未开始 4大赛开始或任务一未开始 5任务一进行中 6任务一结束或任务二未开始 7任务二进行中 8任务二结束或任务三未开始 9任务三进行中 10任务三结束 11大赛结束 @@ -734,7 +735,7 @@ getValuesByQuery c.competition_carousel_image3, c.competition_hyperlink_url3, c.competition_freetrial_start_time, - c.competition_freetrial_end_time, + c.competition_freetrial_end_time,c.sign,c.competition_system_schedule,c.trading_rules, (SELECT group_concat(teacher_name ORDER BY find_in_set(teacher_id,c.competition_judge_ids)) FROM teacher where find_in_set(teacher_id,c.competition_judge_ids)) teacher_names, c.competition_weight, c.org_id, 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 cd90a553..be6dda96 100644 --- a/web/src/main/resources/static/js/jlw/competition/add.js +++ b/web/src/main/resources/static/js/jlw/competition/add.js @@ -41,6 +41,36 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t $("input[name='competitionLogo']").val(res.data.src); } }); + //轮播图1 + upload.render({ + elem: '#test12' + , 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); + $("input[name='competitionCarouselImage1']").val(res.data.src); + } + }); + //轮播图2 + upload.render({ + elem: '#test13' + , 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); + $("input[name='competitionCarouselImage2']").val(res.data.src); + } + }); + //轮播图3 + upload.render({ + elem: '#test14' + , 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); + $("input[name='competitionCarouselImage3']").val(res.data.src); + } + }); //上传大赛动态图片 upload.render({ @@ -58,14 +88,25 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t elem: '#enrollRange' ,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]); - }else { - $("#addForm input[name='competitionEnrollStartTime']").val(""); - $("#addForm input[name='competitionEnrollEndTime']").val(""); + } + } + }); + laydate.render({ + elem: '#enrollRange2' + ,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]); } } }); @@ -225,14 +266,18 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t $(".syb").hide(); $(".xyb").show(); $(".sbx").show(); - }else if(sign == 1 || sign == 2 || sign == 3 || sign == 4 || sign == 5){ + }else if(sign == 1 || sign == 2 || sign == 3 || sign == 4 + || sign == 6 + || sign == 7 + || sign == 8 + || sign == 5 ){ $(".syb").show(); $(".xyb").show(); $(".sbx").show(); - if(sign == 2){ + if(sign == 3){ loadDSRW(); } - if(sign == 5 && $.isEmpty(editor2)){ + 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){ @@ -243,7 +288,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t } editor2 = Lib.editorMd("competitionAwardList"); } - if(sign == 4 && $.isEmpty(editor4)){ + 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){ @@ -254,7 +299,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t } editor4 = Lib.editorMd("competitionCommonProblem"); } - }else if(sign == 6){ + }else if(sign == 8){ $(".syb").show(); $(".xyb").hide(); $(".sbx").show(); @@ -1674,13 +1719,16 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t 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() + } - if(i === 0){//大赛概况 + console.log(i) + if(i === '0'){//大赛概况 var competitionName = $("input[name='competitionName']").val(); // if($.isEmpty(competitionName)){ // layer.msg("请填写大赛名称！", { @@ -1720,34 +1768,57 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t // } var competitionLogo = $("input[name='competitionLogo']").val(); var competitionFinalsLimit = $("input[name='competitionFinalsLimit']").val(); - var competitionGeneralization = editor1.getPreviewedHTML();//大赛概况 html - var competitionGeneralizationOriginal = Lib.repLaceString(editor1.getMarkdown());//大赛概况 Markdown 源码 + var competitionTechnicalName = $("textarea[name='competitionTechnicalName']").val(); + // var competitionGeneralization = editor1.getPreviewedHTML();//大赛概况 html + // var competitionGeneralizationOriginal = Lib.repLaceString(editor1.getMarkdown());//大赛概况 Markdown 源码 + param.competitionTechnicalName = competitionTechnicalName; param.competitionName = competitionName; param.competitionType = competitionType; param.competitionSponsorName = competitionSponsorName; param.competitionTeamLimit = competitionType == 2?competitionTeamLimit_1 + "-" +competitionTeamLimit_2:''; param.competitionLogo = competitionLogo; param.competitionFinalsLimit = competitionFinalsLimit; - param.competitionGeneralization = competitionGeneralization; - param.competitionGeneralizationOriginal = competitionGeneralizationOriginal; - }else if( i === 1){//竞赛时间 + // param.competitionGeneralization = competitionGeneralization; + // param.competitionGeneralizationOriginal = competitionGeneralizationOriginal; var competitionEnrollStartTime = $("input[name='competitionEnrollStartTime']").val(); var competitionEnrollEndTime = $("input[name='competitionEnrollEndTime']").val(); + param.competitionEnrollStartTime = competitionEnrollStartTime; + param.competitionEnrollEndTime = competitionEnrollEndTime; + + var competitionFreetrialStartTime = $("input[name='competitionFreetrialStartTime']").val(); + var competitionFreetrialEndTime = $("input[name='competitionFreetrialEndTime']").val(); + param.competitionFreetrialStartTime = competitionFreetrialStartTime; + param.competitionFreetrialEndTime = competitionFreetrialEndTime; + + var competitionCarouselImage1 = $("input[name='competitionCarouselImage1']").val(); + var competitionHyperlinkUrl1 = $("input[name='competitionHyperlinkUrl1']").val(); + var competitionCarouselImage2 = $("input[name='competitionCarouselImage2']").val(); + var competitionHyperlinkUrl2 = $("input[name='competitionHyperlinkUrl2']").val(); + var competitionCarouselImage3 = $("input[name='competitionCarouselImage3']").val(); + var competitionHyperlinkUrl3 = $("input[name='competitionHyperlinkUrl3']").val(); + param.competitionCarouselImage1 = competitionCarouselImage1; + param.competitionHyperlinkUrl1 = competitionHyperlinkUrl1; + param.competitionCarouselImage2 = competitionCarouselImage2; + param.competitionHyperlinkUrl2 = competitionHyperlinkUrl2; + param.competitionCarouselImage3 = competitionCarouselImage3; + param.competitionHyperlinkUrl3 = competitionHyperlinkUrl3; + + }else if( i === '1'){//竞赛时间 + var competitionContestStartTime = $("input[name='competitionContestStartTime']").val(); var competitionContestEndTime = $("input[name='competitionContestEndTime']").val(); var competitionTaskThreeStartTime = $("input[name='competitionTaskThreeStartTime']").val(); var competitionTaskThreeEndTime = $("input[name='competitionTaskThreeEndTime']").val(); - param.competitionEnrollStartTime = competitionEnrollStartTime; - param.competitionEnrollEndTime = competitionEnrollEndTime; + param.competitionContestStartTime = competitionContestStartTime; param.competitionContestEndTime = competitionContestEndTime; 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();//大赛任务一 单选题分值 @@ -1771,7 +1842,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t } }); 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();//汇报答辩 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 8e8ab9d6..70c679ca 100644 --- a/web/src/main/resources/static/js/jlw/competition/index.js +++ b/web/src/main/resources/static/js/jlw/competition/index.js @@ -39,6 +39,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { { field : 'competitionType', width : 100, title : '大赛类型',align:"center",templet:function (d){ + return d.sign == 1?"金融大数据大赛":"金融模拟交易"; + } + },{ + field : 'competitionType', width : 100, + title : '大赛模式',align:"center",templet:function (d){ return d.competitionType == 1?"个人赛":d.competitionType == 2?"团队赛":"-"; } }, @@ -108,7 +113,14 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }, initTableTool: table.on('tool(competitionTable)', function (obj) { var data = obj.data; if (obj.event === 'edit') { - openF("edit",data); + 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,"大赛管理/编辑金融大数据大赛"); + }else { + Common.openDlg(url,"大赛管理/编辑金融模拟交易大赛"); + } + }else if(obj.event === "del"){ layer.confirm('是否确定删除该大赛？', function (index) { var ret = Common.postAjax("/jlw/competition/delete.json", {ids: data.competitionId}); @@ -182,18 +194,18 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { if(f == "add"){ if(type == '1'||type == 1){ var url = "/jlw/competition/add.do?"+"sign=1"; - Common.openDlg(url,"大赛管理/新增大赛"); + Common.openDlg(url,"大赛管理/新增金融大数据大赛"); }else { var url = "/jlw/competition/add.do?"+"sign=2"; - Common.openDlg(url,"大赛管理/新增大赛"); + Common.openDlg(url,"大赛管理/新增金融模拟交易大赛"); } }else if(f == "edit"){ if(type == '1'||type == 1){ var url = "/jlw/competition/add.do?competitionId="+data.competitionId+"&sign=1"; - Common.openDlg(url,"大赛管理/编辑大赛"); + Common.openDlg(url,"大赛管理/编辑金融大数据大赛"); }else { var url = "/jlw/competition/add.do?competitionId="+data.competitionId+"&sign=2"; - Common.openDlg(url,"大赛管理/编辑大赛"); + Common.openDlg(url,"大赛管理/编辑金融模拟交易大赛"); } } layer.close(index); diff --git a/web/src/main/resources/templates/jlw/competition/add.html b/web/src/main/resources/templates/jlw/competition/add.html index fe0652e2..9d11093c 100644 --- a/web/src/main/resources/templates/jlw/competition/add.html +++ b/web/src/main/resources/templates/jlw/competition/add.html @@ -77,16 +77,14 @@ +
- +
@@ -145,7 +143,33 @@
- + +
+ +
+
+
+ +
+ + + + + +
+
+
+ +
+ 前 + + 名进入决赛（允许并列） +
+
+
+
+
+
@@ -160,42 +184,94 @@
像素大小：180*80
+
+ +
+ + + + + +
+
+
+
- -
- 前 - - 名进入决赛（允许并列） + +
+ +
+ + +

点击上传图片

+ +
+ 大赛LOGO +
+
+
像素大小：180*80
+
+
+
+ +
+
+
-
- +
+
-
- - + +
+ + +

点击上传图片

+ +
+ 大赛LOGO +
+
像素大小：180*80
+
+
+
+ +
+
-
- -
- +
- - - - - + +
+ + +

点击上传图片

+ +
+ 大赛LOGO +
+
+
像素大小：180*80
+
+
+
+ +
+
+ +
+ +
@@ -223,12 +299,15 @@
- + +
+
+
- -
+ +
@@ -307,7 +386,10 @@
- + +
+
+
@@ -332,32 +414,7 @@
- -
-
-
-
- -
-
- - -
-
-
-
-
-
- -
- -
-
-
-
-
- +
@@ -396,25 +453,25 @@
    -
  • - -
    - -

    ${competitionNewsAddTime}

    -
    - - - - - -
    -
    - ${item.competitionNewsContent} -
    +
  • + +
    + +

    ${competitionNewsAddTime}

    +
    + + + + + +
    +
    + ${item.competitionNewsContent}
    -
    • +
+
  • @@ -430,6 +487,44 @@
    • + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +