From d7c385ff201e4098b780ed04b56a194aa7aab084 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 19:23:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentsChart.js | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js index f892f01c3..fbcc17b6a 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js @@ -317,22 +317,22 @@ class CompetitionContents extends Component{ { ` .ant-table-tbody > tr > td:nth-last-child(4){ - line-height: 63px; - width: 300px; - height: 96px; - - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + line-height: 63px; + width: 300px; + height: 96px; + display: inline-flex; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .ant-table-tbody > tr > td:nth-last-child(3){ - line-height: 63px; - width: 300px; - height: 96px; - display: inline-block; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + line-height: 63px; + width: 313px; + height: 96px; + display: inline-block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .ant-table-tbody>tr>td, .ant-table-thead>tr>th { padding: 15px; From 0d6c0e3d2c708c3f087ad657b6d2992c4bce674f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 26 Oct 2019 19:23:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/competition/Registration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js index aaf0891af..3517236bf 100644 --- a/public/react/src/modules/competition/Registration.js +++ b/public/react/src/modules/competition/Registration.js @@ -219,7 +219,7 @@ class Registration extends React.Component { //管理员 try { this.setState({ - type: result.data.competition_teams.length === 0 ? 1 : 4, + type: 4, count: result.data.count, data: result.data.my_teams, competition_teams: result.data.competition_teams, From 65ce439c880190b3a69c73aaa1f9902f62646fe6 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 19:33:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionContentsChart.js | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js index fbcc17b6a..335b84a89 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js @@ -317,25 +317,26 @@ class CompetitionContents extends Component{ { ` .ant-table-tbody > tr > td:nth-last-child(4){ - line-height: 63px; - width: 300px; - height: 96px; - display: inline-flex; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + // line-height: 63px; + // width: 300px; + // height: 96px; + // // display: inline-flex; + // overflow: hidden; + // text-overflow: ellipsis; + // white-space: nowrap; + width: 150px; } .ant-table-tbody > tr > td:nth-last-child(3){ - line-height: 63px; - width: 313px; - height: 96px; - display: inline-block; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + // line-height: 63px; + // width: 290px; + // height: 96px; + // display: inline-block; + // overflow: hidden; + // text-overflow: ellipsis; + // white-space: nowrap; } .ant-table-tbody>tr>td, .ant-table-thead>tr>th { - padding: 15px; + padding: 5px; } ` }