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

自己分支合并阿里云

Browse Source
dev_auth
杨树林 5 years ago
parent 630fd5536e
commit a5cf8f6915
3 changed files with 182 additions and 91 deletions
Show Stats Download Patch File Download Diff File

3
public/react/src/AppConfig.js
Unescape View File

@ -94,7 +94,8 @@ export function initAxiosInterceptors(props) {
} }
} }
if (requestMap[config.url] === true) { // 避免重复的请求 if (requestMap[config.url] === true) { // 避免重复的请求 导致页面f5刷新 也会被阻止
console.log("被阻止了是重复请求=================================");
return false; return false;
} }
// 非file_update请求 // 非file_update请求

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

@ -67,16 +67,24 @@ class NewHeader extends Component {
occupation:0, occupation:0,
mydisplay:false, mydisplay:false,
headtypesonClickbool:false, headtypesonClickbool:false,
headtypess:"/" headtypess:"/",
mygetHelmetapi2:undefined,
} }
console.log("176") console.log("176")
// console.log(props); // console.log(props);
console.log("NewHeader1234567890"); // console.log("NewHeader1234567890");
console.log(this.props); // console.log(this.props);
}
componentDidUpdate = (prevProps) => {
console.log("componentDidMount2");
console.log(this.state.mygetHelmetapi2);
if(this.state.mygetHelmetapi2===undefined){
this.getAppdata();
}
} }
componentDidMount() { componentDidMount() {
console.log("componentDidMount1");
this.getAppdata();
window._header_componentHandler = this; window._header_componentHandler = this;
//下拉框的显示隐藏 //下拉框的显示隐藏
@ -645,7 +653,70 @@ submittojoinclass=(value)=>{
headtypesonClickbool:bool, headtypesonClickbool:bool,
}) })
} }
getAppdata=()=>{
console.log("开始刷新数据了")
let url = "/setting.json";
axios.get(url).then((response) => {
console.log("axios.get");
console.log(response);
if(response){
if(response.data){
this.setState({
mygetHelmetapi2:response.data.setting
});
document.title = response.data.setting.name;
var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
link.rel = 'shortcut icon';
link.href = response.data.setting.tab_logo_url;
if (oldLink) {
document.head.removeChild(oldLink);
}
document.head.appendChild(link);
}else {
document.title = "EduCoder";
var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
link.rel = 'shortcut icon';
link.href = "/react/build/./favicon.ico";
if (oldLink) {
document.head.removeChild(oldLink);
}
document.head.appendChild(link);
}
}else{
document.title = "EduCoder";
var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
link.rel = 'shortcut icon';
link.href = "/react/build/./favicon.ico";
if (oldLink) {
document.head.removeChild(oldLink);
}
document.head.appendChild(link);
}
}).catch((error) => {
console.log("开始刷新数据了但报错了");
console.log(error);
document.title = "EduCoder";
var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
link.rel = 'shortcut icon';
link.href = "/react/build/./favicon.ico";
if (oldLink) {
document.head.removeChild(oldLink);
}
document.head.appendChild(link);
});
};
render() { render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。 const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
const {match,} = this.props; const {match,} = this.props;
@ -668,6 +739,7 @@ submittojoinclass=(value)=>{
showSearchOpentype, showSearchOpentype,
headtypesonClickbool, headtypesonClickbool,
headtypess, headtypess,
mygetHelmetapi2,
}=this.state; }=this.state;
/* /*
用户名称 用户头像url 用户名称 用户头像url
@ -679,16 +751,34 @@ 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;
}
if(this.props.mygetHelmetapi){ let headtypes='/';
if(this.props.mygetHelmetapi.navbar){
if(this.props.mygetHelmetapi.navbar.length>0){ console.log("mygetHelmetapi2");
// console.log("this.props.mygetHelmetapi.navbar.length>0====-=-=--=-=-=-="); console.log(mygetHelmetapi2);
// console.log(this.props); if(mygetHelmetapi2){
// console.log(match.path); if(mygetHelmetapi2.navbar){
if(mygetHelmetapi2.navbar.length>0){
console.log("mygetHelmetapi2.navbar.length>0====-=-=--=-=-=-=");
console.log(match.path);
if(match.path==='/'){ if(match.path==='/'){
if(headtypesonClickbool===false){ if(headtypesonClickbool===false){
headtypes=undefined; headtypes=undefined;
@ -697,9 +787,9 @@ submittojoinclass=(value)=>{
} }
}else { }else {
for(var i=0;i<this.props.mygetHelmetapi.navbar.length;i++){ for(var i=0;i<mygetHelmetapi2.navbar.length;i++){
if(match.path===this.props.mygetHelmetapi.navbar[i].link){ if(match.path===mygetHelmetapi2.navbar[i].link){
headtypes=this.props.mygetHelmetapi.navbar[i].link; headtypes=mygetHelmetapi2.navbar[i].link;
break; break;
} }
} }
@ -764,10 +854,10 @@ submittojoinclass=(value)=>{
} }
// console.log("NewHeadergetHelmetapi432423423423"); // console.log("NewHeadergetHelmetapi432423423423");
// console.log(this.props.mygetHelmetapi); // console.log(mygetHelmetapi2);
console.log("NewHeadermygetHelmetapi123123123123"); console.log("NewHeadermygetHelmetapi123123123123");
console.log(mygetHelmetapi2);
console.log(this.props); console.log(this.props);
console.log(this.props.mygetHelmetapi);
return ( return (
<div className="newHeaders" id="nHeader" > <div className="newHeaders" id="nHeader" >
@ -785,10 +875,10 @@ submittojoinclass=(value)=>{
/>:""} />:""}
<a href={"/"} onClick={()=>this.headtypesonClick("/",false)} className={"fl mr30 ml25 mt10"}> <a href={"/"} onClick={()=>this.headtypesonClick("/",false)} className={"fl mr30 ml25 mt10"}>
{ {
this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.nav_logo_url===null||this.props.mygetHelmetapi.nav_logo_url===undefined? mygetHelmetapi2===undefined||mygetHelmetapi2.nav_logo_url===null||mygetHelmetapi2.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.mygetHelmetapi.nav_logo_url)}></img> <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(mygetHelmetapi2.nav_logo_url)}></img>
} }
</a> </a>
@ -804,18 +894,18 @@ submittojoinclass=(value)=>{
} }
</style> </style>
{ {
this.props.mygetHelmetapi!==undefined&&this.props.mygetHelmetapi.navbar!==null&&this.props.mygetHelmetapi.navbar!==undefined&&this.props.mygetHelmetapi.navbar.length>0? mygetHelmetapi2!==undefined&&mygetHelmetapi2.navbar!==null&&mygetHelmetapi2.navbar!==undefined&&mygetHelmetapi2.navbar.length>0?
<div className="head-nav pr" id={"head-navpre1"}> <div className="head-nav pr" id={"head-navpre1"}>
<ul id="header-nav"> <ul id="header-nav">
{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/} {/*<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><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
{ {
this.props.mygetHelmetapi.navbar && this.props.mygetHelmetapi.navbar.map((item,key)=>{ mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.map((item,key)=>{
// console.log("headtypes"); // console.log("headtypes");
// console.log(headtypes); // console.log(headtypes);
return( return(
<li key={key} className={`${headtypes===undefined?'pr':headtypes===item.link?'pr active':'pr'}`}> <li key={key} onClick={()=>this.headtypesonClick(item.link,true)} className={`${headtypes===undefined?'pr':headtypes===item.link?'pr active':'pr'}`}>
<a href={item.link} onClick={()=>this.headtypesonClick(item.link,true)}>{item.name}</a> <Link to={item.link}>{item.name}</Link>
</li> </li>
) )
}) })
@ -876,65 +966,65 @@ submittojoinclass=(value)=>{
</li> </li>
</ul> </ul>
</div> </div>
:this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.navbar===null||this.props.mygetHelmetapi.navbar===undefined||this.props.mygetHelmetapi.navbar.length===0? // :mygetHelmetapi2===undefined||mygetHelmetapi2.navbar===null||mygetHelmetapi2.navbar===undefined||mygetHelmetapi2.navbar.length===0?
<div className="head-nav pr" id={"head-navpre2"}> // <div className="head-nav pr" id={"head-navpre2"}>
//
<ul id="header-nav"> // <ul id="header-nav">
{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/} // {/*<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><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
<li className={`${activePaths === true ? 'pr active' : 'pr'}`}> // <li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
<Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link> // <Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>
</li> // </li>
//
{/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/} // {/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
<li className={`${coursestype === true ? 'pr active' : 'pr'}`}> // <li className={`${coursestype === true ? 'pr active' : 'pr'}`}>
{/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/} // {/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/}
<Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link> // <Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link>
</li> // </li>
//
<li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}> // <li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
<Link to="/shixuns">实训项目</Link> // <Link to="/shixuns">实训项目</Link>
{/*<img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">*/} // {/*<img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">*/}
{/*</img>*/} // {/*</img>*/}
</li> // </li>
//
<li className="fl edu-menu-panel careershover " // <li className="fl edu-menu-panel careershover "
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}> // style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
<a>职业路径</a> // <a>职业路径</a>
<div // <div
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}> // 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'}}> // <ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}>
{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => { // {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
return( // return(
<li key={key}><i className="iconfont icon-java left careersiconfont" // <li key={key}><i className="iconfont icon-java left careersiconfont"
style={{color: '#000 important'}} // style={{color: '#000 important'}}
></i><a style={{width: '83%'}} // ></i><a style={{width: '83%'}}
href={item.url}>{item.name}</a></li> // href={item.url}>{item.name}</a></li>
) // )
}) // })
} // }
</ul> // </ul>
</div> // </div>
</li> // </li>
//
{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/} // {/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<li className=""> // <li className="">
<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a> // <a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
{/*<img className="roundedRectangles"*/} // {/*<img className="roundedRectangles"*/}
{/* src={require('./roundedRectangle.png')}*/} // {/* src={require('./roundedRectangle.png')}*/}
{/*/>*/} // {/*/>*/}
</li> // </li>
<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li> // <li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>
{/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/} // {/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
{/*<Link to={'/crowdsourcing'}>众包创新</Link>*/} // {/*<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={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>
<li // <li
style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}} // 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> // ><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
</ul> // </ul>
</div> // </div>
: :
<div className="head-nav pr" id={"head-navpre3"}> <div className="head-nav pr" id={"head-navpre3"}>

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

@ -148,8 +148,8 @@ export function TPMIndexHOC(WrappedComponent) {
} }
componentDidMount() { componentDidMount() {
console.log("TPMIndexHOC========"); // console.log("TPMIndexHOC========");
console.log(this.props); // console.log(this.props);
window.addEventListener('keyup', this.keyupListener) window.addEventListener('keyup', this.keyupListener)
if(this.props.match.path==="/"){ if(this.props.match.path==="/"){

Write Preview
Loading…
Cancel
Save