From 351958f4114b5ff8a7c423c75f513430ced4f76f 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 17:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=A2=98=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/question/Paperreview_single.js    | 68 ++++++++++++-------
 .../modules/question/component/Listjihe.js    |  2 +
 2 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/public/react/src/modules/question/Paperreview_single.js b/public/react/src/modules/question/Paperreview_single.js
index d7c0304de..73928ed88 100644
--- a/public/react/src/modules/question/Paperreview_single.js
+++ b/public/react/src/modules/question/Paperreview_single.js
@@ -66,6 +66,9 @@ class Paperreview_single extends Component {
 		let {questions,totalscore,total,items} = this.state;
 		let {objectsingle} =this.props;
 		// //console.log(params);
+
+		const objectsingleid=objectsingle.id;
+		const objectsinglescore=`（${objectsingle.score}分）`;
 		return (
 			<div className="w100s borderwdswuh  mt25 mb20  pd20 " style={{
 				minHeight: "114px",
@@ -74,9 +77,9 @@ class Paperreview_single extends Component {
 
 			{/*顶部*/}
 		<div className="w100s sortinxdirection ">
-			<div className=" sortinxdirection ">
-				<p className="cretitlecolrlis lh28">{objectsingle.id}</p>、<p className="cretitlecolrlisobj lh28">（{objectsingle.score}分）</p>
-			</div>
+			{/*<div className=" sortinxdirection ">*/}
+			{/*	<p className="cretitlecolrlis lh28">{objectsingleid}</p>、<p className="cretitlecolrlisobj lh28">（{objectsinglescore}分）</p>*/}
+			{/*</div>*/}
 			<style>
 				{
 					`
@@ -95,38 +98,57 @@ class Paperreview_single extends Component {
 					`
 				}
 			</style>
-			<div className=" lh28 listjihetixingstit markdown-body cretitlecolrlist"  style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(objectsingle&&objectsingle.name).replace(/▁/g, "▁▁▁")}}>
+			<div className=" lh28 listjihetixingstit markdown-body cretitlecolrlist"  style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(objectsingleid+objectsinglescore+objectsingle.name).replace(/▁/g, "▁▁▁")}}>
 			</div>
 		</div>
 		{/*内容*/}
 		<div className="w100s sortinxdirection">
 
-			<p className="w100s listjihetixingstits sortinxdirection ">
+
 				{
 					objectsingle.item_type==="JUDGMENT"?
-						objectsingle === undefined ||objectsingle === null? "" : objectsingle.choices.map((object, index) => {
-							return (
-								<p className={index===1? "sortinxdirection  ml10":"sortinxdirection  " }  >
-									<Radio checked={object.is_answer}>
-										{object.choice_text}
-									</Radio>
-								</p>
-							)
-						})
+						<p className="w100s listjihetixingstits sortinxdirection ">
+							{
+								objectsingle === undefined ||objectsingle === null? "" : objectsingle.choices.map((object, index) => {
+									return (
+										<p className={index===1? "sortinxdirection  ml10":"sortinxdirection  " }  >
+											<Radio checked={object.is_answer}>
+												{object.choice_text}
+											</Radio>
+										</p>
+									)
+								})
+							}
+						</p>
 						:
-						objectsingle === undefined ||objectsingle === null? "" : objectsingle.choices.map((object, index) => {
-							return (
-								<p className="sortinxdirection " >
-									{tagArray[index]}
-									<p style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(object.choice_text).replace(/▁/g, "▁▁▁")}}></p>
+						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>
 								</p>
-							)
-						})
+							</p>
+							:
+						<p className="w100s listjihetixingstits verticallayout ">
+							{
+								objectsingle === undefined ||objectsingle === null? "" : objectsingle.choices.map((object, index) => {
+									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>
+									)
+								})
+							}
+						</p>
 				}
 
-			</p>
+
 		</div>
-	</div>
+
+
+
+
+			</div>
 		)
 
 	}
diff --git a/public/react/src/modules/question/component/Listjihe.js b/public/react/src/modules/question/component/Listjihe.js
index 69d31f0e8..f592ffb16 100644
--- a/public/react/src/modules/question/component/Listjihe.js
+++ b/public/react/src/modules/question/component/Listjihe.js
@@ -128,6 +128,8 @@ class Listjihe extends Component {
 					</p>
 					}
 				</div>
+
+
 				<div className="w100s sortinxdirection mt10">
 					<p className="listjihetixing">难度：<span >{items.difficulty===1?"简单":items.difficulty===2?"适中":items.difficulty===3?"困难":""}</span></p>
 					<p className="ml30 listjihetixing">题型：<span >{items.item_type==="SINGLE"?"单选题":items.item_type==="MULTIPLE"?"多选题":items.item_type==="JUDGMENT"?"判断题":items.item_type==="PROGRAM"?"编程题":""}</span></p>