杨树林 5 years ago
commit 3c6a434393

@ -1799,6 +1799,11 @@ ol.linenums{margin-top:0;margin-bottom:0}li.L1,li.L3,li.L5,li.L7,li.L9{backgroun
.page--body {
margin-top: 54px;
}
#myshixun_top {
display: flex;
height: 54px;
}
.yslflexhome {
display: flex;
flex-direction: row;

@ -553,19 +553,28 @@ class Coursesleftnav extends Component{
// notification.open({
// message: "删除成功",
// });
window.location.href = url;
// this.props.history.replace(url);
window.location.href = url;
}
deletenavchilds=(url)=>{
deletenavchilds=(url,mainurl)=>{
axios.delete(url).then((result)=>{
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)=>{
console.log(error)
})
}
deleteSecondary=(e,type,id)=>{
deleteSecondary=(e,type,id,mainurl)=>{
e.stopPropagation();//阻止冒泡
if(type===1){
let url="/course_second_categories/"+id+".json"
@ -593,7 +602,7 @@ class Coursesleftnav extends Component{
ModalsType:true,
Modalstopval:"该目录下的内容将被移动到父目录,",
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==="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>)
}

@ -40,7 +40,8 @@ class coursesHomeCard extends Component{
className="mt80 mb25"/>
<p className="font-14 color-white">非成员不能访问</p>
</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"*/}
{
item.is_public===1&&item.id===1309?

@ -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>
</li>
{
shixunmodallist && shixunmodallist.tags.map((item,key)=>{
return(
<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>
</li>
)
})
}
{/*{*/}
{/*shixunmodallist && shixunmodallist.tags.map((item,key)=>{*/}
{/*return(*/}
{/*<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>*/}
{/*</li>*/}
{/*)*/}
{/*})*/}
{/*}*/}
</div>
<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">
<li className="fl with40 paddingleft22" >实训名称</li>
<li className="fl with30 edu-txt-left">使用院校</li>
<li className="fl with10">使用人数</li>
<li className="fl with10">评价等级</li>
<li className="fl with30 edu-txt-left">院校</li>
<li className="fl with10">学习人数</li>
<li className="fl with10">难度</li>
<li className="fl with10"></li>
</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>
</Checkbox>
</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 color-orange-tip paddingl10">{item.preference}</li>
<li className="fl with10 color-orange-tip paddingl10">{item.level}</li>
<Tooltip title="新窗口查看详情">
<li className="fl with10"><a className="color-blue" href={"/shixuns/"+item.identifier+"/challenges"} target="_blank">详情</a></li>
</Tooltip>

@ -96,13 +96,13 @@ class Header extends Component {
*/}
</div>
<div className="-header-right clearfix">
{(grade || grade == 0) && <div className="-header-right clearfix">
{/*<img src="/images/task/coin.png" className="fl" width="30" height="30" alt=""/>*/}
<span style={{width:'20px', height:'20px', background:'#FFD633', borderRadius: '10px', marginTop: '3px' }} className="fl"></span>
<span className="ml5 color-white fl" id="user_grade">
<a href={`${user.user_url}/user_grade`} target="_blank">{ grade === 0 ? grade : (grade || '')}</a>
</span>
</div>
</div>}

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

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

@ -37,7 +37,16 @@ class NewFooter extends Component {
</ul>
</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">ICP17009477</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 className="cl"></div>
</div>

@ -1316,13 +1316,19 @@ export default class TPMsettings extends Component {
// onMouseEnter={operateauthority?this.bigopen:""}
onSelect={operateauthority?this.bigopens:""}
// open={opers}
showSearch
optionFilterProp="children"
filterOption={(input, option) =>
option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
}
>
{
settingsData === undefined ? "" : settingsData.shixun.main_type.map((item, key) => {
return(
<Option value={item.id} key={key} title={item.description}>{item.type_name}</Option>
<Option value={item.id} key={key} title={item.description} >{item.type_name}</Option>
)
})
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

@ -174,6 +174,9 @@ export default class TPManswer extends Component {
if (response.data.message) {
this.props.showSnackbar(response.data.message);
}
if (response.data.status == 1) {
$("html").animate({ scrollTop: 0 })
}
}
}).catch((error) => {

@ -58,7 +58,7 @@ export default class TPMchallengesnew extends Component {
marktype:false,
editPracticesendtype:false,
CreatePracticesendtype:false,
exec_time:undefined
exec_time:20
}
}
@ -230,6 +230,8 @@ export default class TPMchallengesnew extends Component {
}).then((response) => {
this.props.showSnackbar(response.data.messages);
if (response.data.status === 1) {
$("html").animate({ scrollTop: 0 })
this.setState({
setopen: true,
tab2url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2",

@ -930,7 +930,7 @@ export default class TPMevaluation extends Component {
<span className="top-black-trangleft"></span>
<div className="padding20 invitecontent clearfix">
<p className="font-12 edu-txt-left">
图片处理或输出图片类型的任务请选此项<br/>
图片处理或输出图片类型的任务请选此项<br/>
可以通过设置图片路径和学员答案文件路径展示代码对应的图片效果<br/><br/>
apk/exe写可执行文件的任务请选填此项<br/>
可以通过设置学员答案文件路径展示二维码以供扫码下载<br/><br/>

Loading…
Cancel
Save