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

竞赛调整

Browse Source
dev_auth
杨树明 5 years ago
parent ca86bb675a
commit 25ed938852
4 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File

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

@ -189,7 +189,7 @@
} }
.Competitionsecondary{ .Competitionsecondary{
width:234px; width:234px;
height:277px; height:298px;
background:rgba(250,250,250,1); background:rgba(250,250,250,1);
box-shadow:0px 3px 5px 0px rgba(254,190,154,1); box-shadow:0px 3px 5px 0px rgba(254,190,154,1);
border-radius:5px; border-radius:5px;
@ -197,7 +197,7 @@
.Competitionthird{ .Competitionthird{
width: 234px; width: 234px;
height: 270px; height: 298px;
background: rgba(250,250,250,1); background: rgba(250,250,250,1);
box-shadow: 0px 4px 5px 0px rgba(200,200,202,1); box-shadow: 0px 4px 5px 0px rgba(200,200,202,1);
border-radius: 5px; border-radius: 5px;
@ -215,24 +215,12 @@
position: absolute; position: absolute;
right: -5px; right: -5px;
width:93px; width:93px;
top: 20px; top: 10px;
}
.Competitionthirdbox{
width:234px;
height:163px;
background:rgba(223,223,225,1);
}
.Competitionthirdbox{
width:234px;
height:163px;
background:rgba(223,223,225,1);
} }
.Competitionthirdbox{ .Competitionthirdbox{
width:234px; width:234px;
height:163px; height:167px;
background:rgba(223,223,225,1); background:rgba(223,223,225,1);
position: relative; position: relative;
} }
@ -246,7 +234,7 @@
.Competitionsecondarybox{ .Competitionsecondarybox{
width:234px; width:234px;
height:155px; height:167px;
background:rgba(253,230,217,1); background:rgba(253,230,217,1);
position: relative; position: relative;
} }
@ -275,9 +263,9 @@
zoom: 1; zoom: 1;
} }
.Competitionthird .ant-card-meta-title{ /*.Competitionthird .ant-card-meta-title{*/
margin-bottom: 0px !important; /*margin-bottom: 0px !important;*/
} /*}*/
.Competitionfirst .ant-card-body { .Competitionfirst .ant-card-body {
padding: 12px; padding: 12px;
@ -347,8 +335,8 @@
} }
.image_urlbox{ .image_urlbox{
width: 705px; width: 790px;
/*height: 400px;*/ height: 340px;
} }
.CompetitionContents{ .CompetitionContents{
@ -398,3 +386,12 @@
padding-left: 12px; padding-left: 12px;
margin-right: 28px; margin-right: 28px;
} }
.Commonimgbox{
width: 800px !important;
}
.CompetitionCommonbannerfont{
width: 350px !important;
margin-left:10px;
}

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

