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 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 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)=>{