diff --git a/public/react/src/modules/question/NewMyShixunModel.js b/public/react/src/modules/question/NewMyShixunModel.js
index 7c3bfc707..3c937a7b8 100644
--- a/public/react/src/modules/question/NewMyShixunModel.js
+++ b/public/react/src/modules/question/NewMyShixunModel.js
@@ -211,6 +211,12 @@ class NewMyShixunModel extends Component {
}
this.callback(defaultActiveKeys);
}
+ if(prevProps.Contentdata !== this.props.Contentdata){
+ this.setState({
+ Contentdata:this.props.Contentdata,
+ })
+
+ }
}
//公共和我的
@@ -949,7 +955,8 @@ class NewMyShixunModel extends Component {
let {
page, per_page, items_count, Headertop, visible, placement, modalsType, modalsTypes, basket_list,
completion_questions_count, judgement_questions_count, multiple_questions_count, practical_questions_count,
- program_questions_count, single_questions_count, subjective_questions_count, selectionbools
+ program_questions_count, single_questions_count, subjective_questions_count,selectionbools,
+ modalsTypeInaudit,Contentdata
} = this.state;
const Datacount = completion_questions_count + judgement_questions_count
@@ -958,6 +965,8 @@ class NewMyShixunModel extends Component {
+ single_questions_count
+ subjective_questions_count;
+ // console.log("弹出框");
+ // console.log(Contentdata)
return (
@@ -1027,22 +1036,23 @@ class NewMyShixunModel extends Component {
/>
{/*头部*/}
this.chakanjiexibool(e)}
- getitem_basketss={(id) => this.getitem_basketss(id)}
- selectallquestionsonthispage={() => this.selectallquestionsonthispage()}
- getitem_baskets={(e) => this.getitem_baskets(e)}
- setdatafuns={(e) => this.setdatafuns(e)}
- setdatafunsval={(e) => this.setdatafunsval(e)}
- handleVisibleChanges={(e) => this.handleVisibleChanges(e)}
- handleVisibleChange={(e) => this.handleVisibleChange(e)}
- showmodels={(e) => this.showmodels(e)}
- showmodelysl={(e) => this.showmodelysl(e)}
- callback={(e) => this.callback(e)}
- setoj_status={(e) => this.setoj_status(e)}
- showmodelsInaudit={(e) => this.showmodelsInaudit(e)}
+ Contentdata={Contentdata}
+ exam_id={this.props.exam_id}
+ Isitapopup={"true"}
+ chakanjiexiboolindex={this.state.chakanjiexiboolindex}
+ chakanjiexibool={(e)=>this.chakanjiexibool(e)}
+ getitem_basketss={(id)=>this.getitem_basketss(id)}
+ selectallquestionsonthispage={()=>this.selectallquestionsonthispage()}
+ getitem_baskets={(e)=>this.getitem_baskets(e)}
+ setdatafuns={(e) => this.setdatafuns(e)}
+ setdatafunsval={(e) => this.setdatafunsval(e)}
+ handleVisibleChanges={(e) => this.handleVisibleChanges(e)}
+ handleVisibleChange={(e) => this.handleVisibleChange(e)}
+ showmodels={(e) => this.showmodels(e)}
+ showmodelysl={(e) => this.showmodelysl(e)}
+ callback={(e) => this.callback(e)}
+ setoj_status={(e)=>this.setoj_status(e)}
+ showmodelsInaudit={(e)=>this.showmodelsInaudit(e)}
>
diff --git a/public/react/src/modules/question/Paperreview.js b/public/react/src/modules/question/Paperreview.js
index 41238f1ed..bb553993c 100644
--- a/public/react/src/modules/question/Paperreview.js
+++ b/public/react/src/modules/question/Paperreview.js
@@ -292,7 +292,7 @@ class Paperreview extends Component {
{
newmyshixunmodelbool === true ?
- this.setnewmyshixunmodelbool(e)}>
+ this.setnewmyshixunmodelbool(e)}>
:
""
diff --git a/public/react/src/modules/testpaper/Paperlibraryeditid.js b/public/react/src/modules/testpaper/Paperlibraryeditid.js
index 4cb0a23a6..dc8a287d3 100644
--- a/public/react/src/modules/testpaper/Paperlibraryeditid.js
+++ b/public/react/src/modules/testpaper/Paperlibraryeditid.js
@@ -22,7 +22,7 @@ class Paperlibraryeditid extends Component {
super(props);
this.Judquestio = React.createRef();
this.state = {
- paperlibrartdata: [],
+ Contentdata: [],
disciplinesdata: [],
knowledgepoints: [],
disciplmy: [],
@@ -130,7 +130,7 @@ class Paperlibraryeditid extends Component {
axios.get(urls).then((response) => {
if (response) {
this.setState({
- paperlibrartdata: response.data,
+ Contentdata: response.data,
item_banksedit: response.data.exam,
})
}
@@ -218,7 +218,7 @@ class Paperlibraryeditid extends Component {
}
render() {
- let {paperlibrartdata,newmyshixunmodelbool,defaultActiveKey} = this.state;
+ let {Contentdata,newmyshixunmodelbool,defaultActiveKey} = this.state;
const params = this.props && this.props.match && this.props.match.params;
let urlsysl=`/paperlibrary?defaultActiveKey=${defaultActiveKey}`;
@@ -239,7 +239,7 @@ class Paperlibraryeditid extends Component {
{
newmyshixunmodelbool === true ?
- this.setnewmyshixunmodelbool(e)}>
+ this.setnewmyshixunmodelbool(e)}>
:
""
@@ -279,28 +279,28 @@ class Paperlibraryeditid extends Component {
`
}
-
-
this.setnewmyshixunmodelbool(e)}
- all_score={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.all_questions_count}
- all_questions_count={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.all_score}
- difficulty={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.difficulty}
- >
-
+
+ this.setnewmyshixunmodelbool(e)}
+ all_score={Contentdata && Contentdata.exam && Contentdata.exam.all_questions_count}
+ all_questions_count={Contentdata && Contentdata.exam && Contentdata.exam.all_score}
+ difficulty={Contentdata && Contentdata.exam && Contentdata.exam.difficulty}
+ >
+
this.getdata()}
- single_questions={paperlibrartdata && paperlibrartdata.single_questions && paperlibrartdata.single_questions.questions.length > 0 ? paperlibrartdata.single_questions : null}
- multiple_questions={paperlibrartdata && paperlibrartdata.multiple_questions
- && paperlibrartdata.multiple_questions.questions.length > 0 ? paperlibrartdata.multiple_questions : null
+ single_questions={Contentdata && Contentdata.single_questions && Contentdata.single_questions.questions.length > 0 ? Contentdata.single_questions : null}
+ multiple_questions={Contentdata && Contentdata.multiple_questions
+ && Contentdata.multiple_questions.questions.length > 0 ? Contentdata.multiple_questions : null
}
- judgement_questions={paperlibrartdata && paperlibrartdata.judgement_questions
- && paperlibrartdata.judgement_questions.questions.length > 0 ? paperlibrartdata.judgement_questions : null
+ judgement_questions={Contentdata && Contentdata.judgement_questions
+ && Contentdata.judgement_questions.questions.length > 0 ? Contentdata.judgement_questions : null
}
- program_questions={paperlibrartdata && paperlibrartdata.program_questions
- && paperlibrartdata.program_questions.questions.length > 0 ? paperlibrartdata.program_questions : null
+ program_questions={Contentdata && Contentdata.program_questions
+ && Contentdata.program_questions.questions.length > 0 ? Contentdata.program_questions : null
}
>