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

调整

Browse Source
dev_auth
杨树林 6 years ago
parent 08031c0b39
commit d4d6a54e54
5 changed files with 301 additions and 172 deletions
Show Stats Download Patch File Download Diff File

8
public/react/src/App.js
Unescape View File

@ -275,7 +275,7 @@ class App extends Component {
Addcoursestypes:false, Addcoursestypes:false,
mydisplay:false, mydisplay:false,
occupation:0, occupation:0,
getHelmetapi:undefined, mygetHelmetapi:undefined,
} }
} }
@ -359,7 +359,7 @@ class App extends Component {
if(response){ if(response){
if(response.data){ if(response.data){
this.setState({ this.setState({
getHelmetapi:response.data.setting mygetHelmetapi:response.data.setting
}); });
document.title = response.data.setting.name; document.title = response.data.setting.name;
var link = document.createElement('link'), var link = document.createElement('link'),
@ -412,9 +412,9 @@ class App extends Component {
}; };
render() { render() {
let{getHelmetapi}=this.state; let{mygetHelmetapi}=this.state;
// console.log("appappapp"); // console.log("appappapp");
// console.log(getHelmetapi); // console.log(mygetHelmetapi);
return ( return (
<LocaleProvider locale={zhCN}> <LocaleProvider locale={zhCN}>

4
public/react/src/modules/login/EducoderLogin.js
Unescape View File

@ -154,10 +154,10 @@ class EducoderLogin extends Component {
}}> }}>
<div style={{cursor:"pointer"}}> <div style={{cursor:"pointer"}}>
{ {
this.props.getHelmetapi===undefined||this.props.getHelmetapi.login_logo_url===null|| this.props.getHelmetapi.login_logo_url===undefined? this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.login_logo_url===null|| this.props.mygetHelmetapi.login_logo_url===undefined?
<img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/> <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
: :
<img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={getImageUrl(this.props.getHelmetapi.login_logo_url)}/> <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/>
} }
</div> </div>

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

@ -40,7 +40,7 @@ class NewFooter extends Component {
</div> </div>
<div> <div>
{ {
this.props.getHelmetapi===undefined|| this.props.getHelmetapi.footer===null||this.props.getHelmetapi.footer===undefined? this.props.mygetHelmetapi===undefined|| this.props.mygetHelmetapi.footer===null||this.props.mygetHelmetapi.footer===undefined?
<p className="footer_con-p inline lineh-30 font-14"> <p className="footer_con-p inline lineh-30 font-14">
<span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder <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://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>
@ -52,7 +52,7 @@ class NewFooter extends Component {
className="mr15">版权所有 湖南智擎科技有限公司</span> className="mr15">版权所有 湖南智擎科技有限公司</span>
</p> </p>
: :
<div dangerouslySetInnerHTML={{__html: this.props.getHelmetapi.footer}}></div> <div dangerouslySetInnerHTML={{__html: this.props.mygetHelmetapi.footer}}></div>
} }

451
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -65,7 +65,9 @@ class NewHeader extends Component {
showTrial:false, showTrial:false,
setevaluatinghides:false, setevaluatinghides:false,
occupation:0, occupation:0,
mydisplay:false mydisplay:false,
headtypesonClickbool:false,
headtypess:"/"
} }
console.log("176") console.log("176")
// console.log(props); // console.log(props);
@ -636,11 +638,17 @@ submittojoinclass=(value)=>{
this.setState({ this.setState({
AccountProfiletype:false AccountProfiletype:false
}) })
};
headtypesonClick=(url,bool)=>{
this.setState({
headtypess:url,
headtypesonClickbool:bool,
})
} }
render() { render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。 const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
const {match ,} = this.props; const {match,} = this.props;
let {Addcoursestypes, let {Addcoursestypes,
tojoinitemtype, tojoinitemtype,
@ -658,6 +666,8 @@ submittojoinclass=(value)=>{
user, user,
isRender, isRender,
showSearchOpentype, showSearchOpentype,
headtypesonClickbool,
headtypess,
}=this.state; }=this.state;
/* /*
用户名称 用户头像url 用户名称 用户头像url
@ -669,26 +679,95 @@ submittojoinclass=(value)=>{
let coursestype=false; let coursestype=false;
let activePackages=false; let activePackages=false;
let activeMoopCases=false; let activeMoopCases=false;
let headtypes='/';
if (match.path === '/forums') {
activeForums = true;
} else if (match.path.startsWith('/shixuns')) {
activeShixuns = true;
}else if (match.path.startsWith('/paths')) {
activePaths = true;
} else if (match.path.startsWith('/courses')) {
coursestype = true;
}else if (match.path.startsWith('/crowdsourcing')) {
activePackages = true;
}else if(match.path.startsWith('/moop_cases')){
activeMoopCases = true;
}else {
activeIndex = true;
}
console.log("NewHeader"); if(this.props.mygetHelmetapi){
console.log(this.props); if(this.props.mygetHelmetapi.navbar){
if(this.props.mygetHelmetapi.navbar.length>0){
// console.log("this.props.mygetHelmetapi.navbar.length>0====-=-=--=-=-=-=");
// console.log(this.props);
// console.log(match.path);
if(match.path==='/'){
if(headtypesonClickbool===false){
headtypes=undefined;
}else{
headtypes=headtypess;
}
}else {
for(var i=0;i<this.props.mygetHelmetapi.navbar.length;i++){
if(match.path===this.props.mygetHelmetapi.navbar[i].link){
headtypes=this.props.mygetHelmetapi.navbar[i].link;
break;
}
}
}
}else{
if (match.path === '/forums') {
headtypes = '/forums';
} else if (match.path.startsWith('/shixuns')) {
headtypes = '/shixuns';
}else if (match.path.startsWith('/paths')) {
headtypes = '/paths';
} else if (match.path.startsWith('/courses')) {
headtypes = '/courses';
}else if (match.path.startsWith('/competitions')) {
headtypes = '/competitions';
}else if (match.path.startsWith('/crowdsourcing')) {
headtypes = '/crowdsourcing';
}else if(match.path.startsWith('/moop_cases')){
headtypes = '/moop_cases';
}else {
headtypes = '/';
}
}
}else{
if (match.path === '/forums') {
headtypes = '/forums';
} else if (match.path.startsWith('/shixuns')) {
headtypes = '/shixuns';
}else if (match.path.startsWith('/paths')) {
headtypes = '/paths';
} else if (match.path.startsWith('/courses')) {
headtypes = '/courses';
}else if (match.path.startsWith('/competitions')) {
headtypes = '/competitions';
}else if (match.path.startsWith('/crowdsourcing')) {
headtypes = '/crowdsourcing';
}else if(match.path.startsWith('/moop_cases')){
headtypes = '/moop_cases';
}else {
headtypes = '/';
}
}
}else{
if (match.path === '/forums') {
headtypes = '/forums';
} else if (match.path.startsWith('/shixuns')) {
headtypes = '/shixuns';
}else if (match.path.startsWith('/paths')) {
headtypes = '/paths';
} else if (match.path.startsWith('/courses')) {
headtypes = '/courses';
}else if (match.path.startsWith('/competitions')) {
headtypes = '/competitions';
}else if (match.path.startsWith('/crowdsourcing')) {
headtypes = '/crowdsourcing';
}else if(match.path.startsWith('/moop_cases')){
headtypes = '/moop_cases';
}else {
headtypes = '/';
}
}
// console.log("NewHeadergetHelmetapi432423423423");
// console.log(this.props.mygetHelmetapi);
console.log("NewHeadermygetHelmetapi123123123123");
console.log(this.props);
console.log(this.props.mygetHelmetapi);
return ( return (
<div className="newHeaders" id="nHeader" > <div className="newHeaders" id="nHeader" >
@ -704,14 +783,14 @@ submittojoinclass=(value)=>{
{...this.props} {...this.props}
{...this.state} {...this.state}
/>:""} />:""}
<Link to="/" className={"fl mr30 ml25 mt10"}> <a href={"/"} onClick={()=>this.headtypesonClick("/",false)} className={"fl mr30 ml25 mt10"}>
{ {
this.props.getHelmetapi===undefined||this.props.getHelmetapi.nav_logo_url===null||this.props.getHelmetapi.nav_logo_url===undefined? this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.nav_logo_url===null||this.props.mygetHelmetapi.nav_logo_url===undefined?
<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img> <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
: :
<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(this.props.getHelmetapi.nav_logo_url)}></img> <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(this.props.mygetHelmetapi.nav_logo_url)}></img>
} }
</Link> </a>
<style> <style>
{ {
@ -724,153 +803,203 @@ submittojoinclass=(value)=>{
` `
} }
</style> </style>
<div className="educontents fl"> {
{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/} this.props.mygetHelmetapi!==undefined&&this.props.mygetHelmetapi.navbar!==null&&this.props.mygetHelmetapi.navbar!==undefined&&this.props.mygetHelmetapi.navbar.length>0?
<div className="head-nav pr" id={"head-navpre1"}>
<ul id="header-nav">
{ {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
this.props.getHelmetapi===undefined||this.props.getHelmetapi.navbar===null||this.props.getHelmetapi.navbar===undefined||this.props.getHelmetapi.navbar.length===0? {/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
<div className="head-nav pr"> {
<ul id="header-nav"> this.props.mygetHelmetapi.navbar && this.props.mygetHelmetapi.navbar.map((item,key)=>{
{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/} // console.log("headtypes");
// console.log(headtypes);
{/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/} return(
<li key={key} className={`${headtypes===undefined?'pr':headtypes===item.link?'pr active':'pr'}`}>
<a href={item.link} onClick={()=>this.headtypesonClick(item.link,true)}>{item.name}</a>
<li className={`${activePaths === true ? 'pr active' : 'pr'}`}> </li>
<Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link> )
</li> })
}
{/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/} {/*<li className={`${activePaths === true ? 'pr active' : 'pr'}`}>*/}
{/* <Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>*/}
<li className={`${coursestype === true ? 'pr active' : 'pr'}`}> {/*</li>*/}
{/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/} {/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
{/*<li className={`${coursestype === true ? 'pr active' : 'pr'}`}>*/}
<Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link> {/* /!*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*!/*/}
</li> {/* <Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link>*/}
{/*</li>*/}
<li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
<Link to="/shixuns">实训项目</Link> {/*<li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>*/}
<img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img"> {/* <Link to="/shixuns">实训项目</Link>*/}
</img> {/* <img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">*/}
</li> {/* </img>*/}
{/*</li>*/}
<li className="fl edu-menu-panel careershover "
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
<a>职业路径</a> {/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<div {/*<li className="">*/}
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}> {/* <a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>*/}
<ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}> {/* <img className="roundedRectangles"*/}
{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => { {/* src={require('./roundedRectangle.png')}*/}
return( {/* />*/}
<li key={key}><i className="iconfont icon-java left careersiconfont" {/*</li>*/}
style={{color: '#000 important'}} {/*<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>*/}
></i><a style={{width: '83%'}} {/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
href={item.url}>{item.name}</a></li> {/*<Link to={'/crowdsourcing'}>众包创新</Link>*/}
) {/*</li>*/}
}) {/*<li className={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>*/}
} {/*<li*/}
</ul> {/* style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}}*/}
</div> {/*><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>*/}
</li>
{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<li className="">
<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a> <li className="fl edu-menu-panel careershover "
<img className="roundedRectangles" style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
src={require('./roundedRectangle.png')} <a>职业路径</a>
/> <div
</li> style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li> <ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}>
{/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/} {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
{/*<Link to={'/crowdsourcing'}>众包创新</Link>*/} return(
{/*</li>*/} <li key={key}><i className="iconfont icon-java left careersiconfont"
<li className={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li> style={{color: '#000 important'}}
<li ></i><a style={{width: '83%'}}
style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}} href={item.url}>{item.name}</a></li>
><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li> )
</ul> })
</div> }
: </ul>
<div className="head-nav pr"> </div>
<ul id="header-nav"> </li>
{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/} </ul>
</div>
{/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/} :this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.navbar===null||this.props.mygetHelmetapi.navbar===undefined||this.props.mygetHelmetapi.navbar.length===0?
<div className="head-nav pr" id={"head-navpre2"}>
{/*{*/}
{/* this.props.getHelmetapi.navbar && this.props.getHelmetapi.navbar.map((item,key)=>{*/} <ul id="header-nav">
{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
{/* return(*/}
{/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
{/* )*/} <li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
{/* })*/} <Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>
{/*}*/} </li>
<li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
<Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>
</li>
{/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
<li className={`${coursestype === true ? 'pr active' : 'pr'}`}> {/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
<li className={`${coursestype === true ? 'pr active' : 'pr'}`}>
{/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/}
<Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link>
</li>
{/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/} <li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
<Link to="/shixuns">实训项目</Link>
{/*<img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">*/}
{/*</img>*/}
</li>
<Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link> <li className="fl edu-menu-panel careershover "
</li> style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
<a>职业路径</a>
<div
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
<ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}>
{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
return(
<li key={key}><i className="iconfont icon-java left careersiconfont"
style={{color: '#000 important'}}
></i><a style={{width: '83%'}}
href={item.url}>{item.name}</a></li>
)
})
}
</ul>
</div>
</li>
<li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}> {/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<Link to="/shixuns">实训项目</Link> <li className="">
<img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img"> <a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
</img> {/*<img className="roundedRectangles"*/}
</li> {/* src={require('./roundedRectangle.png')}*/}
{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/} {/*/>*/}
<li className=""> </li>
<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a> <li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>
<img className="roundedRectangles" {/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
src={require('./roundedRectangle.png')} {/*<Link to={'/crowdsourcing'}>众包创新</Link>*/}
/> {/*</li>*/}
</li> <li className={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>
<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li> <li
{/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/} style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}}
{/*<Link to={'/crowdsourcing'}>众包创新</Link>*/} ><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
{/*</li>*/} </ul>
<li className={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li> </div>
<li :
style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}} <div className="head-nav pr" id={"head-navpre3"}>
><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
<ul id="header-nav">
{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
{/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
<li className="fl edu-menu-panel careershover " <li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}> <Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>
<a>职业路径</a> </li>
<div
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}> {/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
<ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}> <li className={`${coursestype === true ? 'pr active' : 'pr'}`}>
{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => { {/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/}
return( <Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link>
<li key={key}><i className="iconfont icon-java left careersiconfont" </li>
style={{color: '#000 important'}}
></i><a style={{width: '83%'}} <li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
href={item.url}>{item.name}</a></li> <Link to="/shixuns">实训项目</Link>
) {/*<img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">*/}
}) {/*</img>*/}
} </li>
</ul>
</div> <li className="fl edu-menu-panel careershover "
</li> style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
<a>职业路径</a>
<div
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
<ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}>
{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
return(
<li key={key}><i className="iconfont icon-java left careersiconfont"
style={{color: '#000 important'}}
></i><a style={{width: '83%'}}
href={item.url}>{item.name}</a></li>
)
})
}
</ul>
</div>
</li>
{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<li className="">
<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
{/*<img className="roundedRectangles"*/}
{/* src={require('./roundedRectangle.png')}*/}
{/*/>*/}
</li>
<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>
{/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
{/*<Link to={'/crowdsourcing'}>众包创新</Link>*/}
{/*</li>*/}
<li className={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>
<li
style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}}
><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
</ul>
</div>
}
</ul>
</div>
}
</div>
<style> <style>
{ {

6
public/react/src/modules/tpm/TPMIndexHOC.js
Unescape View File

@ -595,7 +595,7 @@ export function TPMIndexHOC(WrappedComponent) {
this.setState({ globalLoading: false }) this.setState({ globalLoading: false })
} }
render() { render() {
let{Headertop,Footerdown, isRender, AccountProfiletype,getHelmetapi}=this.state; let{Headertop,Footerdown, isRender, AccountProfiletype,mygetHelmetapi}=this.state;
const common = { const common = {
isSuperAdmin:this.isSuperAdmin, isSuperAdmin:this.isSuperAdmin,
isAdminOrCreator:this.isAdminOrCreator, isAdminOrCreator:this.isAdminOrCreator,
@ -630,8 +630,8 @@ export function TPMIndexHOC(WrappedComponent) {
yslslowCheckresultsNo:this.yslslowCheckresultsNo, yslslowCheckresultsNo:this.yslslowCheckresultsNo,
}; };
// console.log("this.props.getHelmetapi"); // console.log("this.props.mygetHelmetapi");
// console.log(this.props.getHelmetapi); // console.log(this.props.mygetHelmetapi);
return ( return (
<div className="indexHOC"> <div className="indexHOC">
{isRender===true ? <LoginDialog {isRender===true ? <LoginDialog

Write Preview
Loading…
Cancel
Save