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

调整

Browse Source
dev_auth
杨树林 5 years ago
parent 8de66af98f
commit 5642586feb
5 changed files with 87 additions and 83 deletions
Show Stats Download Patch File Download Diff File

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

@ -337,7 +337,7 @@ class App extends Component {
}); });
initAxiosInterceptors(this.props); initAxiosInterceptors(this.props);
this.getAppdata(); // this.getAppdata();
// //
// axios.interceptors.response.use((response) => { // axios.interceptors.response.use((response) => {
// // console.log("response"+response); // // console.log("response"+response);
@ -368,6 +368,8 @@ class App extends Component {
getAppdata=()=>{ getAppdata=()=>{
let url = "/setting.json"; let url = "/setting.json";
axios.get(url).then((response) => { axios.get(url).then((response) => {
console.log("app.js开始请求/setting.json");
console.log("获取当前定制信息");
if(response){ if(response){
if(response.data){ if(response.data){
this.setState({ this.setState({
@ -710,4 +712,4 @@ moment.defineLocale('zh-cn', {
doy: 4 // The week that contains Jan 4th is the first week of the year. doy: 4 // The week that contains Jan 4th is the first week of the year.
} }
}); });
export default SnackbarHOC()(App); export default SnackbarHOC()(App) ;

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

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

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

@ -20,6 +20,7 @@ import {
} from "antd"; } from "antd";
import {Link, Switch, Route, Redirect} from 'react-router-dom'; import {Link, Switch, Route, Redirect} from 'react-router-dom';
import { SnackbarHOC,getImageUrl } from 'educoder'; import { SnackbarHOC,getImageUrl } from 'educoder';
import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
import '../courses/css/members.css'; import '../courses/css/members.css';
import "../courses/common/formCommon.css" import "../courses/common/formCommon.css"
import '../courses/css/Courses.css'; import '../courses/css/Courses.css';
@ -28,7 +29,6 @@ import educodernet from '../../../src/images/login/educodernet.png';
import LoginRegisterComponent from '../user/LoginRegisterComponent'; import LoginRegisterComponent from '../user/LoginRegisterComponent';
import FindPasswordComponent from '../user/FindPasswordComponent'; import FindPasswordComponent from '../user/FindPasswordComponent';
import passopen from "../../images/login/passopen.png"; import passopen from "../../images/login/passopen.png";
import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
//educoder登入页面 //educoder登入页面
var sectionStyle = { var sectionStyle = {
"height": "100%", "height": "100%",
@ -208,7 +208,9 @@ class EducoderLogin extends Component {
} }
} }
export default SnackbarHOC() (TPMIndexHOC ( EducoderLogin )); // export default EducoderLogin ;
export default TPMIndexHOC ( EducoderLogin );
// SnackbarHOC() (TPMIndexHOC ( EducoderLogin ));
// showbool === 2 ? // showbool === 2 ?
// <div style={{ // <div style={{
// display: "flex", // display: "flex",

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

@ -77,14 +77,14 @@ class NewHeader extends Component {
} }
componentDidUpdate = (prevProps) => { componentDidUpdate = (prevProps) => {
// console.log("componentDidMount2"); // console.log("componentDidMount2");
// console.log(this.state.mygetHelmetapi2); // console.log(this.props.mygetHelmetapi);
if(this.state.mygetHelmetapi2===undefined){ // if(this.props.mygetHelmetapi===undefined){
this.getAppdata(); // this.getAppdata();
} // }
} }
componentDidMount() { componentDidMount() {
console.log("componentDidMount1"); console.log("componentDidMount1");
this.getAppdata(); // this.getAppdata();
window._header_componentHandler = this; window._header_componentHandler = this;
//下拉框的显示隐藏 //下拉框的显示隐藏
@ -653,70 +653,70 @@ submittojoinclass=(value)=>{
headtypesonClickbool:bool, headtypesonClickbool:bool,
}) })
} }
getAppdata=()=>{ // getAppdata=()=>{
console.log("开始刷新数据了") // console.log("开始刷新数据了")
let url = "/setting.json"; // let url = "/setting.json";
axios.get(url).then((response) => { // axios.get(url).then((response) => {
// console.log("axios.get"); // // console.log("axios.get");
// console.log(response); // // console.log(response);
//
if(response){ // if(response){
if(response.data){ // if(response.data){
this.setState({ // this.setState({
mygetHelmetapi2:response.data.setting // mygetHelmetapi2: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'),
oldLink = document.getElementById('dynamic-favicon'); // oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon'; // link.id = 'dynamic-favicon';
link.rel = 'shortcut icon'; // link.rel = 'shortcut icon';
link.href = '/'+response.data.setting.tab_logo_url; // link.href = '/'+response.data.setting.tab_logo_url;
if (oldLink) { // if (oldLink) {
document.head.removeChild(oldLink); // document.head.removeChild(oldLink);
} // }
document.head.appendChild(link); // document.head.appendChild(link);
}else { // }else {
document.title = "EduCoder"; // document.title = "EduCoder";
var link = document.createElement('link'), // var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon'); // oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon'; // link.id = 'dynamic-favicon';
link.rel = 'shortcut icon'; // link.rel = 'shortcut icon';
link.href = "/react/build/./favicon.ico"; // link.href = "/react/build/./favicon.ico";
if (oldLink) { // if (oldLink) {
document.head.removeChild(oldLink); // document.head.removeChild(oldLink);
} // }
document.head.appendChild(link); // document.head.appendChild(link);
} // }
//
}else{ // }else{
document.title = "EduCoder"; // document.title = "EduCoder";
var link = document.createElement('link'), // var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon'); // oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon'; // link.id = 'dynamic-favicon';
link.rel = 'shortcut icon'; // link.rel = 'shortcut icon';
link.href = "/react/build/./favicon.ico"; // link.href = "/react/build/./favicon.ico";
if (oldLink) { // if (oldLink) {
document.head.removeChild(oldLink); // document.head.removeChild(oldLink);
} // }
document.head.appendChild(link); // document.head.appendChild(link);
} // }
//
}).catch((error) => { // }).catch((error) => {
console.log("开始刷新数据了但报错了"); // console.log("开始刷新数据了但报错了");
console.log(error); // console.log(error);
//
document.title = "EduCoder"; // document.title = "EduCoder";
var link = document.createElement('link'), // var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon'); // oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon'; // link.id = 'dynamic-favicon';
link.rel = 'shortcut icon'; // link.rel = 'shortcut icon';
link.href = "/react/build/./favicon.ico"; // link.href = "/react/build/./favicon.ico";
if (oldLink) { // if (oldLink) {
document.head.removeChild(oldLink); // document.head.removeChild(oldLink);
} // }
document.head.appendChild(link); // document.head.appendChild(link);
}); // });
}; // };
render() { render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。 const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
const {match,} = this.props; const {match,} = this.props;

6
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==="/"){
@ -212,7 +212,7 @@ export function TPMIndexHOC(WrappedComponent) {
} }
} }
}); });
this.getAppdata(); this.getAppdata();
} }
/** /**
课堂权限相关方法，暂时写这里了 ----------------------------------------START 课堂权限相关方法，暂时写这里了 ----------------------------------------START

Write Preview
Loading…
Cancel
Save