Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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"

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>