diff --git a/public/react/src/App.js b/public/react/src/App.js index 6aa615c3b..c1cba8a2d 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -337,7 +337,7 @@ class App extends Component { }); initAxiosInterceptors(this.props); - // this.getAppdata(); + this.getAppdata(); // // axios.interceptors.response.use((response) => { // // console.log("response"+response); diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js index 617dc2d8a..680c4bbc7 100644 --- a/public/react/src/modules/login/EducoderLogin.js +++ b/public/react/src/modules/login/EducoderLogin.js @@ -110,8 +110,8 @@ class EducoderLogin extends Component { } componentDidMount() { - console.log("EducoderLogin"); - console.log(this.props); + // console.log("EducoderLogin"); + // console.log(this.props); } Setlogins=(i)=>{ @@ -140,8 +140,8 @@ class EducoderLogin extends Component { render() { let {showbool,loginstatus,logini} = this.state; - // console.log("EducoderLogingetHelmetapi"); - // console.log(this.props); + console.log("EducoderLogingetHelmetapi"); + console.log(this.props); // console.log(this.props.mygetHelmetapi); return (
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 26e7ede7a..a7391509a 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -68,6 +68,7 @@ class NewHeader extends Component { mydisplay:false, headtypesonClickbool:false, headtypess:"/", + mygetHelmetapi2:undefined, } console.log("176") // console.log(props); @@ -76,10 +77,10 @@ class NewHeader extends Component { } componentDidUpdate = (prevProps) => { // console.log("componentDidMount2"); - // console.log(this.props.mygetHelmetapi); - // if(this.props.mygetHelmetapi===undefined){ - // this.getAppdata(); - // } + // console.log(this.state.mygetHelmetapi2); + if(this.state.mygetHelmetapi2===undefined){ + this.getAppdata(); + } } componentDidMount() { console.log("componentDidMount1"); @@ -652,6 +653,70 @@ submittojoinclass=(value)=>{ 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() { const isLogin = true; // 这里不会出现未登录的情况,服务端在服务端路由时发现如果是未登录,则跳转到登录页了。 const {match,} = this.props; @@ -674,6 +739,7 @@ submittojoinclass=(value)=>{ showSearchOpentype, headtypesonClickbool, headtypess, + mygetHelmetapi2, }=this.state; /* 用户名称 用户头像url @@ -705,12 +771,12 @@ submittojoinclass=(value)=>{ let headtypes='/'; - // console.log("this.props.mygetHelmetapi"); - // console.log(this.props.mygetHelmetapi); - if(this.props.mygetHelmetapi){ - if(this.props.mygetHelmetapi.navbar){ - if(this.props.mygetHelmetapi.navbar.length>0){ - // console.log("this.props.mygetHelmetapi.navbar.length>0====-=-=--=-=-=-="); + // console.log("mygetHelmetapi2"); + // console.log(mygetHelmetapi2); + if(mygetHelmetapi2){ + if(mygetHelmetapi2.navbar){ + if(mygetHelmetapi2.navbar.length>0){ + // console.log("mygetHelmetapi2.navbar.length>0====-=-=--=-=-=-="); // // console.log(match.path); if(match.path==='/'){ @@ -721,9 +787,9 @@ submittojoinclass=(value)=>{ } }else { - for(var i=0;i{ } // console.log("NewHeadergetHelmetapi432423423423"); - // console.log(this.props.mygetHelmetapi); + // console.log(mygetHelmetapi2); // console.log("NewHeadermygetHelmetapi123123123123"); - // console.log(this.props.mygetHelmetapi); + // console.log(mygetHelmetapi2); // console.log(this.props); return ( @@ -809,10 +875,10 @@ submittojoinclass=(value)=>{ />:""} 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? 高校智能化教学与实训平台 : - 高校智能化教学与实训平台 + 高校智能化教学与实训平台 } @@ -828,13 +894,13 @@ submittojoinclass=(value)=>{ } { - 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?
    {/*
  • 首页
  • */} {/*
  • 实训路径
  • */} { - this.props.mygetHelmetapi.navbar && this.props.mygetHelmetapi.navbar.map((item,key)=>{ + mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.map((item,key)=>{ // console.log("headtypes"); // console.log(headtypes); return( @@ -900,7 +966,7 @@ submittojoinclass=(value)=>{
- // :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? //
// //