Merge branch 'dev_item_bank' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank

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,
@@ -320,6 +330,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 +384,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)}

public/react/src/modules/testpaper/component/Contentpart.js

@@ -46,11 +46,11 @@ 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>
 		);
@@ -123,8 +123,7 @@ class Contentpart extends Component {
 
 								<Popover  placement="bottom" trigger="hover" content={contents}   >
 									<div className=" sortinxdirection mr10">
-
+										<div className="subjecttitys">
-										<div className="subjecttit">
 											难度
 										</div>
 										<i className="iconfont icon-sanjiaoxing-down font-12 lg ml7 icondowncolor"></i>
@@ -159,18 +158,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>

public/react/src/modules/testpaper/component/Contentquestionbank.js

@@ -42,14 +42,14 @@ class Contentquestionbank extends Component {
 
 		return (
 
-			<div className=" clearfix mt5 Contentquestionbankstyle">
+			<div className=" clearfix  Contentquestionbankstyle">
-				<div className="educontent mt10  w100s">
+				<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>
 

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">
+           <div className="sjimg ">
-						 <img src={getImageUrl("images/educoder/shijuans.png ")}/>
+						 <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>

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;