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

调整tpm 相关

Browse Source
chromesetting
杨树明 5 years ago
parent f260de72a8
commit 1f76671c50
4 changed files with 116 additions and 81 deletions
Show Stats Download Patch File Download Diff File

2
public/react/config/webpack.config.dev.js
Unescape View File

@ -32,7 +32,7 @@ module.exports = {
// See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
// devtool: "cheap-module-eval-source-map", // devtool: "cheap-module-eval-source-map",
// 开启调试 // 开启调试
//devtool: "source-map", // 开启调试 devtool: "source-map", // 开启调试
// These are the "entry points" to our application. // These are the "entry points" to our application.
// This means they will be the "root" imports that are included in JS bundle. // This means they will be the "root" imports that are included in JS bundle.
// The first two entry points enable "hot" CSS and auto-refreshes for JS. // The first two entry points enable "hot" CSS and auto-refreshes for JS.

110
public/react/src/modules/tpm/TPMIndex.js
Unescape View File

@ -301,9 +301,6 @@ class TPMIndex extends Component {
}else if(location.pathname.indexOf('/settings')!=-1){ }else if(location.pathname.indexOf('/settings')!=-1){
selectedKeys="9" selectedKeys="9"
} }
console.log("进入")
console.log(selectedKeys)
this.setState({ this.setState({
selectedKeys:selectedKeys selectedKeys:selectedKeys
}) })
@ -364,62 +361,57 @@ class TPMIndex extends Component {
} }
</style> </style>
<Row type="flex" className={"backgroudwhite"}> <Row type="flex" className={"backgroudwhite"}>
<Col span={5}></Col> <div className={"educontent clearfix"}>
<Col span={24}>
<Col span={14}>
<Menu onClick={this.handleClick} selectedKeys={[this.state.selectedKeys]} mode="horizontal">
<Menu onClick={this.handleClick} selectedKeys={[this.state.selectedKeys]} mode="horizontal">
<Menu.Item key="1" className={"competitionmr50"}>
<Menu.Item key="1" className={"competitionmr50"}> <span className={"tpmbannernavstyler"}>任务</span>
<span className={"tpmbannernavstyler"}>任务</span> </Menu.Item>
</Menu.Item>
{ this.state.propaedeutics===undefined?"":this.state.propaedeutics===false?"":<Menu.Item key="2" className={"competitionmr50"}>
{ this.state.propaedeutics===undefined?"":this.state.propaedeutics===false?"":<Menu.Item key="2" className={"competitionmr50"}> <span className={"tpmbannernavstyler"}>背景知识</span>
<span className={"tpmbannernavstyler"}>背景知识</span> </Menu.Item>}
</Menu.Item>}
{ this.state.identity >4||this.state.identity===undefined ?"":
{ this.state.identity >4||this.state.identity===undefined ?"": this.state.is_jupyter===false?<Menu.Item key="3" className={"competitionmr50"}>
this.state.is_jupyter===false?<Menu.Item key="3" className={"competitionmr50"}> <span className={"tpmbannernavstyler"}>版本库</span>
<span className={"tpmbannernavstyler"}>版本库</span> </Menu.Item>:""}
</Menu.Item>:""}
{this.state.identity >4||this.state.identity===undefined ?"": this.state.secret_repository && <Menu.Item key="4" className={"competitionmr50"}>
{this.state.identity >4||this.state.identity===undefined ?"": this.state.secret_repository && <Menu.Item key="4" className={"competitionmr50"}> <span className={"tpmbannernavstyler"}>私密版本库</span>
<span className={"tpmbannernavstyler"}>私密版本库</span> </Menu.Item>}
</Menu.Item>}
<Menu.Item key="5" className={"competitionmr50"}>
<Menu.Item key="5" className={"competitionmr50"}> <span className={"tpmbannernavstyler"}>合作者</span>
<span className={"tpmbannernavstyler"}>合作者</span> </Menu.Item>
</Menu.Item>
{ this.state.is_jupyter===true?<Menu.Item key="6" className={"competitionmr50"}>
{ this.state.is_jupyter===true?<Menu.Item key="6" className={"competitionmr50"}> <span className={"tpmbannernavstyler"}>数据集</span>
<span className={"tpmbannernavstyler"}>数据集</span> </Menu.Item>:""}
</Menu.Item>:""}
{ this.state.is_jupyter===false?<Menu.Item key="7" className={"competitionmr50"}>
{ this.state.is_jupyter===false?<Menu.Item key="7" className={"competitionmr50"}> <span className={"tpmbannernavstyler"}>评论</span>
<span className={"tpmbannernavstyler"}>评论</span> </Menu.Item>:""}
</Menu.Item>:""}
{ this.state.is_jupyter===false? <Menu.Item key="8" className={"competitionmr50"}>
{ this.state.is_jupyter===false? <Menu.Item key="8" className={"competitionmr50"}> <span className={"tpmbannernavstyler"}>排行榜</span>
<span className={"tpmbannernavstyler"}>排行榜</span> </Menu.Item>:""}
</Menu.Item>:""}
{this.state.identity >4||this.state.identity===undefined ? "":<Menu.Item key="9" className={"competitionmr50"}>
{this.state.identity >4||this.state.identity===undefined ? "":<Menu.Item key="9" className={"competitionmr50"}> <span className={"tpmbannernavstyler"}>配置</span>
<span className={"tpmbannernavstyler"}>配置</span> </Menu.Item>}
</Menu.Item>}
{this.state.identity >2||this.state.identity===undefined?"":
{this.state.identity >2||this.state.identity===undefined?"": <div className={"fr"}>
<div className={"fr"}> <Link to={`/shixuns/${this.props.match.params.shixunId}/audit_situation`}
<Link to={`/shixuns/${this.props.match.params.shixunId}/audit_situation`} className={`${this.props.match.url.indexOf('audit_situation') != -1 ? 'font-16 audit_situationactive' : 'font-16 audit_situationactive'} fl`}>审核情况</Link>
className={`${this.props.match.url.indexOf('audit_situation') != -1 ? 'font-16 audit_situationactive' : 'font-16 audit_situationactive'} fl`}>审核情况</Link> </div>
</div> }
} </Menu>
</Menu> </Col>
</div>
</Col>
<Col span={5}></Col>
</Row> </Row>
{/*筛选*/} {/*筛选*/}

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