@ -251,12 +251,12 @@ class CompetitionCommon extends Component{
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>:""}
<img className={"Commonimg"} <img className={"Commonimg"}
src={data.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):data.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):data.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""} /> src={data.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):data.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):data.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""} />
<Col span={15}> <Col span={15} className={"Commonimgbox"}>
<img className={"image_urlbox"} src={data===undefined?getImageUrl(`images/educoder/competitions/mainbanner.jpg`):data.avatar_url===null?getImageUrl(`images/educoder/competitions/mainbanner.jpg`):getImageUrl(data.avatar_url)}/> <img className={"image_urlbox"} src={data===undefined?getImageUrl(`images/educoder/competitions/mainbanner.jpg`):data.avatar_url===null?getImageUrl(`images/educoder/competitions/mainbanner.jpg`):getImageUrl(data.avatar_url)}/>
</Col> </Col>
<Col className={"CompetitionCommonbannerfont"} span={9}> <Col className={"CompetitionCommonbannerfont"} span={9}>
<Col className={data&&data.name.length>15?"competitionbannerdiv":"competitionbannerdiv mt30"}>{data&&data.name}</Col> <Col className={data&&data.name.length>15?"competitionbannerdiv mt30":"competitionbannerdiv mt30"}>{data&&data.name}</Col>
<Col className={"competitionbannerdiv"}> <Col className={"competitionbannerdiv"}>
<Col className={"Competitioncolor9b"}>竞赛时间：</Col> <Col className={"Competitioncolor9b"}>竞赛时间：</Col>
@ -268,10 +268,10 @@ class CompetitionCommon extends Component{
<Col className="gutter-row" span={6}> <Col className="gutter-row" span={6}>
<div className="gutter-box CompetitionsIndexdadels Competitioncolor77">奖金</div> <div className="gutter-box CompetitionsIndexdadels Competitioncolor77">奖金</div>
</Col> </Col>
<Col className="gutter-row ml20" span={6}> <Col className="gutter-row ml20 rankbeicenter" span={6}>
<div className="gutter-box CompetitionsIndexdadels Competitioncolor77">浏览数</div> <div className="gutter-box CompetitionsIndexdadels Competitioncolor77">浏览数</div>
</Col> </Col>
<Col className="gutter-row" span={6}> <Col className="gutter-row rankbeicenter" span={6}>
<div className="gutter-box CompetitionsIndexdadels Competitioncolor77">报名数</div> <div className="gutter-box CompetitionsIndexdadels Competitioncolor77">报名数</div>
</Col> </Col>
</Row> </Row>
@ -280,10 +280,10 @@ class CompetitionCommon extends Component{
<Col className="gutter-row" span={6}> <Col className="gutter-row" span={6}>
<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">¥{data&&data.bonus}</div> <div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">¥{data&&data.bonus}</div>
</Col> </Col>
<Col className="gutter-row ml20" span={6}> <Col className="gutter-row ml20 rankbeicenter" span={6}>
<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data.competition_status==="nearly_published"?"--":data&&data.visits_count}</div> <div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data.competition_status==="nearly_published"?"--":data&&data.visits_count}</div>
</Col> </Col>
<Col className="gutter-row" span={6}> <Col className="gutter-row rankbeicenter" span={6}>
<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516" onClick={data.competition_status==="nearly_published"?"":()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}</div> <div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516" onClick={data.competition_status==="nearly_published"?"":()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}</div>
</Col> </Col>
</Row> </Row>

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

@ -167,7 +167,7 @@ class CompetitionContents extends Component{
{chartdata===undefined?"":chartdata.teams.length===0?"":chartdata.teams.map((item,key)=>{ {chartdata===undefined?"":chartdata.teams.length===0?"":chartdata.teams.map((item,key)=>{
if(key===2){ if(key===1){
return( return(
<Col className="mt40" xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 2 }}> <Col className="mt40" xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 2 }}>
<Card <Card
@ -239,7 +239,7 @@ class CompetitionContents extends Component{
} }
})} })}
{chartdata===undefined?"":chartdata.teams.length===0?"":chartdata.teams.map((item,key)=>{ {chartdata===undefined?"":chartdata.teams.length===0?"":chartdata.teams.map((item,key)=>{
if(key===1){ if(key===2){
return( return(
<Col className="mt30" xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 1 }}> <Col className="mt30" xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 1 }}>
<Card <Card
@ -313,6 +313,16 @@ class CompetitionContents extends Component{
})} })}
</div>} </div>}
<Row className={"mt20 mb80"}> <Row className={"mt20 mb80"}>
<style>
{
`
.ant-table-tbody > tr > td:nth-last-child(3) a{
width: 300px;
display: inline-block;
}
`
}
</style>
{chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<4?"":<Table className="Competitiontransparent" columns={columns} dataSource={data} showHeader={false} pagination={false}/>} {chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<4?"":<Table className="Competitiontransparent" columns={columns} dataSource={data} showHeader={false} pagination={false}/>}
</Row> </Row>

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

@ -130,10 +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){ // if(mdContnet.length>10000){
this.props.showNotification("内容超过10000个字"); // this.props.showNotification("内容超过10000个字");
return // 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 => {
@ -210,7 +210,7 @@ class CompetitionContentsMd extends Component{
})} })}
</Tabs>:""} </Tabs>:""}
<TPMMDEditor ref={this.contentMdRef} placeholder="请输入任务内容说明，最大限制10000个字符" mdID={'courseContentMD'} refreshTimeout={1500} <TPMMDEditor ref={this.contentMdRef} placeholder="请输入内容说明" 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