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

调整

Browse Source
dev_forum
杨树明 6 years ago
parent 551bebf5cf
commit 33e870fd97
7 changed files with 179 additions and 156 deletions
Show Stats Download Patch File Download Diff File

21
public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
Unescape View File

@ -553,19 +553,28 @@ class Coursesleftnav extends Component{
// notification.open({ // notification.open({
// message: "删除成功", // message: "删除成功",
// }); // });
window.location.href = url;
// this.props.history.replace(url);
window.location.href = url;
} }
deletenavchilds=(url)=>{ deletenavchilds=(url,mainurl)=>{
axios.delete(url).then((result)=>{ axios.delete(url).then((result)=>{
if(result.data.status===0){ if(result.data.status===0){
this.updatadeleteSecondary(result.data.right_url)
if(mainurl===undefined){
this.updatadeleteSecondary(result.data.right_url)
}else{
this.updatadeleteSecondary(mainurl)
}
} }
}).catch((error)=>{ }).catch((error)=>{
console.log(error) console.log(error)
}) })
} }
deleteSecondary=(e,type,id)=>{ deleteSecondary=(e,type,id,mainurl)=>{
e.stopPropagation();//阻止冒泡 e.stopPropagation();//阻止冒泡
if(type===1){ if(type===1){
let url="/course_second_categories/"+id+".json" let url="/course_second_categories/"+id+".json"
@ -593,7 +602,7 @@ class Coursesleftnav extends Component{
ModalsType:true, ModalsType:true,
Modalstopval:"该目录下的内容将被移动到父目录,", Modalstopval:"该目录下的内容将被移动到父目录,",
ModalsBottomval:"是否确认删除?", ModalsBottomval:"是否确认删除?",
ModalSave:()=>this.deletenavchilds(url), ModalSave:()=>this.deletenavchilds(url,mainurl),
}) })
} }
@ -726,7 +735,7 @@ class Coursesleftnav extends Component{
{item.type==="course_group"?<div onClick={e=>this.deleteSecondary(e,2,iem.category_id)}>删除</div>:""} {item.type==="course_group"?<div onClick={e=>this.deleteSecondary(e,2,iem.category_id)}>删除</div>:""}
{/*讨论区*/} {/*讨论区*/}
{item.type==="board"?<div onClick={e=>this.Navmodalnames(e,7,"editSecondname",iem.category_id,iem.category_name)}>重命名</div>:""} {item.type==="board"?<div onClick={e=>this.Navmodalnames(e,7,"editSecondname",iem.category_id,iem.category_name)}>重命名</div>:""}
{item.type==="board"?<div onClick={e=>this.deleteSecondary(e,3,iem.category_id)}>删除</div>:""} {item.type==="board"?<div onClick={e=>this.deleteSecondary(e,3,iem.category_id,item.category_url)}>删除</div>:""}
</div>) </div>)
} }

3
public/react/src/modules/courses/coursesHome/coursesHomeCard.js
Unescape View File