@ -134,3 +134,23 @@
border-right: 1px solid #eeeeee; border-right: 1px solid #eeeeee;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
} }
.space-between{
justify-content:space-between
}
.heighthezuo34{
height:34px;
line-height: 34px;
}
.hezuozhe660{
width: 660px;
}
.color333hezuo{
color:#333333;
}
.color888hezuo{
color:#888888;
}

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

@ -453,29 +453,52 @@ class Collaborators extends Component {
// console.log(Searchadmin) // console.log(Searchadmin)
return ( return (
<React.Fragment> <React.Fragment>
<p className=" mt30 sortinxdirection" <style>
{
`
.sortinxdirectionbox{
height: 76px;
border-bottom: 1px solid #F4F4F4;
}
.pt25{
padding-top:25px;
}
`
}
</style>
<p className="sortinxdirection sortinxdirectionbox"
style={{display:this.props.identity<5?"flex":"none"}} style={{display:this.props.identity<5?"flex":"none"}}
> >
<div className="yslwushiwidth"> <div className="yslwushiwidth">
<p className="edu-default-btn edu-greenback-btn ml20 height28 yslwushiwidthcolortest">共{collaboratorList&&collaboratorList.length}人</p> <p className="edu-default-btn edu-greenback-btn ml20 height28 mt25 color333hezuo">{collaboratorList&&collaboratorList.length}人</p>
</div> </div>
<div className="yslwushiwidth xaxisreverseorder"> <div className="yslwushiwidth xaxisreverseorder pt25">
<a onClick={() => this.showCollaboratorsvisible("cooperation")} {/*<a onClick={() => this.showCollaboratorsvisible("cooperation")}*/}
className="edu-default-btn edu-greenback-btn mr20 height40 yslwushiwidthbuton" {/* className="edu-default-btn edu-greenback-btn mr20 height40 yslwushiwidthbuton"*/}
data-remote="true"> {/* data-remote="true">*/}
<span className={"line27"}>+ </span>添加合作者 {/* <span className={"line27"}>+ </span>添加合作者*/}
</a> {/*</a>*/}
<a onClick={() => this.showCollaboratorsvisible("admin")} {/*<a onClick={() => this.showCollaboratorsvisible("admin")}*/}
style={{display:this.props.identity===1?"flex":"none"}} {/* style={{display:this.props.identity===1?"flex":"none"}}*/}
data-remote="true" {/* data-remote="true"*/}
className="edu-default-btn edu-greenback-btn mr20 height40 yslwushiwidthbuton"> {/* className="edu-default-btn edu-greenback-btn mr20 height40 yslwushiwidthbuton">*/}
<p style={{ {/* <p style={{*/}
textAlign: "center", {/* textAlign: "center",*/}
width:'100%', {/* width:'100%',*/}
lineHeight: "29px", {/* lineHeight: "29px",*/}
}}>更换管理员</p> {/* }}>更换管理员</p>*/}
</a> {/*</a>*/}
<Button type="primary"
onClick={() => this.showCollaboratorsvisible("cooperation")}
className="edu-default-btn edu-greenback-btn mr20 heighthezuo34 yslwushiwidthbuton"
>添加合作者</Button>
<Button type="primary" ghost
style={{display:this.props.identity===1?"flex":"none"}}
onClick={() => this.showCollaboratorsvisible("admin")}
className="edu-default-btn mr20 heighthezuo34">
更换管理员
</Button>
</div> </div>
@ -633,10 +656,10 @@ class Collaborators extends Component {
</p> </p>
<p className="color-grey-B2 font-12 mb10 sortinxdirection mt14"> <p className="color-grey-B2 font-12 mb10 sortinxdirection mt14">
<p className="yslwushiwidth90 sortinxdirection"> <p className="hezuozhe660 sortinxdirection space-between">
<p className={item.user.identity===null||item.user.identity===undefined||item.user.identity===""?" font-16 ":"mr20 font-16 w70"}>{item.user.identity}</p> {/*<p className={item.user.identity===null||item.user.identity===undefined||item.user.identity===""?" font-16 ":"mr20 font-16 w70"}>{item.user.identity}</p>*/}
<p className={item.user.school_name===null||item.user.school_name===""?"":"mr40 font-16 maxnamewidth150"}>{item.user.school_name}</p> <p className={item.user.school_name===null||item.user.school_name===""?"":"mr40 font-16 maxnamewidth150"}>{item.user.school_name}</p>
<p className="fabushixunwidth">发布实训项目&nbsp;&nbsp;<span className="fabushixunwidthcolor ml2">{item.user.user_shixuns_count}</span></p> <p className="fabushixunwidth color888hezuo">发布实训项目&nbsp;&nbsp;<span className="ml2">{item.user.user_shixuns_count}</span></p>
</p> </p>
<div className="xaxisreverseorder yslwushiwidth10"> <div className="xaxisreverseorder yslwushiwidth10">
{item.user.shixun_manager === true ? "" : {item.user.shixun_manager === true ? "" :

Write Preview
Loading…
Cancel
Save