From 94fdd66cf236f1b5d6d74cf55ca6addc13d8e0a3 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:18:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E4=B8=BAnewcompetitions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 2 +- public/react/src/modules/competition/Registration.js | 4 ++-- .../modules/competition/personal/PersonalCompetititem.js | 4 ++-- .../competitions/Competitimain/CompetitionsIndex.js | 4 ++-- .../competitions/Competition_teams/Competitionteams.js | 4 ++-- .../competitions/Competitioncommon/CompetitionCommon.js | 6 +++--- .../Competitioncommon/CompetitionContentsChart.js | 2 +- public/react/src/modules/competitions/Competitions.js | 8 ++++---- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index e4cd6a732..5988d3532 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -486,7 +486,7 @@ class App extends Component { {/*/!*众包创新*!/*/} {/**/} {/*竞赛*/} - { diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js index aaf0891af..d931f4b8c 100644 --- a/public/react/src/modules/competition/Registration.js +++ b/public/react/src/modules/competition/Registration.js @@ -814,9 +814,9 @@ class Registration extends React.Component {
- 在线竞赛 + 在线竞赛 {competition_name === undefined || competition_name === null || competition_name === "" ? "全国高校计算机大赛" : competition_name} + to={`/newcompetitions/${this.props.match.params.identifier}/common_header`}>{competition_name === undefined || competition_name === null || competition_name === "" ? "全国高校计算机大赛" : competition_name} {/**/} 报名 diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js index fe709972c..0900f1e90 100644 --- a/public/react/src/modules/competition/personal/PersonalCompetititem.js +++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js @@ -304,7 +304,7 @@ class PersonalCompetititem extends React.Component { >
( - @@ -182,7 +182,7 @@ class CompetitionsIndex extends Component{ title={ {item.name}{item.sub_title===null?"":`——${item.sub_title}`} {/*{item.sub_title===null?"":*/} {/*{item.sub_title}}*/} diff --git a/public/react/src/modules/competitions/Competition_teams/Competitionteams.js b/public/react/src/modules/competitions/Competition_teams/Competitionteams.js index 5206476ef..6dd0de767 100644 --- a/public/react/src/modules/competitions/Competition_teams/Competitionteams.js +++ b/public/react/src/modules/competitions/Competition_teams/Competitionteams.js @@ -241,8 +241,8 @@ class Competitionteams extends Component{
- {data&&data.name} - 报名 + {data&&data.name} + 报名 战队详情 diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js index 8712ec907..75ce68d53 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js @@ -240,7 +240,7 @@ class CompetitionCommon extends Component{ data===undefined?"":
- 在线竞赛 + 在线竞赛 {data&&data.name} @@ -284,7 +284,7 @@ class CompetitionCommon extends Component{
{data.competition_status==="nearly_published"?"--":data&&data.visits_count}
-
this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}
+
this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}
@@ -317,7 +317,7 @@ class CompetitionCommon extends Component{ 报名截止 : data.competition_status==="progressing"?:""} {data&&data.enroll_end_time===null?"":`报名截止时间：${data&&data.enroll_end_time}`} diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js index 91f75c954..f892f01c3 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js @@ -68,7 +68,7 @@ class CompetitionContents extends Component{ const operations = const columns = [ diff --git a/public/react/src/modules/competitions/Competitions.js b/public/react/src/modules/competitions/Competitions.js index 2a9ab6990..4ec33b43b 100644 --- a/public/react/src/modules/competitions/Competitions.js +++ b/public/react/src/modules/competitions/Competitions.js @@ -53,7 +53,7 @@ class Competitions extends Component { {/*新版竞赛战队详情*/} - () } @@ -62,21 +62,21 @@ class Competitions extends Component { {/*新版竞赛报名*/} () } /> {/*新版竞赛详情页面*/} - () } > {/*新版竞赛首页*/} - () } From f76d30689e2ee9ff8ea9d70fb2d86f4bc20d4300 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Sat, 26 Oct 2019 19:21:08 +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 --- .../competitions/competitions_controller.rb | 2 +- app/helpers/export_helper.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/competitions/competitions_controller.rb b/app/controllers/competitions/competitions_controller.rb index 88f3a9a83..1059bfdac 100644 --- a/app/controllers/competitions/competitions_controller.rb +++ b/app/controllers/competitions/competitions_controller.rb @@ -176,7 +176,7 @@ class Competitions::CompetitionsController < Competitions::BaseController if personal row_cells_column << record_user.real_name row_cells_column << record_user.school_name - row_cells_column << record_user.student_id + row_cells_column << record_user.student_id.present? ? (record_user.student_id.to_s + "\t") : "--" else row_cells_column << record.name row_cells_column << record.teachers_name diff --git a/app/helpers/export_helper.rb b/app/helpers/export_helper.rb index 1274e07c7..36120266b 100644 --- a/app/helpers/export_helper.rb +++ b/app/helpers/export_helper.rb @@ -44,7 +44,7 @@ module ExportHelper w_2 = w_user&.login.present? ? w_user&.login : "--" w_3 = w_user&.real_name.present? ? w_user&.real_name : "--" w_3_1 = w_user&.mail.present? ? w_user.mail : "--" - w_4 = w_user.student_id.present? ? w_user.student_id : "--" + w_4 = w_user.student_id.present? ? (w_user.student_id.to_s + "\t") : "--" else w_2 = "--" w_3 = "--" @@ -132,7 +132,7 @@ module ExportHelper w_2 = w_user&.login.present? ? w_user&.login : "--" w_3 = w_user&.real_name.present? ? w_user&.real_name : "--" w_3_1 = w_user&.mail.present? ? w_user.mail : "--" - w_4 = w_user.student_id.present? ? w_user.student_id : "--" + w_4 = w_user.student_id.present? ? (w_user.student_id.to_s + "\t") : "--" course_name = course.students.find_by(user_id: w.user_id).try(:course_group_name) w_5 = course_name.present? ? course_name : "--" #0： 未提交， 1 按时提交， 2 延迟提交 @@ -217,7 +217,7 @@ module ExportHelper w_2 = w_user&.login.present? ? w_user&.login : "--" w_3 = w_user&.real_name.present? ? w_user&.real_name : "--" w_3_1 = w_user&.mail.present? ? w_user.mail : "--" - w_4 = w_user.student_id.present? ? w_user.student_id : "--" + w_4 = w_user.student_id.present? ? (w_user.student_id.to_s + "\t") : "--" w_5 = work.class_grouping_name if task_type_boolean #是否分组 w_6 = work.grouping_name @@ -311,7 +311,7 @@ module ExportHelper end user_start_time = e_user.start_at.present? ? e_user.start_at.strftime('%Y-%m-%d %H:%M') : "--" user_end_time = e_user.end_at.present? ? e_user.end_at.strftime('%Y-%m-%d %H:%M') : "--" - user_student_id = user_info.student_id.present? ? user_info.student_id : "--" + user_student_id = user_info.student_id.present? ? (user_info.student_id.to_s + "\t") : "--" user_login = user_info&.login.present? ? user_info.login : "--" user_real_name = user_info.real_name.present? ? user_info.real_name : "--" user_mail = user_info&.mail.present? ? user_info.mail : "--" @@ -373,7 +373,7 @@ module ExportHelper w_2 = user&.login.present? ? user&.login : "--" w_3 = user&.real_name.present? ? user&.real_name : "--" w_3_1 = user&.mail.present? ? user.mail : "--" - w_4 = user.student_id.present? ? user.student_id : "--" + w_4 = user.student_id.present? ? (user.student_id.to_s + "\t") : "--" w_5 = student&.course_group_name.present? ? student.course_group_name : "--" w_6 = topic.present? ? topic.name : "--" w_7 = topic.present? ? topic.teacher.full_name : "--" 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 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 | 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;