@ -40,7 +40,8 @@ class coursesHomeCard extends Component{
className="mt80 mb25"/> className="mt80 mb25"/>
<p className="font-14 color-white">非成员不能访问</p> <p className="font-14 color-white">非成员不能访问</p>
</div> </div>
<a href={item.first_category_url} className="square-img" > {/*<a href={item.first_category_url} className="square-img" >*/}
<a href={`/courses/${item.id}/students`} className="square-img" >
{/*target="_blank"*/} {/*target="_blank"*/}
{ {
item.is_public===1&&item.id===1309? item.is_public===1&&item.id===1309?

28
public/react/src/modules/courses/coursesPublic/ShixunModal.js
Unescape View File

@ -211,15 +211,15 @@ class ShixunModal extends Component{
<a onClick={()=>this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a> <a onClick={()=>this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a>
</li> </li>
{ {/*{*/}
shixunmodallist && shixunmodallist.tags.map((item,key)=>{ {/*shixunmodallist && shixunmodallist.tags.map((item,key)=>{*/}
return( {/*return(*/}
<li className="fl mr5 mt5" key={key}> {/*<li className="fl mr5 mt5" key={key}>*/}
<a onClick={()=>this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}</a> {/*<a onClick={()=>this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}</a>*/}
</li> {/*</li>*/}
) {/*)*/}
}) {/*})*/}
} {/*}*/}
</div> </div>
<div className="clearfix mb10" id="shixun_search_form_div" style={{height:"30px"}}> <div className="clearfix mb10" id="shixun_search_form_div" style={{height:"30px"}}>
@ -251,9 +251,9 @@ class ShixunModal extends Component{
} }
<ul className="clearfix greybackHead edu-txt-center"> <ul className="clearfix greybackHead edu-txt-center">
<li className="fl with40 paddingleft22" >实训名称</li> <li className="fl with40 paddingleft22" >实训名称</li>
<li className="fl with30 edu-txt-left">使用院校</li> <li className="fl with30 edu-txt-left">院校</li>
<li className="fl with10">使用人数</li> <li className="fl with10">学习人数</li>
<li className="fl with10">评价等级</li> <li className="fl with10">难度</li>
<li className="fl with10"></li> <li className="fl with10"></li>
</ul> </ul>
@ -292,9 +292,9 @@ class ShixunModal extends Component{
<span style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name">{item.shixun_name}</span> <span style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name">{item.shixun_name}</span>
</Checkbox> </Checkbox>
</li> </li>
<li className="fl with30 edu-txt-left task-hide paddingl5">{item.school_users}</li> <li className="fl with30 edu-txt-left task-hide paddingl5">{item.school}</li>
<li className="fl with10 paddingl10">{item.myshixuns_count}</li> <li className="fl with10 paddingl10">{item.myshixuns_count}</li>
<li className="fl with10 color-orange-tip paddingl10">{item.preference}</li> <li className="fl with10 color-orange-tip paddingl10">{item.level}</li>
<Tooltip title="新窗口查看详情"> <Tooltip title="新窗口查看详情">
<li className="fl with10"><a className="color-blue" href={"/shixuns/"+item.identifier+"/challenges"} target="_blank">详情</a></li> <li className="fl with10"><a className="color-blue" href={"/shixuns/"+item.identifier+"/challenges"} target="_blank">详情</a></li>
</Tooltip> </Tooltip>

270
public/react/src/modules/page/layers/TaskResultLayer.css
Unescape View File

@ -1,134 +1,138 @@
.taskResultLayer { .taskResultLayer {
color: #666666; color: #666666;
z-index: 99999999999999; z-index: 99999999999999;
width: 100%; width: 100%;
height: 100%; height: 100%;
position: fixed; position: fixed;
background:rgba(0,0,0,0.8); background:rgba(0,0,0,0.8);
top: 0px; top: 0px;
overflow: hidden; overflow: hidden;
} }
.taskResultLayer .closeIcon{ .taskResultLayer .closeIcon{
position: absolute; position: absolute;
right: 100px; right: 100px;
top: 46px; top: 46px;
font-size: 28px; font-size: 28px;
z-index: 999999; z-index: 999999;
color: rgb(255,255,255,0.7); color: rgb(255,255,255,0.7);
cursor: pointer; cursor: pointer;
} }
.taskResultLayer .closeIcon:hover { .taskResultLayer .closeIcon:hover {
color: #4CACFF; color: #4CACFF;
} }
.taskResultLayer .expGold { .taskResultLayer .expGold {
color: #b27919 ; color: #b27919 ;
} }
.taskResultLayer .rateLabel { .taskResultLayer .rateLabel {
color: #fff ; color: #fff ;
font-size: 14px; font-size: 14px;
} }
.taskResultLayer .rc-rate-star { .taskResultLayer .rc-rate-star {
font-size: 24px; font-size: 24px;
color: rgb(192, 192, 192); color: rgb(192, 192, 192);
} }
.taskResultLayer .rc-rate-star:nth-child(5) { .taskResultLayer .rc-rate-star:nth-child(5) {
margin-right: 0px; margin-right: 0px;
} }
/* ImageLayer ----------------- Start */ /* ImageLayer ----------------- Start */
.passContent{ .passContent{
justify-content: center; justify-content: center;
align-items: center; align-items: center;
display: -webkit-flex; display: -webkit-flex;
height: 100%; height: 100%;
text-align: center; text-align: center;
} }
.passImg{ .passImg{
max-width: 86%; max-width: 86%;
max-height: 100%; max-height: 100%;
} }
/* ImageLayer ----------------- End */ /* ImageLayer ----------------- End */
.passTaskContent{ .passTaskContent{
width: 652px; width: 652px;
height:100%; height:100%;
margin:0px auto; margin:0px auto;
margin-top: 4%; margin-top: 4%;
} }
.passTaskImg{ .passTaskImg{
position: absolute; position: absolute;
z-index: 2; z-index: 2;
user-select: none; user-select: none;
} }
.winpPerson{ .winpPerson{
position: absolute; position: absolute;
width: 100%; width: 100%;
z-index: 3; z-index: 3;
color: #D1A448; color: #D1A448;
text-align: center; text-align: center;
margin-top:304px; margin-top:304px;
font-size: 18px; font-size: 18px;
} }
.winPanel{ .winPanel{
position: absolute; position: absolute;
width: 308px; width: 308px;
z-index: 5; z-index: 5;
height: 356px; height: 356px;
border-radius: 10px; border-radius: 10px;
margin:0px auto; margin:0px auto;
top:435px; top:435px;
left: 50%; left: 50%;
margin-left: -154px; margin-left: -154px;
text-align: center; text-align: center;
} }
.inline{ .inline{
display: inline-block; display: inline-block;
width: auto; width: auto;
line-height: 26px; line-height: 26px;
font-size: 16px; font-size: 16px;
} }
.inline.exp { .inline.exp {
margin-left: 18px; margin-left: 18px;
} }
.inline img{ /*.inline img{*/
margin-right: 8px; /*margin-right: 8px;*/
} /*}*/
.goldring{ .goldring{
margin-right: 8px; margin-right: 8px;
width: 17px; width: 17px;
height: 17px; height: 17px;
border-radius: 50%; border-radius: 50%;
background-color: #FFD633; background-color: #FFD633;
display: block; display: block;
float: left; float: left;
margin-top: 5px; margin-top: 5px;
} }
.passNext{ .passNext{
width:120px; width:120px;
height:30px; height:30px;
line-height:30px; line-height:30px;
border-radius: 2px; border-radius: 2px;
display: block; display: block;
background-color:#CCC; background-color:#CCC;
color:#fff!important; color:#fff!important;
margin: 0px auto; margin: 0px auto;
} }
.passed{ .passed{
width:120px; width:120px;
height:30px; height:30px;
line-height:30px; line-height:30px;
border-radius: 2px; border-radius: 2px;
display: block; display: block;
color:#fff!important; color:#fff!important;
margin: 0px auto; margin: 0px auto;
margin-top: 12px; margin-top: 12px;
background-color: #CCCCCC; background-color: #CCCCCC;
} }
.passed.stared { .passed.stared {
background-color:#4CACFF; background-color:#4CACFF;
opacity: 0.8; opacity: 0.8;
} }
.passed.stared:hover { .passed.stared:hover {
opacity: 1; opacity: 1;
}
.vertical4{
vertical-align: -4px;
} }

2
public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
Unescape View File

@ -476,7 +476,7 @@ class DetailCardsEditAndEdit extends Component{
footer={null} footer={null}
width="840px" width="840px"
destroyOnClose={true} destroyOnClose={true}
>Z >
<Spin spinning={hometypepvisible} size="large" style={{marginTop:'15%'}}> <Spin spinning={hometypepvisible} size="large" style={{marginTop:'15%'}}>
<div className="newupload_conbox"> <div className="newupload_conbox">
<div className="clearfix mb20 shixun_work_div newshixun_tab_div cdefault" style={{"marginRight":"4px"}} id="shixun_tab_div"> <div className="clearfix mb20 shixun_work_div newshixun_tab_div cdefault" style={{"marginRight":"4px"}} id="shixun_tab_div">

11
public/react/src/modules/tpm/NewFooter.js
Unescape View File

@ -37,7 +37,16 @@ class NewFooter extends Component {
</ul> </ul>
</div> </div>
<div> <div>
<p className="footer_con-p inline lineh-30 font-14"><span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</p> <p className="footer_con-p inline lineh-30 font-14">
<span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder
<a style={{"color":"#888"}} target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>
<a style={{"color":"#888"}} target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962" className="mr15">
<img className="vertical4" src={require('./beian.png')}/>湘公网安备43019002000962号
</a>
<a href="https://team.trustie.net" style={{"color":"#888"}}
target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside. <span
className="mr15">版权所有 湖南智擎科技有限公司</span>
</p>
</div> </div>
<div className="cl"></div> <div className="cl"></div>
</div> </div>

BIN
public/react/src/modules/tpm/beian.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

Write Preview
Loading…
Cancel
Save