m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

Browse Source
dev_home
杨树林 5 years ago
parent 36ec87bbfe 5477b3939e
commit 9056032ede
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File

10
public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
Unescape View File

@ -321,6 +321,10 @@ class CompetitionContents extends Component{
width: 14%; width: 14%;
text-align: right; text-align: right;
} }
.col11{
width: 11%;
text-align: right;
}
.col10{ .col10{
width: 10%; width: 10%;
} }
@ -349,9 +353,11 @@ class CompetitionContents extends Component{
</Col>:<Col span={3} order={4} className={"col10"}> </Col>:<Col span={3} order={4} className={"col10"}>
{this.props&&this.props.mode===1?item.cost_time:""} {this.props&&this.props.mode===1?item.cost_time:""}
</Col>} </Col>}
<Col className="textright" span={3} order={5} className={"col15"}> {item.cost_time=== "--"?<Col className="textright" span={3} order={5} className={"col15"}>
<span className={"ranknameslast"}>{item.score<50?"< 50 分":item.score}</span> <span className={"ranknameslast"}>{item.score<50?"< 50 分":item.score}</span>
</Col> </Col>:<Col className="textright" span={3} order={5} className={"col11"}>
<span className={"ranknameslast"}>{item.score<50?"< 50 分":item.score}</span>
</Col>}
</Row> </Row>
) )
})} })}

8
public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js
Unescape View File

@ -70,9 +70,9 @@ class ImmediatelyEnd extends Component{
modalname:"立即截止", modalname:"立即截止",
modaltype:response.data.on_commiting > 0 ? 1 : 2, modaltype:response.data.on_commiting > 0 ? 1 : 2,
visible:true, visible:true,
Topval:"学生将不能再提交问卷", Topval:this.props.Exercisetype==="exercise"?"学生将不能再提交试卷":"学生将不能再提交问卷",
// Botvalleft:"暂不截止", // Botvalleft:"暂不截止",
Botval:this.props.single ?`本操作只对"提交中"的问卷有效`:"", Botval:this.props.single ?this.props.Exercisetype==="exercise"?`本操作只对"提交中"的试卷有效`:`本操作只对"提交中"的问卷有效`:"",
// starttime:"发布时间："+getNowFormatDate(1), // starttime:"发布时间："+getNowFormatDate(1),
// endtime:"截止时间："+getNowFormatDate(2), // endtime:"截止时间："+getNowFormatDate(2),
Cancelname:"暂不截止", Cancelname:"暂不截止",
@ -112,9 +112,9 @@ class ImmediatelyEnd extends Component{
modalname:"立即截止", modalname:"立即截止",
modaltype:response.data.on_commiting > 0 ? 1 : 2, modaltype:response.data.on_commiting > 0 ? 1 : 2,
visible:true, visible:true,
Topval:"学生将不能再提交问卷", Topval:this.props.Exercisetype==="exercise"?"学生将不能再提交试卷":"学生将不能再提交问卷",
// Botvalleft:"暂不截止", // Botvalleft:"暂不截止",
Botval:this.props.single ?`本操作只对"提交中"的问卷有效`:"", Botval:this.props.single ?this.props.Exercisetype==="exercise"?`本操作只对"提交中"的试卷有效`:`本操作只对"提交中"的问卷有效`:"",
// starttime:"发布时间："+getNowFormatDate(1), // starttime:"发布时间："+getNowFormatDate(1),
// endtime:"截止时间："+getNowFormatDate(2), // endtime:"截止时间："+getNowFormatDate(2),
Cancelname:"暂不截止", Cancelname:"暂不截止",

16
public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
Unescape View File

@ -61,9 +61,9 @@ class Immediatelypublish extends Component{
modalname:"立即发布", modalname:"立即发布",
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1, modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
OneSelftype:true, OneSelftype:true,
Topval:"学生将立即收到问卷", Topval:this.props.Exercisetype==="exercise"?"学生将立即收到试卷":"学生将立即收到问卷",
// Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`, Botval:this.props.single ? "":this.props.Exercisetype==="exercise"?`本操作只对"未发布"的试卷有效`:`本操作只对"未发布"的问卷有效`,
starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),
@ -88,9 +88,9 @@ class Immediatelypublish extends Component{
modalname:"立即发布", modalname:"立即发布",
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1, modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
OneSelftype:true, OneSelftype:true,
Topval:"学生将立即收到问卷", Topval:this.props.Exercisetype==="exercise"?"学生将立即收到试卷":"学生将立即收到问卷",
// Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`, Botval:this.props.single ? "":this.props.Exercisetype==="exercise"?`本操作只对"未发布"的试卷有效`:`本操作只对"未发布"的问卷有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),
@ -143,9 +143,9 @@ class Immediatelypublish extends Component{
modalname:"立即发布", modalname:"立即发布",
modaltype:response.data.un_publish > 0 ? 1 : 2, modaltype:response.data.un_publish > 0 ? 1 : 2,
visible:true, visible:true,
Topval:"学生将立即收到问卷", Topval:this.props.Exercisetype==="exercise"?"学生将立即收到试卷":"学生将立即收到问卷",
// Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`, Botval:this.props.single ? "":this.props.Exercisetype==="exercise"?`本操作只对"未发布"的试卷有效`:`本操作只对"未发布"的问卷有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),
@ -183,9 +183,9 @@ class Immediatelypublish extends Component{
modalname:"立即发布", modalname:"立即发布",
modaltype:response.data.un_publish > 0 ? 1 : 2, modaltype:response.data.un_publish > 0 ? 1 : 2,
visible:true, visible:true,
Topval:"学生将立即收到问卷", Topval:this.props.Exercisetype==="exercise"?"学生将立即收到试卷":"学生将立即收到问卷",
// Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`, Botval:this.props.single ? "":this.props.Exercisetype==="exercise"?`本操作只对"未发布"的试卷有效`:`本操作只对"未发布"的问卷有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),

Write Preview
Loading…
Cancel
Save