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

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

@@ -1177,9 +1177,26 @@ class Studentshavecompletedthelist extends Component {
 												 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
 									)
 									:record.submitstate === "已提交"?
-									<a style={{textAlign: "center"}} className="color-blue"
+									(//是否助教
-										 target="_blank"
+										this.props.isAssistant()&&this.props.isAssistant()===true?
-										 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+											(//助教是否有权限
+												this.props.assistant_auth&&this.props.assistant_auth===true?
+													(//是否截止
+														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
+															<a style={{textAlign: "center"}} className="color-blue"
+																 target="_blank"
+																 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+															:
+															<span style={{textAlign: "center", color: '#999999'}}>--</span>
+													)
+													:
+													<span style={{textAlign: "center", color: '#999999'}}>--</span>
+											)
+											:
+											<a style={{textAlign: "center"}} className="color-blue"
+												 target="_blank"
+												 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+									)
 									:
 									<span style={{textAlign: "center", color: '#999999'}}>--</span>
 							}
@@ -1411,9 +1428,28 @@ class Studentshavecompletedthelist extends Component {
 												 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
 									)
 									:record.submitstate === "已提交"?
-									<a style={{textAlign: "center"}} className="color-blue"
+									(//是否助教
-										 target="_blank"
+										this.props.isAssistant()&&this.props.isAssistant()===true?
-										 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+											(//助教是否有权限
+												this.props.assistant_auth&&this.props.assistant_auth===true?
+													(//是否截止
+														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
+															//是助教就是评阅
+															<a style={{textAlign: "center"}} className="color-blue"
+																 target="_blank"
+																 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+															:
+															<span style={{textAlign: "center", color: '#999999'}}>--</span>
+													)
+													:
+													<span style={{textAlign: "center", color: '#999999'}}>--</span>
+											)
+											:
+											//是老师就是评阅
+											<a style={{textAlign: "center"}} className="color-blue"
+												 target="_blank"
+												 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+									)
 									:
 									<span style={{textAlign: "center", color: '#999999'}}>--</span>
 							}