diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js index 4ccd8fb6f..b2ac34fe1 100755 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js @@ -468,7 +468,17 @@ class CompetitionCommon extends Component{ - + this.getrightdata(item.id,item.module_type)}*/} {/*>{item.name}}*/} - {item.name} + {item.name} ) } diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js index 4a0696877..143a9c80a 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js @@ -137,7 +137,7 @@ class CompetitionContents extends Component{ username:personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name, school:item.school_name, spendtime:item.spend_time, - score:item.score, + score:item.score<50?"< 50 分":item.score, user_login:item.user_login } datas.push(list) @@ -148,6 +148,16 @@ class CompetitionContents extends Component{ return (
+ {chart_rules === undefined ? "" : this.props.Competitioncallback(e)} activeKey={this.props.tabkey} tabBarExtraContent={data && data.permission.editable === true ? this.props.Competitionedittype === false ? this.props.has_url === false ? operations : "" : "" : ""}> @@ -205,7 +215,7 @@ class CompetitionContents extends Component{ {this.props&&this.props.mode===1?
{item.spend_time}
:""}
} description={ -
{item.score}分
+
{item.score<50?"< 50 分":item.score}分
} /> @@ -241,7 +251,7 @@ class CompetitionContents extends Component{ {this.props&&this.props.mode===1?
{item.spend_time}
:""} } description={ -
{item.score}分
+
{item.score<50?"< 50 分":item.score}分
} /> @@ -277,7 +287,7 @@ class CompetitionContents extends Component{ {this.props&&this.props.mode===1?
{item.spend_time}
:""} } description={ -
{item.score}分
+
{item.score<50?"< 50 分":item.score}分
} /> @@ -298,6 +308,18 @@ class CompetitionContents extends Component{ .ant-col-9 { width: 35.5%; } + .col13{ + width:13%; + text-align:left; + } + .col24{ + width: 24%; + text-align: left; + padding-left: 16px; + } + .col15{ + width: 15%; + } ` } @@ -306,10 +328,10 @@ class CompetitionContents extends Component{ return( - + 您当前排名:{item.rank} - + {personal===undefined||personal===null?item.record_user_name:personal===true?item.user_name:item.team_name} @@ -318,8 +340,8 @@ class CompetitionContents extends Component{ {this.props&&this.props.mode===1?item.cost_time:""} - - {item.score} + + {item.score<50?"< 50 分":item.score} )