From 4ee639828fc5ab80ed31f3ae2919754d5c7a9417 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:15:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E9=A2=84=E8=A7=88=20?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=BC=96=E8=BE=91=20=20=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E7=BC=96=E8=BE=91=E5=99=A8=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/question/Paperreview_item.js  |  4 +-
 .../src/modules/question/Paperreview_items.js |  4 +-
 .../modules/question/Paperreview_single.js    | 96 +++++++++++++++++--
 .../question/questioncss/questioncom.css      |  3 +
 4 files changed, 94 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/question/Paperreview_item.js b/public/react/src/modules/question/Paperreview_item.js
index 9112aa248..a9747e8c2 100644
--- a/public/react/src/modules/question/Paperreview_item.js
+++ b/public/react/src/modules/question/Paperreview_item.js
@@ -426,8 +426,8 @@ class Paperreview_item extends Component {
 				}}>
 					<div className="w100s sortinxdirection">
 						<div className="w70s sortinxdirection">
-							<p className="questionstishu lh34">题数：{this.props.all_score}</p>
-							<p className="ml58 questionstotal lh34">总分：{this.props.all_questions_count}</p>
+							<p className="questionstishu lh34">题数：{this.props.all_questions_count}</p>
+							<p className="ml58 questionstotal lh34">总分：{this.props.all_score}</p>
 						</div>
 						<div className="w30s xaxisreverseorder">
 							<div className="jixuxuanti xiaoshou" onClick={() => this.props.setnewmyshixunmodelbool(true)}>
diff --git a/public/react/src/modules/question/Paperreview_items.js b/public/react/src/modules/question/Paperreview_items.js
index 81ec320b5..8e86c514a 100644
--- a/public/react/src/modules/question/Paperreview_items.js
+++ b/public/react/src/modules/question/Paperreview_items.js
@@ -59,8 +59,8 @@ class Paperreview_items extends Component {
 		let {paperreviewsingleindex,paperreviewsinglename,typenames,indexs,object,typenamesn}=this.props;
 
 		// console.log(object);
-		console.log("Paperreview_items");
-		console.log(object.item_id);
+		// console.log("Paperreview_items");
+		// console.log(object.item_id);
 		return (
 			<div>
 				{
diff --git a/public/react/src/modules/question/Paperreview_single.js b/public/react/src/modules/question/Paperreview_single.js
index 5b64372a8..fdc9ff095 100644
--- a/public/react/src/modules/question/Paperreview_single.js
+++ b/public/react/src/modules/question/Paperreview_single.js
@@ -17,6 +17,7 @@ import Itembankstop from "./component/Itembankstop";
 import NoneData from './component/NoneData';
 import './questioncss/questioncom.css';
 import '../tpm/newshixuns/css/Newshixuns.css';
+import QuillForEditor from "../../common/quillForEditor";
 
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@@ -69,13 +70,42 @@ class Paperreview_single extends Component {
 	render() {
 		let {questions, totalscore, total, items} = this.state;
 		let {objectsingle, indexx, paperreviewsingleindex, indexxy,name} = this.props;
+
+
+		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 "}
 					 onMouseEnter={() => this.props.showparagraphs(indexxy,name)} 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 ">
@@ -99,9 +129,35 @@ class Paperreview_single extends Component {
 					`
 						}
 					</style>
-					<div className=" lh28 listjihetixingstit markdown-body cretitlecolrlist" style={{wordBreak: "break-word"}}
-							 dangerouslySetInnerHTML={{__html: markdownToHTML(`（${objectsingle.score}分) ` + 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="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">
@@ -114,7 +170,7 @@ class Paperreview_single extends Component {
 									objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => {
 										return (
 											<p className={index === 1 ? "sortinxdirection  ml10" : "sortinxdirection  "}>
-												<Radio checked={object.is_answer}>
+												<Radio  disabled={false}>
 													{object.choice_text}
 												</Radio>
 											</p>
@@ -126,8 +182,17 @@ class Paperreview_single 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>
 								:
@@ -137,8 +202,21 @@ class Paperreview_single extends Component {
 											return (
 												<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>
 											)
 										})
diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index 1bdf3853c..ec2df7ca9 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -948,3 +948,6 @@
 .lh26{
     line-height: 26px !important;
 }
+.tites{
+    color: #888888 !important;
+}