diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index a89eacfa1..0eb6b50cd 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -38,13 +38,13 @@ export function initAxiosInterceptors(props) { // https://github.com/axios/axios/issues/1497 // TODO 读取到package.json中的配置? - var proxy = "http://localhost:3000" + var proxy = "http://localhost:3000"; // proxy = "http://testbdweb.trustie.net" // proxy = "http://testbdweb.educoder.net" // proxy = "https://testeduplus2.educoder.net" - proxy="http://47.96.87.25:48080" + proxy="http://47.96.87.25:48080"; // wy - proxy="https://pre-newweb.educoder.net" + proxy="https://pre-newweb.educoder.net"; proxy="https://test-newweb.educoder.net" // wy diff --git a/public/react/src/modules/courses/gradinforms/Eduinforms.js b/public/react/src/modules/courses/gradinforms/Eduinforms.js index 14bcfa11a..6e172977a 100644 --- a/public/react/src/modules/courses/gradinforms/Eduinforms.js +++ b/public/react/src/modules/courses/gradinforms/Eduinforms.js @@ -25,16 +25,61 @@ class Eduinforms extends Component{ eduintits:"", informs:[], yslbool:false, + dataquerys:{}, } } componentDidMount() { + console.log("Eduinformss"); console.log("获取到数据"); - console.log(this.props); - - this.getinputdata(); + // console.log(this.props); + const query = this.props.location.search; + // const type = query.split('?chinaoocTimestamp='); + // console.log("Eduinforms12345"); + // console.log(this.foo(query)); + // console.log(JSON.stringify(this.foo(query))); + var dataqueryss={} + try { + var foqus=this.foo(query); + if(JSON.stringify(foqus) ==="{}"){ + this.setState({ + dataquerys:{}, + }); + return + } + this.setState({ + dataquerys:foqus, + }); + dataqueryss=foqus; + }catch (e) { + this.setState({ + dataquerys:{}, + }) + } + this.getinputdatas(dataqueryss); } + foo=(url)=> { + var json = {}; + var regExp = /[\?\&](\w+)(=?)(\w*)/g; + var arr; + do { + arr = regExp.exec(url); + // console.log(arr); // arr = [完整的字符串, key, 等号或'', value或''] + + if (arr) { + var key = arr[1]; + var value = arr[3]; + // arr[2] === ''时, value = undefined + if (!arr[2]) + value = undefined; + + json[key] = value; + } + } while (arr); + + return json; + } getyslbooltrue(){ console.log("调用了getyslbooltrue"); this.setState({ @@ -54,7 +99,47 @@ class Eduinforms extends Component{ }) let url = `/courses/${this.props.match.params.coursesId}/informs.json`; // - axios.get(url).then((response) => { + axios.get(url, + {params:this.state.dataquerys} + ).then((response) => { + if(response){ + if(response.data){ + this.setState({ + informs:response.data.informs, + isSpin:false, + }) + }else { + this.setState({ + informs:[], + isSpin:false, + + }) + + } + }else { + this.setState({ + informs:[], + isSpin:false, + }) + + } + }).catch((error) => { + console.log(error) + this.setState({ + informs:[], + isSpin:false, + }) + }); + } + getinputdatas=(dataquerys)=>{ + this.setState({ + isSpin:true, + }) + let url = `/courses/${this.props.match.params.coursesId}/informs.json`; + // + axios.get(url, + {params:dataquerys} + ).then((response) => { if(response){ if(response.data){ this.setState({