From de7f418c3d258b00f75a0fcc8ee4f2b8c752959b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 2 Jan 2020 14:01:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/testpaper/Testpaperlibrary.js  | 18 ++++++++++++++----
 .../modules/testpaper/component/Contentpart.js |  9 ++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/public/react/src/modules/testpaper/Testpaperlibrary.js b/public/react/src/modules/testpaper/Testpaperlibrary.js
index 4d062efd9..24eb130f2 100644
--- a/public/react/src/modules/testpaper/Testpaperlibrary.js
+++ b/public/react/src/modules/testpaper/Testpaperlibrary.js
@@ -77,7 +77,14 @@ class Testpaperlibrary extends Component {
 			}
 		});
 		var data={
-
+			discipline_id:this.state.discipline_id,
+			sub_discipline_id:this.state.sub_discipline_id,
+			tag_discipline_id:this.state.tag_discipline_id,
+			public: this.state.defaultActiveKey,
+			difficulty: this.state.difficulty,
+			keywords: this.state.keywords,
+			page: 1,
+			per_page:10,
 		}
 		this.getdata(data);
 
@@ -172,7 +179,6 @@ class Testpaperlibrary extends Component {
 			tag_discipline_id:null,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
-			item_type: this.state.item_type,
 			keywords: this.state.keywords,
 			page: this.state.page,
 			per_page:10,
@@ -191,7 +197,6 @@ class Testpaperlibrary extends Component {
 			tag_discipline_id:null,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
-			item_type: this.state.item_type,
 			keywords: this.state.keywords,
 			page: this.state.page,
 			per_page:10,
@@ -209,7 +214,6 @@ class Testpaperlibrary extends Component {
 			tag_discipline_id:tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
-			item_type: this.state.item_type,
 			keywords: this.state.keywords,
 			page: this.state.page,
 			per_page:10,
@@ -263,6 +267,9 @@ class Testpaperlibrary extends Component {
 				if (result.data.status == 0) {
 					this.props.showNotification(`公开试卷成功`);
 					var data = {
+						discipline_id:this.state.discipline_id,
+						sub_discipline_id:this.state.sub_discipline_id,
+						tag_discipline_id:this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
 						keywords: this.state.keywords,
@@ -286,6 +293,9 @@ class Testpaperlibrary extends Component {
 					this.props.showNotification('删除试卷成功')
 					// props.history.push(response.data.right_url)
 					var data = {
+						discipline_id:this.state.discipline_id,
+						sub_discipline_id:this.state.sub_discipline_id,
+						tag_discipline_id:this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
 						keywords: this.state.keywords,
diff --git a/public/react/src/modules/testpaper/component/Contentpart.js b/public/react/src/modules/testpaper/component/Contentpart.js
index 82f06e3f8..3ffca34c5 100644
--- a/public/react/src/modules/testpaper/component/Contentpart.js
+++ b/public/react/src/modules/testpaper/component/Contentpart.js
@@ -54,10 +54,6 @@ class Contentpart extends Component {
 				<p className="questiontypeheng"></p>
 			</div>
 		);
-
-		const difs=this.props.difficulty;
-		console.log("difs");
-		console.log(difs);
 		return (
 			<div className=" clearfix mt40">
 				<div className="educontent mt10 pb20 w1200s">
@@ -127,9 +123,8 @@ class Contentpart extends Component {
 
 								<Popover  placement="bottom" trigger="hover" content={contents}   >
 									<div className=" sortinxdirection mr10">
-
-										<div className={this.props.difficulty===null?"subjecttit":"subjecttitys"}>
-											难度 <span>{this.props.difficulty===1?"(简单)":this.props.difficulty===1?"(适中)":this.props.difficulty===1?"(困难)":""}</span>
+										<div className="subjecttitys">
+											难度
 										</div>
 										<i className="iconfont icon-sanjiaoxing-down font-12 lg ml7 icondowncolor"></i>
 									</div>