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

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -2641,7 +2641,7 @@ class Listofworksstudentone extends Component {
 							<ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
 								<li className="clearfix ">
 									<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-									{course_is_end===true?<span>
+									{course_is_end===true?"":<span>
 									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
 										(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
 											计算成绩
@@ -2651,7 +2651,7 @@ class Listofworksstudentone extends Component {
 												计算成绩
 											</div>:"")
 									}
-						  	 </span>:""}
+						  	 </span>}
 
 									<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
 										<Search