From dd0a431c2d8b74a12955099c5c544cddc4c4afb6 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, 11 Feb 2020 15:44:50 +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/modules/question/Question.js | 1 + .../modules/question/Questionitem_banks.js | 24 ++++++++-- .../modules/question/component/Contentpart.js | 45 ++++++++++--------- .../modules/question/component/Listjihe.js | 4 +- 4 files changed, 46 insertions(+), 28 deletions(-) diff --git a/public/react/src/modules/question/Question.js b/public/react/src/modules/question/Question.js index ba0b10b68..5011fa2c7 100644 --- a/public/react/src/modules/question/Question.js +++ b/public/react/src/modules/question/Question.js @@ -937,6 +937,7 @@ class Question extends Component { /> {/*头部*/} this.chakanjiexibool(e)} diff --git a/public/react/src/modules/question/Questionitem_banks.js b/public/react/src/modules/question/Questionitem_banks.js index ccf65a49d..8828bf94c 100644 --- a/public/react/src/modules/question/Questionitem_banks.js +++ b/public/react/src/modules/question/Questionitem_banks.js @@ -1,6 +1,6 @@ import React, {Component} from "react"; import {Link, NavLink} from 'react-router-dom'; -import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder'; +import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl,queryString} from 'educoder'; import axios from 'axios'; import { notification, @@ -35,13 +35,25 @@ class Questionitem_banks extends Component { myquestion_choicesco: [], disciplinesdata: [], knowledgepoints: [], - disciplmy:[] + disciplmy:[], + pages:1, } } //初始化 componentDidMount() { + const query = this.props.location.search; + const parsed = queryString.parse(query); + console.log(parsed); + try { + this.setState({ + pages:parsed.pages + }) + }catch (e) { + + } + // let {defaultActiveKey}= this.state; // var data={ // public:defaultActiveKey @@ -454,6 +466,7 @@ class Questionitem_banks extends Component { } if (this.state.item_type === "PROGRAM") { //编程题 跳转到 oj 中创建 + debugger var myrbkc=[]; var Getdatasdatas=Getdatasdata[2].rbzsd; for(let myda of Getdatasdatas) { @@ -465,9 +478,12 @@ class Questionitem_banks extends Component { sub_discipline_id: Getdatasdata[3].rbkc[1], tag_discipline_id: myrbkc, }); - console.log(Getdatasdata[3].rbkc[1].join(',')); - // window.open( `/problems/new?difficult=${Getdatasdata[0].rbnd}&sub_discipline_id=\"\"&tag_discipline_id=\"\"&newoj=1&=pages=\"\"`); + let arrays=myrbkc.join(','); + // console.log("开始打印了"); + // console.log(arrays); + + window.open( `/problems/new?difficult=${Getdatasdata[0].rbnd}&sub_discipline_id=${Getdatasdata[3].rbkc[1]}&tag_discipline_id=${arrays}&newoj=1&pages=${this.state.pages}`); } diff --git a/public/react/src/modules/question/component/Contentpart.js b/public/react/src/modules/question/component/Contentpart.js index 61a0fb8ea..af81f43c3 100644 --- a/public/react/src/modules/question/component/Contentpart.js +++ b/public/react/src/modules/question/component/Contentpart.js @@ -53,46 +53,46 @@ class Contentpart extends Component { } } xinzenw=(e)=>{ - var urls="?"; + var urls=""; if(this.props.discipline_id){ - if(urls==="?"){ - urls=urls+`discipline_id=${this.props.discipline_id}` - }else { + // if(urls==="?"){ + // urls=urls+`discipline_id=${this.props.discipline_id}` + // }else { urls=urls+`&discipline_id=${this.props.discipline_id}` - } + // } } if(this.props.sub_discipline_id){ - if(urls==="?"){ - urls=urls+`sub_discipline_id=${this.props.sub_discipline_id}` - }else { + // if(urls==="?"){ + // urls=urls+`sub_discipline_id=${this.props.sub_discipline_id}` + // }else { urls=urls+`&sub_discipline_id=${this.props.sub_discipline_id}` - } + // } } if(this.props.tag_discipline_id){ - if(urls==="?"){ - urls=urls+`sub_discipline_id=${this.props.tag_discipline_id}` - }else { + // if(urls==="?"){ + // urls=urls+`sub_discipline_id=${this.props.tag_discipline_id}` + // }else { urls=urls+`&sub_discipline_id=${this.props.tag_discipline_id}` - } + // } } if(this.props.difficulty){ - if(urls==="?"){ - urls=urls+`difficulty=${this.props.difficulty}&` - }else { + // if(urls==="?"){ + // urls=urls+`difficulty=${this.props.difficulty}&` + // }else { urls=urls+`&difficulty=${this.props.difficulty}` - } + // } } if(this.props.item_type){ - if(urls==="?"){ - urls=urls+`item_type=${this.props.item_type}` - }else { + // if(urls==="?"){ + // urls=urls+`item_type=${this.props.item_type}` + // }else { urls=urls+`&item_type=${this.props.item_type}` - } + // } } + this.props.history.push("/question/newitem?pages="+this.props.pages+urls); - this.props.history.push("/question/newitem"+urls); } render() { let {page}=this.state; @@ -316,6 +316,7 @@ class Contentpart extends Component { keindex={index} items={object} key={index} + pages={this.props.pages} getitem_basketss={(id)=>this.props.getitem_basketss(id)} getitem_baskets={(e)=>this.props.getitem_baskets(e)} showmodels={(e)=>this.props.showmodels(e)} diff --git a/public/react/src/modules/question/component/Listjihe.js b/public/react/src/modules/question/component/Listjihe.js index 447fd669b..a6370d17e 100644 --- a/public/react/src/modules/question/component/Listjihe.js +++ b/public/react/src/modules/question/component/Listjihe.js @@ -354,7 +354,7 @@ class Listjihe extends Component { this.props.Isitapopup&&this.props.Isitapopup==="true"? "" : - +

编辑 @@ -364,7 +364,7 @@ class Listjihe extends Component { this.props.Isitapopup&&this.props.Isitapopup==="true"? "" : - +

编辑