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

调整

Browse Source
dev_admin
杨树明 6 years ago
parent 3bfaeb7a6b
commit ea9f8adb1b
4 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File

32
public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
Unescape View File

@ -55,9 +55,11 @@ class PackageIndexNEITaskDetails extends Component {
getdatas=()=>{
let url =`/project_packages/${this.props.match.params.id}.json`;
axios.get(url).then((response) => {
this.setState({
data:response.data
})
if(response.data.status!=401&&response.data.status!=403&&response.data.status!=408&&response.data.status!=409)[
this.setState({
data:response.data
})
]
}).catch((error) => {
console.log(error);
@ -236,8 +238,12 @@ class PackageIndexNEITaskDetails extends Component {
render() {
let {overtype,data}=this.state;
// console.log(data&&data.creator.login)
console.log(data)
// console.log(data&&data.creator.id)
let datalogin=data&&data.creator.id;
let userlogin=this.props.current_user&&this.props.current_user.user_id;
console.log(datalogin===userlogin)
// console.log(this.props.current_user&&this.props.current_user.user_id)
return (
data===undefined?"":<div>
<div className="clearfix">
@ -258,11 +264,9 @@ class PackageIndexNEITaskDetails extends Component {
<Breadcrumb.Item><span className={"tabelcli"} title={data&&data.title}>{data&&data.title}</span></Breadcrumb.Item>
</Breadcrumb>
<a className="color-grey-6 fr font-15 mr20" onClick={this.goback}>返回</a>
<a className="color-grey-6 fr font-18 mr20" onClick={this.goback}>返回</a>
<div className="mb20">
<p className="clearfix ">
<p className="clearfix">
<div className={"stud-class-set coursenavbox edu-back-white mt20"}>
<div className={"ant-row contentbox mdInForm "}>
@ -289,12 +293,12 @@ class PackageIndexNEITaskDetails extends Component {
{data&&data.creator.name}
</div>
{data&&data.creator.login===this.props.current_user&&this.props.current_user.login?"":<div className=" edu-back-white ml5 mt10 "
{datalogin===userlogin===true?"":<div className=" edu-back-white ml5 mt10 "
onMouseOver={this.setover}
onMouseOut={this.setout}
>
{overtype===false?<a className="ContacttheTA fl" target="_blank" href={`/message/${data&&data.creator.login}/message_detail?target_ids=${data&&data.creator.id}`}> <img alt="头像" class="mr5" src={require('./newsone.png')} />联系TA</a>:
<a className="ContacttheTAs fl" target="_blank" href={`/message/${data&&data.creator.login}/message_detail?target_ids=${data&&data.creator.id}`}> <img alt="头像" className="mr5"
{overtype===false?<a className="ContacttheTA fl" target="_blank" href={`/message/${this.props.current_user&&this.props.current_user.user_id}/message_detail?target_ids=${data&&data.creator.id}`}> <img alt="头像" class="mr5" src={require('./newsone.png')} />联系TA</a>:
<a className="ContacttheTAs fl" target="_blank" href={`/message/${this.props.current_user&&this.props.current_user.user_id}/message_detail?target_ids=${data&&data.creator.id}`}> <img alt="头像" className="mr5"
src={require('./newstwo.png')}/>联系TA</a>}
</div>}
</div>
@ -304,7 +308,7 @@ class PackageIndexNEITaskDetails extends Component {
<div className=" item-body">
<div className=" item-head mbf10">
<div className=" item-head mbf10 mt15 ">
<div className=" item-head-title ">
<span className={"fl mt3 font-18 font-bd color-dark maxwidth700 "}
@ -407,7 +411,7 @@ class PackageIndexNEITaskDetails extends Component {
{item.status==="bidding_won"?<img src={gouxuan} className="yslgouxuanimg"/>:""}
<a href={`/users/${item.login}`}><img className="div1imgs" src={getImageUrl("images/"+item.image_url)}/></a>
<div className="textall mt10" title={item.name}> <p className="ptext">{item.name}</p></div>
{this.props.current_user&&this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" target="_blank" href={`/message/${item.login}/message_detail?target_ids=${item.id}`}>
{this.props.current_user&&this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" target="_blank" href={`/message/${this.props.current_user&&this.props.current_user.user_id}/message_detail?target_ids=${item.id}`}>
<img alt="头像" className="mr5" src={require('./newstwo.png')}/>联系TA
</a>:""}
</div>

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

@ -692,7 +692,7 @@ class TPMBanner extends Component {
</div>
{
startbtn === false ?
startbtn === false && shixunsDetails.shixun_status != -1 ?
<Tooltip placement="bottom" title={
shixunsDetails.task_operation === undefined ? "" : shixunsDetails.task_operation[0] === "开始实战" ? "开始学习并完成实战任务" : shixunsDetails.task_operation[0] === "继续挑战" ? "继续完成后续学习和实战任务" :
shixunsDetails.task_operation[0] === "查看实战" ? "查看我的实战光辉历史" :
@ -843,7 +843,7 @@ class TPMBanner extends Component {
<a onClick={this.Senttothe}
className="fr user_default_btn user_blue_btn mr20 font-18"
data-tip-down=""
style={{display: shixunsDetails.shixun_status === 0 || shixunsDetails.shixun_status === 3 ||shixunsDetails.shixun_status === 1 ? "none" : "block"}}
style={{display: shixunsDetails.shixun_status === 0 || shixunsDetails.shixun_status === 3 ||shixunsDetails.shixun_status === 1 ||shixunsDetails.shixun_status === -1 ? "none" : "block"}}
data-remote="true">
<Tooltip placement="bottom" title={"以实训作业的形式发送到我的课堂"}>
发送至
@ -913,7 +913,12 @@ class TPMBanner extends Component {
<a className="fr user_default_btn edu-greyback-btn mr15 font-18">已关闭</a>
}
{this.props.identity < 8?<div className="fr user_default_btn user_blue_btn mr20"
{shixunsDetails.shixun_status === -1 &&
<a className="fr user_default_btn edu-greyback-btn mr15 font-18">已删除</a>
}
{this.props.identity < 8&&shixunsDetails.shixun_status != -1 ?<div className="fr user_default_btn user_blue_btn mr20"
style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
<Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
<span className="flex1 edu-txt-center fl font-18"

16
public/react/src/modules/tpm/TPMsettings/TPMsettings.js
Unescape View File

@ -727,6 +727,12 @@ export default class TPMsettings extends Component {
// });
// }
submit_edit_shixun = () => {
if(this.state.status===-1){
this.props.showSnackbar("该实训已被删除，保存失败！");
return
}
let {
name, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum,
evaluate_script, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh,
@ -739,13 +745,15 @@ export default class TPMsettings extends Component {
return v1
});
let operateauthority=this.props.identity<5&&this.state.status==0||this.props.identity===1&&this.state.status==2||this.props.identity===1&&this.state.status==1;
// let operateauthority=
// this.props.identity===1?true:this.props.identity<5&&this.state.status==0?true:false;
// this.props.identity<5&&this.state.status==0||this.props.identity===1&&this.state.status==2||this.props.identity===1&&this.state.status==1;
const description_editormd = this.description_editormd.getValue();
let evaluate_script_editormd;
if(operateauthority===true){
if(this.state.status==0||this.state.status==1||this.state.status==2&&this.props.identity===1){
// evaluate_script_editormd = this.evaluate_script_editormd.getValue();
evaluate_script_editormd = shixunmemoMDvalue
}else{
@ -753,6 +761,7 @@ export default class TPMsettings extends Component {
}
if (name === "") {
this.setState({
shixunnametype: true
@ -826,6 +835,7 @@ export default class TPMsettings extends Component {
if(newmulti_webssh===null){
newmulti_webssh=false
}
//exec_time: exec_time,
let Url = `/shixuns/` + id + `.json`;
let data = {
@ -1625,8 +1635,8 @@ export default class TPMsettings extends Component {
options={ {
selectOnLineNumbers: true
}}
onChange={operateauthority===true?this.getshixunmemoMDvalue:""}
// onChange={this.getshixunmemoMDvalue}
/>
</div>

4
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -3122,7 +3122,7 @@ a.singlepublishtwo{
height: 40px;
}
.project-package-item .item-head-title {
max-width: 700px;
max-width: 650px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@ -3213,7 +3213,7 @@ a.singlepublishtwo{
font-size: 20px;
}
.project-package-item.with-operator:hover .item-head-title {
max-width: 600px;
max-width: 650px;
}
.list-count {

Write Preview
Loading…
Cancel
Save