From 5bc73a0eeee57b5ba2a4b20624920d387a08aa0d Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 25 Oct 2019 17:20:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98-=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/competition_settings/index.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/admins/competition_settings/index.html.erb b/app/views/admins/competition_settings/index.html.erb index f2ed61622..2509dea13 100644 --- a/app/views/admins/competition_settings/index.html.erb +++ b/app/views/admins/competition_settings/index.html.erb @@ -486,4 +486,5 @@ +
<% end %> \ No newline at end of file From b4eb27336750a792369fcfbdbee32141d56c312c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 25 Oct 2019 17:23:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/educoder/competitions/trophy.png | Bin 5030 -> 2278 bytes .../Competitioncommon/CompetitionCommon.css | 11 ++++++++++- .../Competitioncommon/CompetitionCommon.js | 2 +- .../Competitioncommon/CompetitionContents.js | 2 +- .../CompetitionContentsChart.js | 10 +++++----- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/public/images/educoder/competitions/trophy.png b/public/images/educoder/competitions/trophy.png index e07fb3d94f325d42ced14bc7fb75e2908eed5295..7b129cfae1ac16d92370841dcb49650cc09039f2 100644 GIT binary patch literal 2278 zcmVcytmZ!}dxQ&TsC?5kuvVK!wyp@l4OLFn*A}``rY) zm9UevWL`V}(c0|^i@^}xx=ZA!1b}8mWc(Uc`wMc?=8(#AHa2}yfcaixA7exUFquP> zDE9c82mU1C(3x)>7rd!i-boO``a$=X$2DzMNZICOvHSlzT4AFDr@~l{0ZXE*KzxE^ zx;^#DujGvB@@32yv;9F0aRSkulz6kwAy*2VEVf=9KFw9=D~3hbY`x*--%HDJ%mi3` zf?L;NcO8gsocaL5hP#)e;sH^`B(|*8ZY&c}Ap?^vS?z<>do8A&@PTkxZlTGLPCeb+l3%=-E8lP82wI`D&yzFs_$(Qf_Gg1!w}(#s$1N9 zoeEkby)H2j?=~~tk4o>z4&ZA8d+WoHD7r5^77prx6{boc$+?XPKr@-VqQzQ;Rv9~= z32<%tYXCow$K{ZF?Qok98aD*f=t}N1?tQ*@LfRJE5s$Z^@CE$`UqLJdM~Tc!EAa-K z %04f?7)Ux{xOiSx^-!9x|MdS2(9zV#muc99{SR`h8two9 diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css index fb23f3b22..23dfe3895 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css @@ -344,8 +344,17 @@ } .CompetitionContents{ - background: #fff; + background: #fff !important; padding: 40px; box-shadow: 3px 2px 12px 2px rgba(0,0,0,0.05); border: 1px solid rgba(239,239,239,1); +} + +.rankbeicenter{ + text-align: center; +} +.rankbei{ + font-size: 16px; + color: rgba(119,119,119,1); + } \ No newline at end of file diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js index 61f99d921..119a84a1a 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js @@ -325,7 +325,7 @@ class CompetitionCommon extends Component{ - + {this.state.module_type==="chart"?Competitionedittype===false? this.props.Competitionedit()}> 编辑 :"":""} - +diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js index 05479c1b3..17baca3d6 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js @@ -98,11 +98,11 @@ class CompetitionContents extends Component{ {chart_rules.rule_contents.map((items,keys)=>{ if(item.id===items.competition_stage_id){ return( - + ) }else if(item.id===null&&items.competition_stage_id===0){ return( - + ) } })} @@ -113,10 +113,10 @@ class CompetitionContents extends Component{ 总排名 - + {chartdata===undefined?"":chartdata.teams.length===0? -
要抓住一切机会,向所有人证明你自己,证明你能够迎接荣耀- +要抓住一切机会,向所有人证明你自己,证明你能够迎接荣耀+ :""}{chartdata===undefined?"":chartdata.teams.length===0?"":chartdata.teams.map((item,key)=>{