From 7d13975eea54fc9edd09ea8e30b7c4d1ae872ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 25 Dec 2019 11:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=98=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/question/Question.js | 30 ++++++++++-
 .../modules/question/Questionitem_banks.js    | 53 ++++++++++++++++++-
 .../modules/question/component/Contentpart.js | 26 +++++----
 .../modules/question/component/Listjihe.js    | 39 ++++++++++----
 .../question/questioncss/questioncom.css      |  4 ++
 5 files changed, 128 insertions(+), 24 deletions(-)

diff --git a/public/react/src/modules/question/Question.js b/public/react/src/modules/question/Question.js
index bf403f5d4..0ae35f7f6 100644
--- a/public/react/src/modules/question/Question.js
+++ b/public/react/src/modules/question/Question.js
@@ -32,7 +32,9 @@ class Question extends Component {
 			modalsType:false,
 			titilesm:"设为公开后，所有成员均可使用试题",
 			titiless:"是否设置为公开？",
-			titbool:false
+			titbool:false,
+			Contentdata:[],
+			difficulty:null,
 		}
 
 	}
@@ -65,8 +67,13 @@ class Question extends Component {
 		this.setState({
 			defaultActiveKey:key,
 		})
+		var data={
+			public:key
+		};
+		this.getdata(data);
 
 	}
