From 5195326ecc033a33088cf9cda98c1f9916b31fe7 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 13:39:19 +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 | 22 +++++++++++++++
 .../testpaper/component/Contentpart.js        | 27 ++++++++++++-------
 .../component/Contentquestionbank.js          |  6 ++---
 .../modules/testpaper/component/Listjihe.js   |  6 ++---
 .../testpaper/testioncss/testioncss.css       | 10 +++++++
 5 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/testpaper/Testpaperlibrary.js b/public/react/src/modules/testpaper/Testpaperlibrary.js
index 1d9ee01b8..4d062efd9 100644
--- a/public/react/src/modules/testpaper/Testpaperlibrary.js
+++ b/public/react/src/modules/testpaper/Testpaperlibrary.js
@@ -320,6 +320,27 @@ class Testpaperlibrary extends Component {
 		})
 	};
 
+	setdifficulty=(difficulty)=>{
+		this.setState({
+			difficulty: difficulty,
+			visiblemys: false,
+		})
+
+		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: difficulty,
+			keywords: this.state.keywords,
+			page: this.state.page,
+			per_page:10,
+		};
+
+		this.getdata(data);
+
+	}
+
 	render() {
 		let{Headertop,items_count,page,per_page,modalsTypes,modalsType}=this.state;
 		return (
@@ -353,6 +374,7 @@ class Testpaperlibrary extends Component {
 				<Contentpart
 					{...this.props}
 					{...this.state}
+					setdifficulty={(e)=>this.setdifficulty(e)}
 					showmodels={(e)=>this.showmodels(e)}
 					showmodelysl={(e)=>this.showmodelysl(e)}
 					setdatafuns={(key)=>this.setdatafuns(key)}
diff --git a/public/react/src/modules/testpaper/component/Contentpart.js b/public/react/src/modules/testpaper/component/Contentpart.js
index 84ea7c17e..82f06e3f8 100644
--- a/public/react/src/modules/testpaper/component/Contentpart.js
+++ b/public/react/src/modules/testpaper/component/Contentpart.js
@@ -46,14 +46,18 @@ class Contentpart extends Component {
 				width:'93px',
 				height:'120px',
 			}}>
-				<p className="questiontype ">简单</p>
+				<p className="questiontype " onClick={()=>this.props.setdifficulty(1)}>简单</p>
 				<p className="questiontypeheng"></p>
-				<p className="questiontype " >适中</p>
+				<p className="questiontype "  onClick={()=>this.props.setdifficulty(2)}>适中</p>
 				<p className="questiontypeheng"></p>
-				<p className="questiontype " >困难</p>
+				<p className="questiontype "  onClick={()=>this.props.setdifficulty(3)}>困难</p>
 				<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">
@@ -124,8 +128,8 @@ class Contentpart extends Component {
 								<Popover  placement="bottom" trigger="hover" content={contents}   >
 									<div className=" sortinxdirection mr10">
 
-										<div className="subjecttit">
-											难度
+										<div className={this.props.difficulty===null?"subjecttit":"subjecttitys"}>
+											难度 <span>{this.props.difficulty===1?"(简单)":this.props.difficulty===1?"(适中)":this.props.difficulty===1?"(困难)":""}</span>
 										</div>
 										<i className="iconfont icon-sanjiaoxing-down font-12 lg ml7 icondowncolor"></i>
 									</div>
@@ -159,18 +163,23 @@ class Contentpart extends Component {
 					</div>
 					{/*内容*/}
 					{
-						this.props.Contentdata.items === undefined ||this.props.Contentdata.items === null||this.props.Contentdata.items.length===0 ?
+						this.props.Contentdata.exams === undefined ||this.props.Contentdata.exams === null||this.props.Contentdata.exams.length===0 ?
 							<div className=" w100s mb10"></div>
 							:
-							<div className=" w100s mb10">
+							<div className=" w100s mb10" style={
+								{
+									position:"relative",
+								top:" -8px",
+								}
+							}>
 								{
 									defaultActiveKey===1||defaultActiveKey==="1"?
-										<Contentquestionbank {...this.props} {...this.state}  selectallquestionsonthispage={()=>this.props.selectallquestionsonthispage()} ></Contentquestionbank>
+										<Contentquestionbank {...this.props} {...this.state}  ></Contentquestionbank>
 										:""
 								}
 								{
 									defaultActiveKey===0||defaultActiveKey==="0"?
-										<Contentquestionbank {...this.props} {...this.state} selectallquestionsonthispage={()=>this.props.selectallquestionsonthispage()}></Contentquestionbank>
+										<Contentquestionbank {...this.props} {...this.state} ></Contentquestionbank>
 										:""
 								}
 							</div>
diff --git a/public/react/src/modules/testpaper/component/Contentquestionbank.js b/public/react/src/modules/testpaper/component/Contentquestionbank.js
index ceef1fd87..1e036f858 100644
--- a/public/react/src/modules/testpaper/component/Contentquestionbank.js
+++ b/public/react/src/modules/testpaper/component/Contentquestionbank.js
@@ -42,14 +42,14 @@ class Contentquestionbank extends Component {
 
 		return (
 
-			<div className=" clearfix mt5 Contentquestionbankstyle">
-				<div className="educontent mt10  w100s">
+			<div className=" clearfix  Contentquestionbankstyle">
+				<div className="educontent   w100s">
 					<div className="sortinxdirection w100s" >
 						<div className="sortinxdirection w50s">
 
 						</div>
 						<div className="xaxisreverseorder testpaper w50s">
-							共{this.props.items_count?this.props.items_count:0}个试题
+							共{this.props.items_count?this.props.items_count:0}个试卷
 						</div>
 					</div>
 
diff --git a/public/react/src/modules/testpaper/component/Listjihe.js b/public/react/src/modules/testpaper/component/Listjihe.js
index 3aef5da9b..724a5def7 100644
--- a/public/react/src/modules/testpaper/component/Listjihe.js
+++ b/public/react/src/modules/testpaper/component/Listjihe.js
@@ -74,10 +74,10 @@ class Listjihe extends Component {
 		return (
 			<div className={" borderwdsst  pd20 mb20 intermediatecenter"}>
         <div className="sortinxdirection w100s">
-           <div className="sjimg borderwd">
-						 <img src={getImageUrl("images/educoder/shijuans.png ")}/>
+           <div className="sjimg ">
+						 <img src={getImageUrl("images/educoder/shijuans.png ")} width={80}/>
 					 </div>
-           <div className="w100s  verticallayout ml37" >
+           <div className="w100s  verticallayout ml20" >
 						 <div className="w100s"> <p className="sjtitle">{names}</p></div>
 						 <div className="w100s sortinxdirection mt9">
 							 <p className="sjtitles">试题数：<span >{question_counts}</span></p>
diff --git a/public/react/src/modules/testpaper/testioncss/testioncss.css b/public/react/src/modules/testpaper/testioncss/testioncss.css
index 5bd523488..181334981 100644
--- a/public/react/src/modules/testpaper/testioncss/testioncss.css
+++ b/public/react/src/modules/testpaper/testioncss/testioncss.css
@@ -143,6 +143,7 @@
     width: 1020px !important;
     background: #FFFFFF;
     border: 1px solid #DDDDDD;
+    margin-left: 20px;
     min-height:150px;
 }
 .borderwdswuh{
@@ -199,6 +200,15 @@
     line-height: 42px;
     cursor:pointer;
 
+}
+
+.subjecttitys{
+    height:19px;
+    font-size:14px;
+    color:rgba(51,51,51,1);
+    line-height: 42px;
+    cursor:pointer;
+
 }
 .ml55{
     margin-right: 55px;