From fc3fd27d49fc7ca2a832c82c31af352f1689a7fe 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, 8 Jan 2020 15:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=95=E5=8D=B7=E9=A2=98?=
 =?UTF-8?q?=E5=BA=93=E9=80=89=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/question/NewMyShixunModel.js  |  34 +++---
 .../question/questioncss/questioncom.css      |   5 +
 .../component/Paperlibraryseeid_items.js      | 104 ++++++++++++++----
 .../testpaper/testioncss/testioncss.css       |   3 +
 4 files changed, 110 insertions(+), 36 deletions(-)

diff --git a/public/react/src/modules/question/NewMyShixunModel.js b/public/react/src/modules/question/NewMyShixunModel.js
index 9db5d242f..364dd39f5 100644
--- a/public/react/src/modules/question/NewMyShixunModel.js
+++ b/public/react/src/modules/question/NewMyShixunModel.js
@@ -91,7 +91,7 @@ class NewMyShixunModel extends Component {
 			page: this.state.page,
 			per_page:10,
 			oj_status:null,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 
@@ -117,7 +117,7 @@ class NewMyShixunModel extends Component {
 			page: 1,
 			per_page:10,
 			oj_status:null,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 	}
@@ -141,7 +141,7 @@ class NewMyShixunModel extends Component {
 			page: 1,
 			per_page:10,
 			oj_status:null,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 	}
@@ -156,7 +156,7 @@ class NewMyShixunModel extends Component {
 			public: defaultActiveKey,
 			page:1,
 			per_page:10,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 
@@ -209,7 +209,7 @@ class NewMyShixunModel extends Component {
 			page: 1,
 			per_page:10,
 			oj_status:null,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 
@@ -342,7 +342,7 @@ class NewMyShixunModel extends Component {
 			page: pageNumber,
 			per_page:10,
 			oj_status:this.state.oj_status,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 
 		};
 		this.getdata(data);
@@ -461,7 +461,7 @@ class NewMyShixunModel extends Component {
 			page:1,
 			per_page:10,
 			oj_status:null,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 
 		this.getdata(data);
@@ -488,7 +488,7 @@ class NewMyShixunModel extends Component {
 			per_page:10,
 			keywords:null,
 			oj_status:null,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 
 		this.getdata(data);
@@ -543,7 +543,7 @@ class NewMyShixunModel extends Component {
 			page: this.state.page,
 			per_page:10,
 			oj_status:this.state.oj_status,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 
 		this.getdata(data);
@@ -567,7 +567,7 @@ class NewMyShixunModel extends Component {
 						keywords: this.state.keywords,
 						page: this.state.page,
 						per_page:10,
-						item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+						exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 					};
 					this.getdata(data);
 				}
@@ -593,7 +593,7 @@ class NewMyShixunModel extends Component {
 						keywords: this.state.keywords,
 						page: this.state.page,
 						per_page:10,
-						item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+						exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 
 					};
 					this.getdata(data);
@@ -661,7 +661,7 @@ class NewMyShixunModel extends Component {
 						keywords: this.state.keywords,
 						page: this.state.page,
 						per_page:10,
-						item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+						exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 					};
 					this.getdatasy(data);
 					this.getbasket_listdata();
@@ -683,7 +683,7 @@ class NewMyShixunModel extends Component {
 		}
 
 		axios.delete(url,{ data: {
-				item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+				exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 				}})
 			.then((result) => {
 				if (result.data.status == 0) {
@@ -698,7 +698,7 @@ class NewMyShixunModel extends Component {
 						keywords: this.state.keywords,
 						page: this.state.page,
 						per_page:10,
-						item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+						exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 					};
 					this.getdatasy(data);
 					this.getbasket_listdata();
@@ -739,7 +739,7 @@ class NewMyShixunModel extends Component {
 		}
 		const data={
 			item_ids:item_idsdata,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		}
 		this.getitem_baskets(data);
 		this.setState({
@@ -768,7 +768,7 @@ class NewMyShixunModel extends Component {
 						keywords: this.state.keywords,
 						page: this.state.page,
 						per_page:10,
-						item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+						exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 					};
 					this.getdata(data);
 					this.getbasket_listdata();
@@ -806,7 +806,7 @@ class NewMyShixunModel extends Component {
 			page: this.state.page,
 			per_page:10,
 			oj_status:oj_status,
-			item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 	}
diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index ec2df7ca9..153e94f20 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -951,3 +951,8 @@
 .tites{
     color: #888888 !important;
 }
+.ant-popover-inner-content{
+    padding: 0px !important;
+}
+
+
diff --git a/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js b/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js
index 1ab987ba0..0a6a718c3 100644
--- a/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js
+++ b/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js
@@ -15,6 +15,7 @@ import {
 } from "antd";
 import '../testioncss/testioncss.css';
 import '../../tpm/newshixuns/css/Newshixuns.css';
+import QuillForEditor from "../../../common/quillForEditor";
 
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@@ -67,15 +68,42 @@ class Paperlibraryseeid_items extends Component {
 	render() {
 		let {questions, totalscore, total, items} = this.state;
 		let {objectsingle, indexx, paperreviewsingleindex, indexxy,name} = this.props;
-		// console.log("objectsingle");
-		// console.log(objectsingle);
+
+
+		var itemssname="";
+		try {
+			itemssname= JSON.parse(objectsingle.name);
+		}catch (e) {
+		}
+		if(itemssname===undefined){
+			itemssname=objectsingle.name
+		}
 		return (
 			<div key={indexxy}
 					 className={ "w100s borderwdswuh   mb20  pd20 "}
 					 style={{
 				minHeight: "114px",
 			}}>
-
+				<style>{
+					`
+						.programquill .ql-editor{
+							    padding: 0px;
+						}
+						
+						.programquill .ql-editor p{
+						line-height: 28px;
+					
+						}
+						.programquills .ql-editor{
+							    padding: 0px;
+						}
+						
+						.programquills .ql-editor p{
+						line-height: 20px;
+					
+						}
+					`
+				}</style>
 				{/*顶部*/}
 				<div className="w100s sortinxdirection ">
 					<div className=" sortinxdirection ">
@@ -100,29 +128,46 @@ class Paperlibraryseeid_items extends Component {
 						}
 					</style>
 					{
-						this.props.typenames==="PROGRAM"?
-							<div className=" lh28 listjihetixingstit markdown-body cretitlecolrlist" style={{wordBreak: "break-word"}}
-						dangerouslySetInnerHTML={{__html: markdownToHTML( objectsingle.name).replace(/▁/g, "▁▁▁")}}>
-						</div>
+						objectsingle.item_type==="PROGRAM"?
+							<div className="w100s sortinxdirection">
+								<div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word"}}
+								>
+									({objectsingle.score}分)
+								</div>
+								<div className="ml10 lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word"}}
+										 dangerouslySetInnerHTML={{__html: markdownToHTML(objectsingle.name).replace(/▁/g, "▁▁▁")}}>
+
+								</div>
+							</div>
 							:
-							<div className=" lh28 listjihetixingstit markdown-body cretitlecolrlist" style={{wordBreak: "break-word"}}
-									 dangerouslySetInnerHTML={{__html: markdownToHTML(`（${objectsingle.score}分) ` + objectsingle.name).replace(/▁/g, "▁▁▁")}}>
+							<div className="w100s sortinxdirection">
+								<div className="tites  lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word"}}
+								>
+									({objectsingle.score}分)
+								</div>
+								<div className="ml10 lh28 listjihetixingstit  cretitlecolrlist programquill" style={{wordBreak: "break-word"}}
+								>
+									<QuillForEditor
+										readOnly={true}
+										value={itemssname}
+									/>
+
+								</div>
 							</div>
-
 					}
+
 				</div>
 				{/*内容*/}
 				<div className="w100s sortinxdirection">
 
-
 					{
 						objectsingle.item_type === "JUDGMENT" ?
 							<p className="w100s listjihetixingstits sortinxdirection ">
 								{
 									objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => {
 										return (
-											<p className={index === 1 ? "sortinxdirection  ml10" : "sortinxdirection  "} key={index}>
-												<Radio checked={object.is_answer}>
+											<p className={index === 1 ? "sortinxdirection  ml10" : "sortinxdirection  "}>
+												<Radio  disabled={false}>
 													{object.choice_text}
 												</Radio>
 											</p>
@@ -134,8 +179,17 @@ class Paperlibraryseeid_items extends Component {
 							objectsingle.item_type === "PROGRAM" ?
 								<p className="w100s listjihetixingstitssy sortinxdirection ">
 									<p className={"sortinxdirection  mt15"}>
-										<p style={{wordBreak: "break-word"}}
-											 dangerouslySetInnerHTML={{__html: markdownToHTML(objectsingle.program_attr.description).replace(/▁/g, "▁▁▁")}}></p>
+										{
+											objectsingle&&objectsingle.program_attr&&objectsingle.program_attr.description?
+												<p className="programquill" style={{wordBreak: "break-word"}}
+												>
+													<QuillForEditor
+														readOnly={true}
+														value={JSON.parse(objectsingle.program_attr.description)}
+													/>
+												</p>
+												:
+												""}
 									</p>
 								</p>
 								:
@@ -143,10 +197,23 @@ class Paperlibraryseeid_items extends Component {
 									{
 										objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => {
 											return (
-												<p className={index === 0 ? "sortinxdirection" : "sortinxdirection  mt15"} key={index}>
+												<p className={index === 0 ? "sortinxdirection" : "sortinxdirection  mt15"}>
 													{tagArray[index]}
-													<p style={{wordBreak: "break-word"}}
-														 dangerouslySetInnerHTML={{__html: markdownToHTML(object.choice_text).replace(/▁/g, "▁▁▁")}}></p>
+													<p className="programquills" style={{wordBreak: "break-word"}}>
+														{object ?
+															object.choice_text === undefined || object.choice_text=== null || object.choice_text === "" ?
+																""
+																:
+																object.choice_text.length>0?
+																	<QuillForEditor
+																		readOnly={true}
+																		value={JSON.parse(object.choice_text)}
+																	/>
+																	:""
+															:
+															""
+														}
+													</p>
 												</p>
 											)
 										})
@@ -154,7 +221,6 @@ class Paperlibraryseeid_items extends Component {
 								</p>
 					}
 
-
 				</div>
 
 
diff --git a/public/react/src/modules/testpaper/testioncss/testioncss.css b/public/react/src/modules/testpaper/testioncss/testioncss.css
index a1de362d1..d5d27dbe1 100644
--- a/public/react/src/modules/testpaper/testioncss/testioncss.css
+++ b/public/react/src/modules/testpaper/testioncss/testioncss.css
@@ -892,3 +892,6 @@
     width: 39px;
     height: 44px;
 }
+.tites{
+    color: #888888 !important;
+}