+
 	getdata =(data)=>{
 		const url=`/item_banks.json`;
 		axios.get((url),{params:data}).then((response) => {
@@ -81,6 +88,9 @@ class Question extends Component {
 			}
 			//console.log("item_banks");
 			//console.log(response);
+			this.setState({
+				Contentdata:response.data
+			})
 		}).catch((error) => {
 			//console.log(error)
 
@@ -144,6 +154,18 @@ class Question extends Component {
 			modalsType:false
 		})
 	}
+
+	setdifficulty=(difficulty)=>{
+		this.setState({
+			difficulty:difficulty,
+		})
+
+		var data={
+			public:this.state.defaultActiveKey,
+			difficulty:difficulty
+		};
+		this.getdata(data);
+	}
 	render() {
 		let {page,limit,count,Headertop,visible,placement,modalsType}=this.state;
 		return (
@@ -157,7 +179,11 @@ class Question extends Component {
 				{/*顶部*/}
 				<Headplugselection ></Headplugselection>
 				{/*头部*/}
-        <Contentpart {...this.state} {...this.props} showmodels={()=>this.showmodels()} showmodelysl={()=>this.showmodelysl()} callback={(e)=>this.callback(e)}></Contentpart>
+        <Contentpart {...this.state} {...this.props}
+										 setdifficulty={(e)=>this.setdifficulty(e)}
+										 showmodels={()=>this.showmodels()}
+										 showmodelysl={()=>this.showmodelysl()}
+										 callback={(e)=>this.callback(e)}></Contentpart>
 				{/*分页*/}
 				{/*<div className="clearfix mt5">*/}
 				{/*<div className="educontent mt10 pb20 w1200s">*/}
diff --git a/public/react/src/modules/question/Questionitem_banks.js b/public/react/src/modules/question/Questionitem_banks.js
index 61acd3a00..88870744c 100644
--- a/public/react/src/modules/question/Questionitem_banks.js
+++ b/public/react/src/modules/question/Questionitem_banks.js
@@ -103,10 +103,14 @@ class Questionitem_banks extends Component {
 		////console.log(this.contentMdRef.Getdatas());
 		////console.log("preservation3333");
 		////console.log(this.answerMdRef.onSave());
+		var url="/item_banks.json";
 		 if(this.contentMdRef !=null){
 			 console.log(this.contentMdRef.Getdatas());
 		 }
+     if(this.contentMdRef.Getdatas().length===0){
 
+     	return;
+		 }
 		 if(this.state.item_type===null ||this.state.item_type==="PROGRAM"){
 
 
@@ -116,7 +120,49 @@ class Questionitem_banks extends Component {
 			 if( this.answerMdRef!=null){
 				 //单选题
 				 console.log(this.answerMdRef.onSave());
+
+				 if(this.answerMdRef.onSave().length===0){
+				 	return;
+				 }
+				 var anserdata=this.answerMdRef.onSave();
+          const choices=[];
+				 // 1: [3]
+				 // 2: (4) ["1", "2", "3", "4"]
+				 for(var k=0;k<anserdata[2].length;k++){
+					   console.log("k");
+             console.log(k);
+             const  choicesdata={
+							 choice_text:anserdata[2][k],
+							 is_answer:anserdata[1]-1===k?0:1,
+						 }
+					 choices.push(choicesdata);
+				 }
+
+
+				 var data={
+					 repertoire_id:1,
+					 sub_repertoire_id:1,
+					 tag_repertoire_id:[1,3],
+					 name:anserdata[0],
+					 item_type:"SINGLE",
+					 difficulty:2,
+					 analysis:anserdata[3],
+					 choices:choices,
+
+				 }
+				 axios.post(url, data)
+					 .then((result) => {
+						 if (result.data.status == 0) {
+							 this.props.showNotification(`新增单选题成功`);
+
+						 }
+					 }).catch((error) => {
+					 console.log(error);
+				 })
+
 			 }
+
+
 		 }
 		if(this.state.item_type==="MULTIPLE"){
 			if(this.Choques!=null){
@@ -242,8 +288,11 @@ class Questionitem_banks extends Component {
 							position:"absolute",
 							bottom: "0px",
 						}} >
-
-							<div className="divquxiao mr20 xiaoshou"><p className="divquxiaotest" >取消</p></div>
+							<a href={'/question'}>
+							<div className="divquxiao mr20 xiaoshou">
+								<p className="divquxiaotest" >取消</p>
+							</div>
+							</a>
 							<div className="divbaocun xiaoshou"><p className="divbaocuntests" onClick={()=>this.preservation()}>保存</p></div>
 						</div>
 				}
diff --git a/public/react/src/modules/question/component/Contentpart.js b/public/react/src/modules/question/component/Contentpart.js
index 6b0ec2671..80130c63f 100644
--- a/public/react/src/modules/question/component/Contentpart.js
+++ b/public/react/src/modules/question/component/Contentpart.js
@@ -61,18 +61,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 buttonWidth = 70;
-		//console.log("Contentpart");
-		//console.log(this.props);
+		console.log("Contentpart");
+		console.log(this.props);
 		return (
 			<div className=" clearfix mt5">
 				<div className="educontent mt10 pb20 w1200s">
@@ -131,9 +131,11 @@ class Contentpart extends Component {
 						 <div className="xaxisreverseorder">
 							 {
 								 defaultActiveKey===0||defaultActiveKey==="0"?
+									 <a href={'/question/newitem'}>
 									 <div className="newbutoon">
-										 <p className="newbutoontes">新增</p>
+										 <p className="newbutoontes" >新增</p>
 									 </div>
+									 </a>
 									 :""
 							 }
 							 <Popover  placement="bottom"  content={contents} trigger="click">
@@ -182,12 +184,16 @@ class Contentpart extends Component {
 					</div>
 					{/*列表集合*/}
 					<div className=" w100s">
-						<Listjihe {...this.state} {...this.props} showmodels={()=>this.props.showmodels()} showmodelysl={()=>this.props.showmodelysl()}>
+						{this.props.Contentdata.items === undefined ||this.props.Contentdata.items === null? "" : this.props.Contentdata.items.map((object, index) => {
+							return (
+								<Listjihe {...this.state} {...this.props} items={object} showmodels={()=>this.props.showmodels()} showmodelysl={()=>this.props.showmodelysl()}>
+
+								</Listjihe>
+							)
+						})}
+
 
-						</Listjihe>
-						<Listjihe {...this.state} {...this.props} showmodels={()=>this.props.showmodels()} showmodelysl={()=>this.props.showmodelysl()}>
 
-						</Listjihe>
 					</div>
 
 
diff --git a/public/react/src/modules/question/component/Listjihe.js b/public/react/src/modules/question/component/Listjihe.js
index 165450de7..52b381c0f 100644
--- a/public/react/src/modules/question/component/Listjihe.js
+++ b/public/react/src/modules/question/component/Listjihe.js
@@ -9,6 +9,11 @@ import {
 	Pagination,
 } from "antd";
 import './../questioncss/questioncom.css';
+const tagArray = [
+	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
+	'J．', 'K．', 'L．', 'M．', 'N．', 'O．', 'P．', 'Q．', 'R．',
+	'S．', 'T．', 'U．', 'V．', 'W．', 'X．', 'Y．', 'Z．'
+]
 class Listjihe extends Component {
 	constructor(props) {
 		super(props);
@@ -40,7 +45,7 @@ class Listjihe extends Component {
 
 	render() {
 		let {page,name,nd,chakanjiexibool}=this.state;
-		let {defaultActiveKey}=this.props;
+		let {defaultActiveKey,items}=this.props;
 
 		//console.log("Listjihe");
 		//console.log(this.props);
@@ -49,25 +54,36 @@ class Listjihe extends Component {
 				{/*顶部*/}
 				<div className="w100s sortinxdirection">
 					<div className="w70s listjihetixingstit">
-						1___________的意思？
+						{
+							items&&items.name
+						}
 					</div>
 					<div className="w30s xaxisreverseorder">
-						<p className="listjihetixing">难度：<span className="listjihetixings">{nd}</span></p>
-						<p className="mr30 listjihetixing">题型：<span className="listjihetixings">{name}</span></p>
+						<p className="listjihetixing">难度：<span className="listjihetixings">{items.difficulty===1?"简单":items.difficulty===2?"适中":items.difficulty===3?"困难":""}</span></p>
+						<p className="mr30 listjihetixing">题型：<span className="listjihetixings">{items.item_type==="SINGLE"?"单选题":""}</span></p>
 					</div>
 				</div>
 				{/*内容*/}
 				<div className="w100s sortinxdirection">
-         <p className="w100s listjihetixingstits">
-					 A．网页 B．万维网 D．超文本传输协议
-				 </p>
+         <p className="w100s listjihetixingstits sortinxdirection">
+					 {items === undefined ||items === null? "" : items.choices.map((object, index) => {
+						 return (
+							 <p className="sortinxdirection ml10">
+								 {tagArray[index]}
+								 {
+									 object.choice_text
+								 }
+							 </p>
+						 )
+					 })}
+					 </p>
 				</div>
 
 				{/*更新时间*/}
 				<div className="w100s sortinxdirection mt22">
 					<div className="w50s listjihetixingstit sortinxdirection">
-           <p className="updatetimes lh30">更新时间：2019-12-09</p>
-						<p className="updatetimes lh30">创建者：王老师</p>
+           <p className="updatetimes lh30">更新时间：{items.update_time}</p>
+						<p className="updatetimes lh30 ml45">创建者：{items.author.name}</p>
 					</div>
 					<div className="w50s xaxisreverseorder">
 						<p className="selection  xiaoshou">
@@ -106,7 +122,10 @@ class Listjihe extends Component {
 						<p className="analysis mt22">解析：</p>
 
 						<p className="mt15 testfondex">
-							万维网WWW是World Wide Web的简称，也称为Web、3W等。WWW是基于客户机/服务器方式的信息发现技术和超文本技术的综合。WWW服务器通过超文本标记语言(HTML)把信息组织成为图文并茂的超文本，利用链接从一个站点跳到另个站点。这样一来彻底摆脱了以前查询工具只能按特定路径一步步地查找信息的限制
+
+							{
+								items.analysis
+							}
 						</p>
 
 					</div>:""
diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index a357f3f3d..828d258e5 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -536,3 +536,7 @@
     color:rgba(51,51,51,1);
     line-height:33px;
 }
+
+.ml45{
+    margin-left: 45px;
+}