diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css index 7603137e0..4283415d7 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css @@ -403,4 +403,10 @@ .cursorpointer{ cursor: pointer; +} + +.rankfonttop{ + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap } \ No newline at end of file diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js index e0b360c97..235cfbb43 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js @@ -117,7 +117,20 @@ class CompetitionContents extends Component{ const datas = []; let {chart_rules, chartdata, data} = this.props; let {personal}=this.state; - chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<3?"":chartdata.teams.map((item,key)=>{ + + if(this.props&&this.props.mode!=1){ + + columns.some((item,key)=> { + if (item.title === "spendtime") { + columns.splice(key, 1) + return true + } + } + ) + + } + + {chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<3?"":chartdata.teams.map((item,key)=>{ if(key>2){ let list={ @@ -131,11 +144,11 @@ class CompetitionContents extends Component{ } datas.push(list) } - }) + })} + console.log(this.props&&this.props.mode) + console.log(columns) - // - //console.log(chartdata&&chartdata.teams) return (
{chart_rules === undefined ? "" : @@ -191,8 +204,8 @@ class CompetitionContents extends Component{ > -
{item.school_name}
-
{item.spend_time}
+
{item.school_name}
+ {this.props&&this.props.mode===1?
{item.spend_time}
:""}
} description={
{item.score}分
@@ -227,8 +240,8 @@ class CompetitionContents extends Component{ > -
{item.school_name}
-
{item.spend_time}
+
{item.school_name}
+ {this.props&&this.props.mode===1?
{item.spend_time}
:""} } description={
{item.score}分
@@ -263,8 +276,8 @@ class CompetitionContents extends Component{ > -
{item.school_name}
-
{item.spend_time}
+
{item.school_name}
+ {this.props&&this.props.mode===1?
{item.spend_time}
:""} } description={
{item.score}分
@@ -306,7 +319,7 @@ class CompetitionContents extends Component{ {/*{item.team_name}*/} - {item.cost_time} + {this.props&&this.props.mode===1?item.cost_time:""} {item.score}