题库调整

public/react/src/modules/question/Question.js

@@ -69,7 +69,10 @@ class Question extends Component {
 		this.setState({
 			discipline_id:discipline_id,
 			sub_discipline_id:null,
-			tag_discipline_id:null
+			tag_discipline_id:null,
+			keywords:"",
+			page:1,
+			per_page:10,
 		})
 		var data = {
 			discipline_id:discipline_id,
@@ -78,7 +81,7 @@ class Question extends Component {
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: this.state.keywords,
+			keywords: null,
 			page: this.state.page,
 			per_page:10,
 		};
@@ -89,7 +92,10 @@ class Question extends Component {
 	setsub_discipline_id=(sub_discipline_id)=>{
 		this.setState({
 			sub_discipline_id:sub_discipline_id,
-			tag_discipline_id:null
+			tag_discipline_id:null,
+			keywords:"",
+			page:1,
+			per_page:10,
 		})
 		var data = {
 			discipline_id:this.state.discipline_id,
@@ -98,8 +104,8 @@ class Question extends Component {
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: this.state.keywords,
-			page: this.state.page,
+			keywords:null,
+			page: 1,
 			per_page:10,
 		};
 		this.getdata(data);
@@ -107,7 +113,10 @@ class Question extends Component {
 
 	settag_discipline_id=(tag_discipline_id)=>{
 		this.setState({
-			tag_discipline_id:tag_discipline_id
+			tag_discipline_id:tag_discipline_id,
+			keywords:"",
+			page:1,
+			per_page:10,
 		})
 		var data = {
 			discipline_id:this.state.discipline_id,
@@ -116,8 +125,8 @@ class Question extends Component {
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: this.state.keywords,
-			page: this.state.page,
+			keywords: null,
+			page: 1,
 			per_page:10,
 		};
 		this.getdata(data);
@@ -329,6 +338,9 @@ class Question extends Component {
 		this.setState({
 			difficulty: difficulty,
 			visiblemys: false,
+			page: 1,
+			per_page:10,
+			keywords:""
 		})
 
 		var data = {
@@ -338,7 +350,8 @@ class Question extends Component {
 			public: this.state.defaultActiveKey,
 			difficulty: difficulty,
 			item_type: this.state.item_type,
-			page: this.state.page,
+			keywords:null,
+			page:1,
 			per_page:10,
 		};
 
@@ -349,6 +362,9 @@ class Question extends Component {
 		this.setState({
 			item_type: item_type,
 			visiblemyss: false,
+			page: 1,
+			per_page:10,
+			keywords:""
 		})
 
 		var data = {
@@ -358,8 +374,9 @@ class Question extends Component {
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: item_type,
-			page: this.state.page,
+			page: 1,
 			per_page:10,
+			keywords:null
 		};
 
 		this.getdata(data);

public/react/src/modules/testpaper/Testpaperlibrary.js

@@ -191,6 +191,8 @@ class Testpaperlibrary extends Component {
 			sub_discipline_id:null,
 			tag_discipline_id:null,
 			keywords:null,
+			page: 1,
+			per_page:10,
 		})
 		var data = {
 			discipline_id:discipline_id,
@@ -210,6 +212,8 @@ class Testpaperlibrary extends Component {
 			sub_discipline_id:sub_discipline_id,
 			tag_discipline_id:null,
 			keywords:null,
+			page:1,
+			per_page:10,
 		})
 		var data = {
 			discipline_id:this.state.discipline_id,
@@ -228,6 +232,8 @@ class Testpaperlibrary extends Component {
 		this.setState({
 			tag_discipline_id:tag_discipline_id,
 			keywords:null,
+			page:1,
+			per_page:10,
 		})
 		var data = {
 			discipline_id:this.state.discipline_id,
@@ -360,6 +366,9 @@ class Testpaperlibrary extends Component {
 		this.setState({
 			difficulty: difficulty,
 			visiblemys: false,
+			keywords:"",
+			page: 1,
+			per_page:10,
 		})
 
 		var data = {
@@ -368,8 +377,8 @@ class Testpaperlibrary extends Component {
 			tag_discipline_id:this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: difficulty,
-			keywords: this.state.keywords,
-			page: this.state.page,
+			keywords:null,
+			page:1,
 			per_page:10,
 		};
 
@@ -383,6 +392,9 @@ class Testpaperlibrary extends Component {
 		this.setState({
 			item_type: item_type,
 			visiblemyss: false,
+			keywords:null,
+			page: 1,
+			per_page:10,
 		})
 
 		var data = {
@@ -392,8 +404,8 @@ class Testpaperlibrary extends Component {
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: item_type,
-			keywords: this.state.keywords,
-			page: this.state.page,
+			keywords:"",
+			page: 1,
 			per_page:10,
 		};