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

调整竞赛修改文案

Browse Source
dev_home
杨树明 5 years ago
parent 004ec5436f
commit 36521f3c7b
15 changed files with 63 additions and 53 deletions
Show Stats Download Patch File Download Diff File

9
public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
Unescape View File

@ -409,4 +409,13 @@
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap
}
.usernamebox{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: default;
max-width: 100px;
display: inherit;
}

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

@ -84,21 +84,21 @@ class CompetitionContents extends Component{
dataIndex: 'userimg',
key: 'userimg',
render: (text, record) =>(
<span href={`/users/${record.user_login}`} className="color-dark">
<a href={`/users/${record.user_login}`} target={"_blank"} className="color-dark">
<img className={"Competitionuserimg"} src={getImageUrl(`images/${record.userimg===null?`avatars/User/0?1442652658`:record.userimg}`)}/>
</span>),
</a>),
},
{
title: 'username',
dataIndex: 'username',
key: 'username',
render: text => <span title={text}>{text}</span>,
render: text => <span title={text} title={text}>{text}</span>,
},
{
title: 'school',
dataIndex: 'school',
key: 'school',
render: text => <span title={text}>{text}</span>,
render: text => <span title={text} title={text}>{text}</span>,
},
{
title: 'spendtime',
@ -200,7 +200,7 @@ class CompetitionContents extends Component{
<li className="pr Competitioncenter">
<img src={getImageUrl("images/educoder/huangguan-two.png")}/>
<div className={"mt10"}>
<a href={`/users/${item.user_login}`} className="color-dark">
<a href={`/users/${item.user_login}`} target={"_blank"} className="color-dark">
<img className={"rankingimg"} src={getImageUrl(`images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}</p>
</a>
@ -236,7 +236,7 @@ class CompetitionContents extends Component{
<li className="pr Competitioncenter">
<img src={getImageUrl("images/educoder/huangguan.png")}/>
<div className={"mt10"}>
<a href={`/users/${item.user_login}`} className="color-dark">
<a href={`/users/${item.user_login}`} target={"_blank"} className="color-dark">
<img className={"rankingimg"} src={getImageUrl(`images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}</p>
</a>
@ -272,7 +272,7 @@ class CompetitionContents extends Component{
<li className=" pr Competitioncenter ">
<img src={getImageUrl("images/educoder/huangguan-three.png")}/>
<div className={"mt10"}>
<a href={`/users/${item.user_login}`} className="color-dark">
<a href={`/users/${item.user_login}`} target={"_blank"} className="color-dark">
<img className={"rankingimg"} src={getImageUrl(`images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}</p>
</a>
@ -315,10 +315,14 @@ class CompetitionContents extends Component{
.col24{
width: 24%;
text-align: left;
padding-left: 16px;
padding-left: 33px;
}
.col15{
width: 15%;
width: 14%;
text-align: right;
}
.col10{
width: 10%;
}
`
}
@ -337,7 +341,7 @@ class CompetitionContents extends Component{
<Col className="textleft" span={9} order={3}>
{/*{item.team_name}*/}
</Col>
<Col span={3} order={4}>
<Col span={3} order={4} className={"col10"}>
{this.props&&this.props.mode===1?item.cost_time:""}
</Col>
<Col className="textright" span={3} order={5} className={"col15"}>
@ -352,23 +356,20 @@ 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;
width: 150px;
overflow: hidden;
max-width: 100px;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
white-space: nowrap;
cursor: default;
}
.ant-table-tbody > tr > td:nth-last-child(3){
// line-height: 63px;
// width: 290px;
// height: 96px;
// display: inline-block;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
overflow: hidden;
max-width: 200px;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
white-space: nowrap;
cursor: default;
}
.ant-table-tbody>tr>td, .ant-table-thead>tr>th {
padding: 5px;

2
public/react/src/modules/courses/busyWork/PublishRightnow.js
Unescape View File

@ -61,7 +61,7 @@ class PublishRightnow extends Component{
OneSelftype:showdatatype?true:false,
Topval:showdatatypes ? "学生将立即收到作业" : "学生将不能再提交作品",
// Botvalleft: isPublish ? "暂不发布" : "暂不截止",
Botval: this.props.fromListPage ? (showdatatypes ? "本操作只对“未发布”的分班有效" : "本操作只对“提交中”的分班有效") : '',
Botval: this.props.fromListPage ? (showdatatypes ? "本操作只对“未发布”的作业有效" : "本操作只对“提交中”的作业有效") : '',
starttime: showdatatypes? `发布时间：${startMoment.format(dateFormat)}` : '',
starttimes:showdatatypes? `${startMoment.format(dateFormat)}` : '',
endtime:showdatatypes ? `截止时间：${startMoment.add(1, 'months').add(1, 'hours').minutes(0).format(dateFormat)}` : '',

2
public/react/src/modules/courses/exercise/Exercise.js
Unescape View File

@ -233,7 +233,7 @@ class Exercise extends Component{
visible:true,
Topval:"学生将立即收到试卷",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
Botval:`本操作只对"未发布"的试卷有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2),

2
public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
Unescape View File

@ -188,7 +188,7 @@ class GraduationTaskDetail extends Component{
visible:true,
Topval:"学生将不能再提交作品",
// Botvalleft:"暂不截止",
// Botval:`本操作只对"提交中"的分班有效`,
// Botval:`本操作只对"提交中"的作业有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.cancelmodel,

2
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
Unescape View File

@ -386,7 +386,7 @@ class GraduationTaskssettinglist extends Component{
visible:true,
Topval:"学生将不能再提交作品",
// Botvalleft:"暂不截止",
// Botval:`本操作只对"提交中"的分班有效`,
// Botval:`本操作只对"提交中"的任务有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.cancelmodel,

2
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
Unescape View File

@ -86,7 +86,7 @@ class GraduationTasksquestions extends Component{
visible:true,
Topval:"学生将不能再提交作品",
// Botvalleft:"暂不截止",
// Botval:`本操作只对"提交中"的分班有效`,
// Botval:`本操作只对"提交中"的任务有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.cancelmodel,

4
public/react/src/modules/courses/graduation/tasks/index.js
Unescape View File

@ -428,7 +428,7 @@ class GraduationTasks extends Component{
visible:true,
Topval:"学生将立即收到毕设任务",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
Botval:`本操作只对"未发布"的任务有效`,
starttime:"发布时间："+moment(new Date()).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1),
typs:"start",
@ -496,7 +496,7 @@ class GraduationTasks extends Component{
visible:true,
Topval:"学生将不能再提交作品",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Botval:`本操作只对"提交中"的任务有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.publishcanner,

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

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

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

@ -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:"学生将立即收到问卷",
// Botvalleft:"暂不发布",
Botval:this.props.single ? "":`本操作只对"未发布"的分班有效`,
Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`,
starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2),
@ -90,7 +90,7 @@ class Immediatelypublish extends Component{
OneSelftype:true,
Topval:"学生将立即收到问卷",
// Botvalleft:"暂不发布",
Botval:this.props.single ? "":`本操作只对"未发布"的分班有效`,
Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`,
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:"学生将立即收到问卷",
// Botvalleft:"暂不发布",
Botval:this.props.single ? "":`本操作只对"未发布"的分班有效`,
Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2),
@ -185,7 +185,7 @@ class Immediatelypublish extends Component{
visible:true,
Topval:"学生将立即收到问卷",
// Botvalleft:"暂不发布",
Botval:this.props.single ? "":`本操作只对"未发布"的分班有效`,
Botval:this.props.single ? "":`本操作只对"未发布"的问卷有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2),

4
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -3026,7 +3026,7 @@ class Listofworksstudentone extends Component {
OneSelftype: true,
Topval: "学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval: `本操作只对"未发布"的分班有效`,
Botval: `本操作只对"未发布"的作业有效`,
starttime: moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime,
starttimes: starttime,
@ -3062,7 +3062,7 @@ class Listofworksstudentone extends Component {
OneSelftype: false,
Topval: "学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval: `本操作只对"提交中"的分班有效`,
Botval: `本操作只对"提交中"的作业有效`,
Cancelname: "暂不截止",
Savesname: "立即截止",
Cancel: this.homeworkhide,

4
public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
Unescape View File

@ -393,7 +393,7 @@ class ShixunStudentWork extends Component {
OneSelftype:true,
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
Botval:`本操作只对"未发布"的作业有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime:"截止时间："+endtime,
Cancelname:"暂不发布",
@ -425,7 +425,7 @@ class ShixunStudentWork extends Component {
visible:true,
Topval:"学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Botval:`本操作只对"提交中"的作业有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.homeworkhide,

4
public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
Unescape View File

@ -1707,7 +1707,7 @@ class Trainingjobsetting extends Component {
OneSelftype: true,
Topval: "学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval: `本操作只对"未发布"的分班有效`,
Botval: `本操作只对"未发布"的作业有效`,
starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes: starttime,
starttimesend: response.data.end_time === undefined || response.data.end_time === null || response.data.end_time === "" ? undefined : response.data.end_time,
@ -1740,7 +1740,7 @@ class Trainingjobsetting extends Component {
visible: true,
Topval: "学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval: `本操作只对"提交中"的分班有效`,
Botval: `本操作只对"提交中"的作业有效`,
Cancelname: "暂不截止",
Savesname: "立即截止",
Cancel: this.homeworkhide,

4
public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
Unescape View File

@ -169,7 +169,7 @@ class Workquestionandanswer extends Component {
OneSelftype: true,
Topval: "学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval: `本操作只对"未发布"的分班有效`,
Botval: `本操作只对"未发布"的作业有效`,
starttime: moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime,
Cancelname: "暂不发布",
@ -201,7 +201,7 @@ class Workquestionandanswer extends Component {
visible: true,
Topval: "学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval: `本操作只对"提交中"的分班有效`,
Botval: `本操作只对"提交中"的作业有效`,
Cancelname: "暂不截止",
Savesname: "立即截止",
Cancel: this.homeworkhide,

8
public/react/src/modules/courses/shixunHomework/shixunHomework.js
Unescape View File

@ -263,7 +263,7 @@ class ShixunHomework extends Component{
typs:"start",
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
Botval:`本操作只对"未发布"的作业有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime,
endtime:"截止时间："+endtime,
@ -303,7 +303,7 @@ class ShixunHomework extends Component{
typs:"start",
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
Botval:`本操作只对"未发布"的作业有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime,
endtime:"截止时间："+endtime,
@ -402,7 +402,7 @@ class ShixunHomework extends Component{
visible:true,
Topval:"学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Botval:`本操作只对"提交中"的作业有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.homeworkhide,
@ -501,7 +501,7 @@ class ShixunHomework extends Component{
visible:true,
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
Botval:`本操作只对"未发布"的作业有效`,
starttime:"发布时间："+ moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime,
typs:"start",

Write Preview
Loading…
Cancel
Save