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

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

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

@@ -2344,15 +2344,17 @@ 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>
-
-											{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
-																{teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status=== 0? "":
-																	computeTimetype===true&&this.props.isNotMember()===false?	<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+									<span>
+									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
+										(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
 											计算成绩
-																	</div>:<div className={"computeTimes font-13"}>
+										</div>:""):
+										teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+											(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
 												计算成绩
-																	</div>}
-															</span>}
+											</div>:"")
+									}
+						  	</span>
 
 									<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
 										<Search
@@ -2631,16 +2633,22 @@ class Listofworksstudentone extends Component {
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
 															{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
-
-																{teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status=== 0? "":
-																	computeTimetype===true&&this.props.isNotMember()===false?	<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+													{computeTimetype===true?
+														(this.props.isNotMember()===false?
+															<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 																计算成绩
-																	</div>:<div className={"computeTimes font-13"}>
+															</div>
+															:"")
+														:
+														(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+															this.props.isNotMember()===false?
+																<div className={"computeTimes font-13"}>
 																	计算成绩
-																	</div>}
+																</div>
+																:"")
+													}
 												</span>}
 
-
 														</div>
 
 													</div>
@@ -2792,16 +2800,17 @@ class Listofworksstudentone extends Component {
 														<div className="fr">
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-															{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":
-															 <span>
-																 {teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status===0?"":
-																	 this.props.isNotMember()===false&&computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+															{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+													{computeTimetype===true?
+														(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 															计算成绩
-																 </div>:<div className={"computeTimes font-13"}>
+														</div>:""):
+														teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+															(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
 																计算成绩
-																 </div>}
-															 </span>
+															</div>:"")
 													}
+												 </span>}
 
 														</div>
 														{/*因为计算按钮占了和这个位置，和设计沟通学生视角取消这个按钮*/}