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

调整新版实训

Browse Source
chromesetting
杨树明 5 years ago
parent ea9b5cbd04
commit 46936a4b61
5 changed files with 88 additions and 45 deletions
Show Stats Download Patch File Download Diff File

81
public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
Unescape View File

@ -370,10 +370,10 @@ class Challenges extends Component {
<span className="font-16 fl">简介</span>
{this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status < 3 ?
<a href={"/shixuns/" + id + "/settings"} className="fr color-blue font-14">
<Link to={"/shixuns/" + id + "/settings"} className="fr color-blue font-14">
{/*<img src={getImageUrl("images/educoder/icon/edit.svg")} className="fl mt3 ml2" />*/}
编辑
</a>:""}
</Link>:""}
{this.props.user && this.props.user.main_site === true ?
this.props.identity < 5?<a className="fr font-14 color-blue mr20" href="/forums/2943"
target="_blank">实训制作指南</a> : "":""}
@ -435,26 +435,30 @@ class Challenges extends Component {
</div>
<div className="alltask edu-back-white padding1020pxshixun">
{ChallengesDataList === undefined ? <div className="alltask">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")} />
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
{this.props.identity < 5?<img className="newedu-nodata-img mb20"
src={getImageUrl("images/educoder/shixunnodata.png")} />:<img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")} />}
<p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
</div>
</div> : ChallengesDataList.challenge_list === undefined ?
<div className="alltask">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")} />
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
{this.props.identity < 5?<img className="newedu-nodata-img mb20"
src={getImageUrl("images/educoder/shixunnodata.png")} />:<img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")} />}
<p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
</div>
</div>
: ChallengesDataList.challenge_list.length === 0 ?
<div className="alltask">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")} />
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
{this.props.identity < 5?<img className="newedu-nodata-img mb20"
src={getImageUrl("images/educoder/shixunnodata.png")} />:<img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")} />}
<p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
</div>
</div>
: ChallengesDataList.challenge_list.map((item, key) => {
@ -511,14 +515,16 @@ class Challenges extends Component {
:""
}
</div>
<span className="fr mt8">
<span className="fr">
{item.delete_url != undefined &&
<Tooltip placement="bottom" title={"删除"}>
<a onClick={() => this.delOperations(item.challenge_id)}
style={{ display:this.props.user.admin===true?"block":this.props.identity < 5 && ChallengesDataList.shixun_status === 0 ? "block" : 'none' }}
className="fl ring-op-green mr25">
<img src={getImageUrl("images/educoder/icon/close.svg")}
className="fl mt5 ml5" />
className="fl mr25">
{/*<img src={getImageUrl("images/educoder/icon/close.svg")}*/}
{/* className="fl mt5 ml5" />*/}
<i className={"iconfont icon-shanchu_Hover"}></i>
</a>
</Tooltip>
}
@ -528,9 +534,10 @@ class Challenges extends Component {
<Tooltip placement="bottom" title={"向上移动"}>
<a onClick={operationstrue===true?"":() => this.operations(item.challenge_id, "up")}
style={{ display:this.props.user.admin===true?"block":this.props.identity < 5 && ChallengesDataList.shixun_status === 0 ? "block" : 'none' }}
className="fl ring-op-green mr25">
<img src={getImageUrl("images/educoder/icon/moveup.svg")}
className="fl mt2 ml4" />
className="fl mr25">
{/*<img src={getImageUrl("images/educoder/icon/moveup.svg")}*/}
{/* className="fl mt2 ml4" />*/}
<i className={"iconfont icon-shangyi_Hover"}></i>
</a>
</Tooltip>
}
@ -538,8 +545,9 @@ class Challenges extends Component {
<Tooltip placement="bottom" title={"向下移动"}>
<a onClick={operationstrue===true?"":() => this.operations(item.challenge_id, "down")}
style={{ display: this.props.user.admin===true?"block":this.props.identity < 5 && ChallengesDataList.shixun_status=== 0 ? "block" : 'none' }}
className="fl ring-op-green mr25">
<img src={getImageUrl("images/educoder/icon/movedown.svg")} className="fl mt2 ml4" />
className="fl mr25">
{/*<img src={getImageUrl("images/educoder/icon/movedown.svg")} className="fl mt2 ml4" />*/}
<i className={"iconfont icon-xiayi_Hover"}></i>
</a>
</Tooltip>
@ -548,25 +556,26 @@ class Challenges extends Component {
{
item.st === 1 ?
<Tooltip placement="bottom" title={"编辑"}>
<a
<Link
style={{ display:this.props.user.admin===true?"block":this.props.identity < 5 && ChallengesDataList.shixun_status< 3 ? "block" : 'none' }}
href={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editquestion"}
className="fl ring-green">
<img src={getImageUrl("images/educoder/icon/edit.svg")}
className="fl mt3 ml2" />
</a>
to={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editquestion"}
className="fl">
{/*<img src={getImageUrl("images/educoder/icon/edit.svg")}*/}
{/* className="fl mt3 ml2" />*/}
<i className={"iconfont icon-bianji_Hover"}></i>
</Link>
</Tooltip>
:
<Tooltip placement="bottom" title={"编辑"}>
<a
<Link
style={{ display:this.props.user.admin===true?"block":this.props.identity < 5 && ChallengesDataList.shixun_status < 3 ? "block" : 'none' }}
href={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editcheckpoint"}
className="fl ring-green">
<img src={getImageUrl("images/educoder/icon/edit.svg")}
className="fl mt3 ml2" />
</a>
to={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editcheckpoint"}
className="fl">
{/*<img src={getImageUrl("images/educoder/icon/edit.svg")}*/}
{/* className="fl mt3 ml2" />*/}
<i className={"iconfont icon-bianji_Hover"}></i>
</Link>
</Tooltip>
}
</span>
@ -577,11 +586,11 @@ class Challenges extends Component {
{/*onClick={() => this.EditTraining(this.props.identity, item.challenge_id, "/editquestion")}*/}
{this.props.identity<5?
item.st === 1 ?
<span className="font-16 color05101a">{item.name}</span>
<div className="font-16 color05101a fonthiddens">{item.name}</div>
:
<span className="font-16 color05101a">{item.name}</span>:<span
<div className="font-16 color05101a fonthiddens">{item.name}</div>:<div
// onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")}
className="font-16 color05101a">{item.name}</span>
className="font-16 color05101a fonthiddens">{item.name}</div>
}
{/* onClick={() => this.EditTraining(this.props.identity, item.challenge_id, "/editcheckpoint")}*/}

2
public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
Unescape View File

@ -183,5 +183,5 @@
}
.fontneweees {
color: #eee;
color: #BBBBBB;
}

2
public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
Unescape View File

@ -669,7 +669,7 @@ class Collaborators extends Component {
<p className="mb10 sortinxdirection space-between hezuozhe634">
<a href={item.user.user_url} target="_blank" className="yslusername">{item.user.name}</a>
{item.user.shixun_manager === true ? "" : <span>
<i className={this.state.hovertype===true&&key===this.state.hoverkey?"fontnewreds iconfont icon-shanchu_moren":"fontneweees iconfont icon-shanchu_moren"}
<i className={this.state.hovertype===true&&key===this.state.hoverkey?"fontnewreds iconfont icon-shanchu_Hover":"fontneweees iconfont icon-shanchu_moren"}
style={{display: this.props.power === false ? "none" : "block"}}
onClick={() => this.collaborators_delete(item.user.user_id)}
onMouseEnter={()=>this.toggleHover(true,key)}

42
public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
Unescape View File

@ -139,16 +139,50 @@
}
.shixunstartbutton33BD8C{
background: #33BD8C;
border: #33BD8C;
background: #33BD8C !important;
border: #33BD8C !important;
}
.shixunstartbuttonFF6601{
background: #FF6601;
border: #FF6601;
background: #FF6601 !important;
border: #FF6601 !important;
}
.shixunstartbutton666666{
font-size:14px;
color:#666666;
}
.newedu-nodata-img{
width: 300px;
margin: 50px 0px;
display: block;
margin-left: 41%;
}
.fonthiddens{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.icon-bianji_Hover,.icon-xiayi_Hover,.icon-shangyi_Hover,.icon-shanchu_Hover{
color:#BBBBBB !important;
}
.icon-bianji_Hover:hover{
color: rgb(80, 145, 255) !important;
}
.icon-xiayi_Hover:hover{
color: rgb(51, 189, 140) !important;
}
.icon-shangyi_Hover:hover{
color: rgb(51, 189, 140) !important;
}
.icon-shanchu_Hover:hover{
color:rgb(255, 85, 85) !important;
}

2
public/react/src/modules/tpm/shixuns/ShixunCardList.js
Unescape View File

@ -218,7 +218,7 @@ class ShixunCardList extends Component {
id="hot"
onClick={(e)=>this.latestHot(e,3)}>最热
</div>
{shixuntype===true?"":<a className={ "fl font-16 bestChoose active" } onClick={(url)=>this.getUser("/shixuns/new")}>+新建实训项目</a>}
{shixuntype===true?"":<span className={ "fl font-16 bestChoose color-blue" } onClick={(url)=>this.getUser("/shixuns/new")}>+新建实训项目</span>}
{/*<div className="fl font-16 bestChoose shixun_repertoire ml20 mt1"*/}
{/*style={{display:upcircle===true?"block":"none"}}*/}

Write Preview
Loading…
Cancel
Save