From 0667d239b395b7f11071f0294f49f63a6b177f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 15 Oct 2019 11:16:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/AppConfig.js | 16 +-- .../react/src/modules/login/EducoderLogin.js | 4 +- public/react/src/modules/tpm/NewHeader.js | 100 +++--------------- 3 files changed, 26 insertions(+), 94 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index aa986d867..cddea79a6 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -93,14 +93,14 @@ export function initAxiosInterceptors(props) { config.url = url; } } - - if (requestMap[config.url] === true) { // 避免重复的请求 导致页面f5刷新 也会被阻止 - console.log(config); - console.log(JSON.parse(config)); - console.log(config.url); - console.log("被阻止了是重复请求================================="); - return false; - } + // + // if (requestMap[config.url] === true) { // 避免重复的请求 导致页面f5刷新 也会被阻止 显示这个方法会影响到定制信息 + // console.log(config); + // console.log(JSON.parse(config)); + // console.log(config.url); + // console.log("被阻止了是重复请求================================="); + // return false; + // } // 非file_update请求 if (config.url.indexOf('update_file') === -1) { requestMap[config.url] = true; diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js index 4e35eb7e3..617dc2d8a 100644 --- a/public/react/src/modules/login/EducoderLogin.js +++ b/public/react/src/modules/login/EducoderLogin.js @@ -208,9 +208,7 @@ class EducoderLogin extends Component { } } -// export default EducoderLogin ; -export default TPMIndexHOC ( EducoderLogin ); -// SnackbarHOC() (TPMIndexHOC ( EducoderLogin )); +export default EducoderLogin ; // showbool === 2 ? //
{ 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; @@ -739,7 +674,6 @@ submittojoinclass=(value)=>{ showSearchOpentype, headtypesonClickbool, headtypess, - mygetHelmetapi2, }=this.state; /* 用户名称 用户头像url @@ -771,12 +705,12 @@ submittojoinclass=(value)=>{ let headtypes='/'; - // console.log("mygetHelmetapi2"); - // console.log(mygetHelmetapi2); - if(mygetHelmetapi2){ - if(mygetHelmetapi2.navbar){ - if(mygetHelmetapi2.navbar.length>0){ - // console.log("mygetHelmetapi2.navbar.length>0====-=-=--=-=-=-="); + // 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(match.path); if(match.path==='/'){ @@ -787,9 +721,9 @@ submittojoinclass=(value)=>{ } }else { - for(var i=0;i{ } // console.log("NewHeadergetHelmetapi432423423423"); - // console.log(mygetHelmetapi2); + // console.log(this.props.mygetHelmetapi); // console.log("NewHeadermygetHelmetapi123123123123"); - // console.log(mygetHelmetapi2); + // console.log(this.props.mygetHelmetapi); // console.log(this.props); return ( @@ -875,10 +809,10 @@ submittojoinclass=(value)=>{ />:""} this.headtypesonClick("/",false)} className={"fl mr30 ml25 mt10"}> { - mygetHelmetapi2===undefined||mygetHelmetapi2.nav_logo_url===null||mygetHelmetapi2.nav_logo_url===undefined? + this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.nav_logo_url===null||this.props.mygetHelmetapi.nav_logo_url===undefined? 高校智能化教学与实训平台 : - 高校智能化教学与实训平台 + 高校智能化教学与实训平台 } @@ -894,13 +828,13 @@ submittojoinclass=(value)=>{ } { - mygetHelmetapi2!==undefined&&mygetHelmetapi2.navbar!==null&&mygetHelmetapi2.navbar!==undefined&&mygetHelmetapi2.navbar.length>0? + this.props.mygetHelmetapi!==undefined&&this.props.mygetHelmetapi.navbar!==null&&this.props.mygetHelmetapi.navbar!==undefined&&this.props.mygetHelmetapi.navbar.length>0?
    {/*
  • 首页
    • */} {/*
  • 实训路径
    • */} { - mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.map((item,key)=>{ + this.props.mygetHelmetapi.navbar && this.props.mygetHelmetapi.navbar.map((item,key)=>{ // console.log("headtypes"); // console.log(headtypes); return( @@ -966,7 +900,7 @@ submittojoinclass=(value)=>{
- // :mygetHelmetapi2===undefined||mygetHelmetapi2.navbar===null||mygetHelmetapi2.navbar===undefined||mygetHelmetapi2.navbar.length===0? + // :this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.navbar===null||this.props.mygetHelmetapi.navbar===undefined||this.props.mygetHelmetapi.navbar.length===0? //
// //