From 4bc87cc97f6c0dfa9742a8c7f18d8e970e2650ee Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 19 Jul 2019 10:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=89=A7=E8=A1=8C=E6=97=B6?=
 =?UTF-8?q?=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/page/main/CodeEvaluateView.css   | 16 +++++++++++++++-
 .../src/modules/page/main/CodeEvaluateView.js    |  7 ++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/page/main/CodeEvaluateView.css b/public/react/src/modules/page/main/CodeEvaluateView.css
index 99b08a496..bd0427d7b 100644
--- a/public/react/src/modules/page/main/CodeEvaluateView.css
+++ b/public/react/src/modules/page/main/CodeEvaluateView.css
@@ -112,4 +112,18 @@
 }
   #evaluating_contents .-text-danger{
     padding-bottom: 6px;
-  }
\ No newline at end of file
+  }
+
+
+.-task-ces-top .description {
+    color: #616B77;
+    padding: 0 8px;
+    font-size: 12px;
+}
+.-task-ces-top .split {
+    border-right: 1px solid #616B77;
+    width: 1px;
+    display: inline-block;
+    height: 10px;
+    margin: 5px 0;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/page/main/CodeEvaluateView.js b/public/react/src/modules/page/main/CodeEvaluateView.js
index a738d03fb..48bb0b245 100644
--- a/public/react/src/modules/page/main/CodeEvaluateView.js
+++ b/public/react/src/modules/page/main/CodeEvaluateView.js
@@ -172,7 +172,7 @@ class CodeEvaluateView extends Component {
 			} else if (item.result == false) {
 				headIconClass = 'fa-exclamation-circle -text-danger'
 			}
-		
+			
 			testSetsComponentArray.push(
 				<div className="-task-ces-top clearfix" onClick={ this.onTestSetHeaderClick.bind(this, index) }
 						style={{cursor:'pointer', 'margin-top':index == 0 ? '4px' : ''}} key={index+'-0'}>
@@ -180,8 +180,13 @@ class CodeEvaluateView extends Component {
 						<i className={`fa ${ 'fa-caret-right'} mr8 font-16`}
 						style={isExpanded ? {transform: 'rotate(90deg)'} : {}}></i>
 						<span className="font-14">测试集 {index + 1}</span>
+						
 						{ headIconClass && <i className={`fa ${ headIconClass } fr mt2 ml5 font-16`}></i> }
 						{ _headLockIconClass && <i className={`fa ${ _headLockIconClass } fr mt2 ml5 font-16`}></i> }
+
+						{ item.ts_memo && <span className="fr description">消耗内存{item.ts_memo}MB</span> }		
+						{ item.ts_memo && item.ts_time && <span className="split"></span> }				
+						{ item.ts_time && <span className="fr description">代码执行时长：{item.ts_time}秒</span> }
 						
 					</p>
 				</div>