From 6376e3218985a3d4110df0c2a68d35cf579ca038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 5 Sep 2019 21:13:29 +0800
Subject: [PATCH 1/2] b

---
 .../src/modules/courses/shixunHomework/Listofworksstudentone.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index a73e6a571..57a58f6eb 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2660,7 +2660,7 @@ class Listofworksstudentone extends Component {
 												</div>:"")
 										}
 						  	    </span>}
-										<span className="search-newyslw">
+										<span className="search-newyslw fr ml20">
 										<Search
 											placeholder="请输入姓名或学号搜索"
 											id="subject_search_input"

From 98741d678134a93012683029ccf695d4391786b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 5 Sep 2019 21:18:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/shixunHomework/ShixunWorkReport.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 0a0688d33..0d3a5fce6 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -393,7 +393,7 @@ class ShixunWorkReport extends Component {
 												 </span>
 
 												 <span className={"passbox"}>
-												   	<div><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
+												   	<div><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
 												    <div><span className={"color999"}>实战耗时：</span> <span className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.time_consuming===null?'--':data&&data.time_consuming}</span></div>
 												 </span>
 									   	 </p>