From fab732bf30985a0f78cf5a8e329c27ffea0c15ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 12 Nov 2019 13:07:29 +0800 Subject: [PATCH 1/2] =?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 | 10 ++++++++-- .../poll/pollPublicBtn/ImmediatelyPublish.js | 16 ++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js index 3a3d305b3..c134d3e70 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js @@ -321,6 +321,10 @@ class CompetitionContents extends Component{ width: 14%; text-align: right; } + .col11{ + width: 11%; + text-align: right; + } .col10{ width: 10%; } @@ -349,9 +353,11 @@ class CompetitionContents extends Component{ : {this.props&&this.props.mode===1?item.cost_time:""} } - + {item.cost_time=== "--"? {item.score<50?"< 50 分":item.score} - + : + {item.score<50?"< 50 分":item.score} + } ) })} diff --git a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js index e919c4030..f10474fdf 100644 --- a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js +++ b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js @@ -61,9 +61,9 @@ class Immediatelypublish extends Component{ modalname:"立即发布", modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1, OneSelftype:true, - Topval:"学生将立即收到问卷", + Topval:this.props.Exercisetype==="exercise"?"学生将立即收到试卷":"学生将立即收到问卷", // Botvalleft:"暂不发布", - Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`, + Botval:this.props.single ? "":this.props.Exercisetype==="exercise"?`本操作只对"未发布"的试卷有效`:`本操作只对"未发布"的问卷有效`, starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttimes:this.props.getNowFormatDates(1), endtime:"截止时间："+this.props.getNowFormatDates(2), @@ -88,9 +88,9 @@ class Immediatelypublish extends Component{ modalname:"立即发布", modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1, OneSelftype:true, - Topval:"学生将立即收到问卷", + Topval:this.props.Exercisetype==="exercise"?"学生将立即收到试卷":"学生将立即收到问卷", // Botvalleft:"暂不发布", - Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`, + Botval:this.props.single ? "":this.props.Exercisetype==="exercise"?`本操作只对"未发布"的试卷有效`:`本操作只对"未发布"的问卷有效`, starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttimes:this.props.getNowFormatDates(1), endtime:"截止时间："+this.props.getNowFormatDates(2), @@ -143,9 +143,9 @@ class Immediatelypublish extends Component{ modalname:"立即发布", modaltype:response.data.un_publish > 0 ? 1 : 2, visible:true, - Topval:"学生将立即收到问卷", + Topval:this.props.Exercisetype==="exercise"?"学生将立即收到试卷":"学生将立即收到问卷", // Botvalleft:"暂不发布", - Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`, + Botval:this.props.single ? "":this.props.Exercisetype==="exercise"?`本操作只对"未发布"的试卷有效`:`本操作只对"未发布"的问卷有效`, starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttimes:this.props.getNowFormatDates(1), endtime:"截止时间："+this.props.getNowFormatDates(2), @@ -183,9 +183,9 @@ class Immediatelypublish extends Component{ modalname:"立即发布", modaltype:response.data.un_publish > 0 ? 1 : 2, visible:true, - Topval:"学生将立即收到问卷", + Topval:this.props.Exercisetype==="exercise"?"学生将立即收到试卷":"学生将立即收到问卷", // Botvalleft:"暂不发布", - Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`, + Botval:this.props.single ? "":this.props.Exercisetype==="exercise"?`本操作只对"未发布"的试卷有效`:`本操作只对"未发布"的问卷有效`, starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttimes:this.props.getNowFormatDates(1), endtime:"截止时间："+this.props.getNowFormatDates(2), From 5477b3939e761ac11b7836344f6c22f15ffea231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 12 Nov 2019 13:10:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js index be5df8bd9..00cb1783a 100644 --- a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js +++ b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js @@ -70,9 +70,9 @@ class ImmediatelyEnd extends Component{ modalname:"立即截止", modaltype:response.data.on_commiting > 0 ? 1 : 2, visible:true, - Topval:"学生将不能再提交问卷", + Topval:this.props.Exercisetype==="exercise"?"学生将不能再提交试卷":"学生将不能再提交问卷", // Botvalleft:"暂不截止", - Botval:this.props.single ?`本操作只对"提交中"的问卷有效`:"", + Botval:this.props.single ?this.props.Exercisetype==="exercise"?`本操作只对"提交中"的试卷有效`:`本操作只对"提交中"的问卷有效`:"", // starttime:"发布时间："+getNowFormatDate(1), // endtime:"截止时间："+getNowFormatDate(2), Cancelname:"暂不截止", @@ -112,9 +112,9 @@ class ImmediatelyEnd extends Component{ modalname:"立即截止", modaltype:response.data.on_commiting > 0 ? 1 : 2, visible:true, - Topval:"学生将不能再提交问卷", + Topval:this.props.Exercisetype==="exercise"?"学生将不能再提交试卷":"学生将不能再提交问卷", // Botvalleft:"暂不截止", - Botval:this.props.single ?`本操作只对"提交中"的问卷有效`:"", + Botval:this.props.single ?this.props.Exercisetype==="exercise"?`本操作只对"提交中"的试卷有效`:`本操作只对"提交中"的问卷有效`:"", // starttime:"发布时间："+getNowFormatDate(1), // endtime:"截止时间："+getNowFormatDate(2), Cancelname:"暂不截止",