Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/exercise/Exercisestatisticalresult.js

@@ -11,6 +11,7 @@ import '../css/busyWork.css';
 import '../poll/pollStyle.css';
 
 const CheckboxGroup = Checkbox.Group;
+const $ = window.$
 function createMarkup(value) { return {__html:value} };
 class Exercisestatisticalresult extends Component {
 

public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

@@ -19,6 +19,7 @@ import Ecerciseallbackagain from './Ecerciseallbackagain';
 
 const polls_status={1:"未发布",2:"提交中",3:"已截止",4:"已结束"}
 const start_Value={0:"继续答题",1:"查看答题",2:"开始答题"}
+
 //试卷主要设置页面
 class Testpapersettinghomepage extends Component{
     constructor(props) {

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

@@ -2328,13 +2328,14 @@ class Listofworksstudentone extends Component {
 									<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>
 										<span>
-									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
+									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
+										(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
 											计算成绩
-										</div>:
+										</div>:""):
 										teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
-												<div className={"computeTimes font-13"}>
+											(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
 													计算成绩
-												</div>
+												</div>:"")
 											}
 						  	</span>
 
@@ -2485,7 +2486,7 @@ class Listofworksstudentone extends Component {
 							</div>
 							{
 								teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
-									<div className="edu-txt-center mt30 mb20">
+									<div className="edu-txt-center edu-back-white mt30 mb20">
 										<Pagination showQuickJumper current={page}
 																onChange={this.paginationonChanges} pageSize={limit}
 																total={teacherdata.work_count}></Pagination>
@@ -2614,14 +2615,19 @@ 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>
-													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+													{computeTimetype===true?
+														(this.props.isNotMember()===false?
+														<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 														计算成绩
-													</div>:
-														teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
-															<div className={"computeTimes font-13"}>
-																计算成绩
-															</div>
-
+													</div>
+													 :"")
+														:
+														(teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
+															this.props.isNotMember()===false?
+																<div className={"computeTimes font-13"}>
+																	计算成绩
+																</div>
+																:"")
 													}
 												</span>}
 
@@ -2777,13 +2783,14 @@ 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&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
-													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+													{computeTimetype===true?
+														(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 														计算成绩
-													</div>:
+													</div>:""):
 															teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
-																<div className={"computeTimes font-13"}>
+																(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
 																	计算成绩
-																</div>
+																</div>:"")
 													}
 												 </span>}
 
@@ -2828,7 +2835,7 @@ class Listofworksstudentone extends Component {
 										</div>
 										{
 											teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
-												<div className="edu-txt-center mt30 mb20">
+												<div className="edu-txt-center edu-back-white mt30 mb20">
 													<Pagination showQuickJumper current={page}
 																			onChange={this.paginationonChanges} pageSize={limit}
 																			total={teacherdata.work_count}></Pagination>