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

竞赛调整

Browse Source
dev_auth
杨树明 5 years ago
parent 6a45593ec0
commit 79ef526356
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File

18
public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
Unescape View File

@ -131,15 +131,15 @@ class CompetitionsIndex extends Component{
{item.competition_status==="nearly_published"? {item.competition_status==="nearly_published"?
this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""} this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""}
{/*<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>*/} {/*<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>*/}
{item.description===null||item.description===undefined||item.description===""?<style> {/*{item.description===null||item.description===undefined||item.description===""?<style>*/}
{ {/*{*/}
` {/*`*/}
// .CompetitionsIndex .ant-list-vertical .ant-list-item-action{ {/*// .CompetitionsIndex .ant-list-vertical .ant-list-item-action{*/}
// margin-top:50px; {/*// margin-top:50px;*/}
// } {/*// }*/}
` {/*`*/}
} {/*}*/}
</style>:""} {/*</style>:""}*/}
<img className={"competitonimg"} <img className={"competitonimg"}
src={item.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):item.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):item.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""} /> src={item.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):item.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):item.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""} />
<List.Item <List.Item

2
public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
Unescape View File

@ -293,7 +293,7 @@ class CompetitionCommon extends Component{
{data.competition_status==="ended"? {data.competition_status==="ended"?
<Button type="primary" block className={"Competitionfontsize22"} disabled={true}> <Button type="primary" block className={"Competitionfontsize22"} disabled={true}>
已结束 已结束
</Button>: </Button>:data.enroll_end_time
data.competition_status==="progressing"?<Button type="primary" block className={"Competitionfontsize22"}> data.competition_status==="progressing"?<Button type="primary" block className={"Competitionfontsize22"}>
{data.mode===2?<a onClick={()=>this.gotocourse()}>立即报名</a>:<a onClick={()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>立即报名</a>} {data.mode===2?<a onClick={()=>this.gotocourse()}>立即报名</a>:<a onClick={()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>立即报名</a>}
</Button>:""} </Button>:""}

2
public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
Unescape View File

@ -30,7 +30,7 @@ class CompetitionContents extends Component{
编辑 编辑
</Button>:"":""} </Button>:"":""}
<div className={this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?"mt50 mb100 ":"mb100 "}> <div className={this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?"mt50 mb100 ":"mb100 "}>
<Content className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(mdContentdata===undefined?"":mdContentdata.md_content===undefined?"":mdContentdata.md_content).replace(/▁/g, "▁▁▁")}}> <Content className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(mdContentdata===undefined?"":mdContentdata.md_content===undefined||mdContentdata.md_content===null?"":mdContentdata.md_content).replace(/▁/g, "▁▁▁")}}>
</Content> </Content>
<div className={"mt30"}> <div className={"mt30"}>

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

@ -98,11 +98,11 @@ class CompetitionContents extends Component{
{chart_rules.rule_contents.map((items,keys)=>{ {chart_rules.rule_contents.map((items,keys)=>{
if(item.id===items.competition_stage_id){ if(item.id===items.competition_stage_id){
return( return(
<Content key={keys} className={"markdown-body "} dangerouslySetInnerHTML={{__html: markdownToHTML(items.content).replace(/▁/g, "▁▁▁")}}></Content> <Content key={keys} className={"markdown-body "} dangerouslySetInnerHTML={{__html: markdownToHTML(items.content===undefined||items.content===null?"":items.content).replace(/▁/g, "▁▁▁")}}></Content>
) )
}else if(item.id===null&&items.competition_stage_id===0){ }else if(item.id===null&&items.competition_stage_id===0){
return( return(
<Content key={keys} className={"markdown-body "} dangerouslySetInnerHTML={{__html: markdownToHTML(items.content).replace(/▁/g, "▁▁▁")}}></Content> <Content key={keys} className={"markdown-body "} dangerouslySetInnerHTML={{__html: markdownToHTML(items.content===undefined||items.content===null?"":items.content).replace(/▁/g, "▁▁▁")}}></Content>
) )
} }
})} })}

15
public/react/src/modules/competitions/Competitioncommon/CompetitionContentsMd.js
Unescape View File

@ -78,8 +78,11 @@ class CompetitionContentsMd extends Component{
} }
handleContentUploadChange = (info) => { handleContentUploadChange = (info) => {
let contentFileList = info.fileList; if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) }); let contentFileList = info.fileList;
this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) });
}
} }
onAttachmentRemove = (file, stateName) => { onAttachmentRemove = (file, stateName) => {
@ -127,6 +130,10 @@ class CompetitionContentsMd extends Component{
handleSubmit = () => { handleSubmit = () => {
let {contentFileList}=this.state; let {contentFileList}=this.state;
const mdContnet = this.contentMdRef.current.getValue().trim(); const mdContnet = this.contentMdRef.current.getValue().trim();
if(mdContnet.length>10000){
this.props.showNotification("内容超过10000个字");
return
}
let attachment_ids=undefined let attachment_ids=undefined
if(contentFileList!=undefined){ if(contentFileList!=undefined){
attachment_ids= contentFileList.map(item => { attachment_ids= contentFileList.map(item => {
@ -184,7 +191,7 @@ class CompetitionContentsMd extends Component{
console.log('beforeUpload', file.name); console.log('beforeUpload', file.name);
const isLt150M = file.size / 1024 / 1024 < 150; const isLt150M = file.size / 1024 / 1024 < 150;
if (!isLt150M) { if (!isLt150M) {
message.error('文件大小必须小于150MB!'); this.props.showNotification("文件大小必须小于150MB");
} }
return isLt150M; return isLt150M;
}, },
@ -203,7 +210,7 @@ class CompetitionContentsMd extends Component{
})} })}
</Tabs>:""} </Tabs>:""}
<TPMMDEditor ref={this.contentMdRef} placeholder="请输入任务内容说明，最大限制5000个字符" mdID={'courseContentMD'} refreshTimeout={1500} <TPMMDEditor ref={this.contentMdRef} placeholder="请输入任务内容说明，最大限制10000个字符" mdID={'courseContentMD'} refreshTimeout={1500}
className="courseMessageMD" initValue={this.state.description}></TPMMDEditor> className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
{this.props.module_type==="chart"?"":<Upload {...uploadProps} className="upload_1 newWorkUpload"> {this.props.module_type==="chart"?"":<Upload {...uploadProps} className="upload_1 newWorkUpload">
<Button className="uploadBtn"> <Button className="uploadBtn">

Write Preview
Loading…
Cancel
Save