From 2751e16dc19c3a53d93c3db547f794b6df83a065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 26 Oct 2019 16:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Competitimain/Competitionsindex.css | 1 + .../Competitioncommon/CompetitionCommon.css | 10 ++++++++-- .../Competitioncommon/CompetitionCommon.js | 13 +++++++++++++ .../Competitioncommon/CompetitionContentsChart.js | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css index aa4bd8d03..aa2c347f3 100644 --- a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css +++ b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css @@ -102,6 +102,7 @@ white-space: nowrap; display: inline-block; margin-right: 15px; + color:#000 !important; } .competitionsrelative{ diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css index c11d74e44..ff20efb97 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css @@ -56,7 +56,7 @@ } .teamsLayoucolor-orange { - color: #ff6800!important; + color: #ff6800 !important; font-size: 16px; } @@ -69,7 +69,7 @@ .CompetitionCommonbannerfont{ height:100%; - width: 365px; + width: 365px !important; line-height: 34px; } @@ -390,4 +390,10 @@ .textright{ text-align: right; +} + +.userranksclass{ + text-align: left; + width: 15%; + padding-left: 31px; } \ 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 0f935605e..e82cb52d7 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js @@ -218,6 +218,19 @@ class CompetitionCommon extends Component{ this.setState({ tabkey:key }) + let url=`/competitions/${this.props.match.params.identifier}/charts.json`; + axios.get(url,{params:{ + stage_id:key===0||key===null?undefined:key + }}).then((response) => { + if(response.status===200){ + this.setState({ + chartdata:response.data + }) + } + }).catch((error) => { + console.log(error) + }) + } render() { diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js index c78810b59..1a214f85f 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js @@ -264,7 +264,7 @@ class CompetitionContents extends Component{