From 4b0cc37380d7613585026afa6e5931001942d1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 8 Nov 2019 17:05:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9E=E8=AE=AD=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E8=AF=84=E9=98=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/ShixunWorkReport.js        | 134 ++++++++++--------
 1 file changed, 71 insertions(+), 63 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 737ed4c00..a6302de6d 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -37,6 +37,7 @@ class ShixunWorkReport extends Component {
 			showAppraiseModaltype:false,
 			work_comment_hidden:undefined,
 			work_comment:undefined,
+			has_commit: false,
 		}
 
 	}
@@ -111,7 +112,8 @@ class ShixunWorkReport extends Component {
 					data:result.data,
 					work_comment_hidden:result.data.work_comment_hidden,
 					work_comment:result.data.work_comment,
-					spinning:false
+					spinning: false,
+					has_commit: result.data.has_commit
 				})
 			}
 
@@ -303,7 +305,7 @@ class ShixunWorkReport extends Component {
 
 	}
 	render() {
-		let{data,showAppraiseModaltype,work_comment_hidden,work_comment} =this.state;
+		let {data, showAppraiseModaltype, work_comment_hidden, work_comment, has_commit} = this.state;
 
 		let category_id=data===undefined?"":data.category===null?"":data.category.category_id;
 		let homework_common_id=data===undefined?"":data.homework_common_id;
@@ -557,22 +559,24 @@ class ShixunWorkReport extends Component {
 						showAppraiseModal={(type,id,show,hidden)=>this.showAppraiseModal(type,id,show,hidden)}
 					/>
 
+					{
+						has_commit === false ? "" :
+							<div>
+								<div className="stud-class-set bor-bottom-greyE mt17">
+									<div className="clearfix edu-back-white poll_list">
+										<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">图形统计</div>
+										<Shixunechart
+											data={data}
+										/>
+									</div>
+								</div>
 
-					<div className="stud-class-set bor-bottom-greyE mt17">
-						<div className="clearfix edu-back-white poll_list">
-							<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">图形统计</div>
-							<Shixunechart
-								data={data}
-							/>
-						</div>
-					</div>
-
-					<div className="stud-class-set bor-bottom-greyE">
+								<div className="stud-class-set bor-bottom-greyE">
 
-						<div className="clearfix edu-back-white poll_list pad40px">
-							<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">实训详情</div>
-              <style>
-	              {`
+									<div className="clearfix edu-back-white poll_list pad40px">
+										<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">实训详情</div>
+										<style>
+											{`
 	              .poll_list a{
 	              padding:0px !important;
 	              }
@@ -580,63 +584,67 @@ class ShixunWorkReport extends Component {
 	                  background: #4CACFF;
 	              }
 	              `}
-              </style>
-							{
-								data&&data.shixun_detail===undefined?"":data.shixun_detail.map((item,key)=>{
-									return(
-										<div id={"id"+item.position} key={key} className={"mb20"}>
-											<div className="font-16 color-dark-21 ml20 mr20">
-												<p className="clearfix mb20">
+										</style>
+										{
+											data && data.shixun_detail === undefined ? "" : data.shixun_detail.map((item, key) => {
+												return (
+													<div id={"id" + item.position} key={key} className={"mb20"}>
+														<div className="font-16 color-dark-21 ml20 mr20">
+															<p className="clearfix mb20">
 									        <span className="panel-inner-icon mr15 fl mt3 backgroud4CACFF">
 									            <i className="fa fa-code font-16 color_white"></i>
 									        </span>
-													<span className="fl mt3 font-14">
+																<span className="fl mt3 font-14">
 														<span className="font-bd mr15">第{item.position}关</span>
 														<Link to={/tasks/+item.game_identifier} >
 															<span className={"font-14"}>{item.subject}</span>
 														</Link>
 													</span>
-												</p>
-												<Coursesshixundetails
-													data={item.outputs}
-												/>
-											</div>
-
-											{item.st===0?item.passed_code===null?"":<div className="font-16 color-dark-21 ml20 mr20">
-												<div className="bor-grey-e mt15">
-													<p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">
-														<span className="fl">最近通过的代码</span>
-														<span className="fr codeboxright">{item.path}</span>
-													</p>
-
-													<div className="test-code bor-top-greyE">
-														<li className="clearfix">
-															<CodeMirror
-																value={item.passed_code}
-																options={{
-																	// mode: 'xml',
-																	theme: 'default',
-																	lineNumbers: true,
-																	// extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
-																	indentUnit: 4, //代码缩进为一个tab的距离
-																	matchBrackets: true,
-																	autoRefresh: true,
-																	smartIndent: true,//智能换行
-																	styleActiveLine: true,
-																	lint: true,
-																	readOnly: "nocursor"
-																}}
+															</p>
+															<Coursesshixundetails
+																data={item.outputs}
 															/>
-														</li>
+														</div>
+
+														{item.st === 0 ? item.passed_code === null ? "" :
+															<div className="font-16 color-dark-21 ml20 mr20">
+																<div className="bor-grey-e mt15">
+																	<p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">
+																		<span className="fl">最近通过的代码</span>
+																		<span className="fr codeboxright">{item.path}</span>
+																	</p>
+
+																	<div className="test-code bor-top-greyE">
+																		<li className="clearfix">
+																			<CodeMirror
+																				value={item.passed_code}
+																				options={{
+																					// mode: 'xml',
+																					theme: 'default',
+																					lineNumbers: true,
+																					// extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
+																					indentUnit: 4, //代码缩进为一个tab的距离
+																					matchBrackets: true,
+																					autoRefresh: true,
+																					smartIndent: true,//智能换行
+																					styleActiveLine: true,
+																					lint: true,
+																					readOnly: "nocursor"
+																				}}
+																			/>
+																		</li>
+																	</div>
+																</div>
+															</div> : ""}
 													</div>
-												</div>
-											</div>:""}
-								 </div>
-								)
-							})
-							}
-					</div>
-					</div>
+												)
+											})
+										}
+									</div>
+								</div>
+							</div>
+					}
+
 
 				</div>
 			</div>