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

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

@@ -890,7 +890,7 @@ class Exercisesetting extends Component{
 																		<Checkbox disabled={this.props.isAdmin()===true?!flagPageEdit:true} className="mr15 font-16 color-grey-6" checked={this.state.assistant_auth} onChange={this.assistantauthority}>助教权限</Checkbox>
 																	)}
 																</Form.Item>
-																<span className="color-grey-c">(勾选则允许助教查看答案)</span>
+																<span className="color-grey-c">(选中，则允许助教查看答案)</span>
 															</p>
                             </div>
                         </div>

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

@@ -1162,6 +1162,9 @@ class Studentshavecompletedthelist extends Component {
 										this.props.isAssistant()&&this.props.isAssistant()===true?
 											(//助教是否有权限
 												this.props.assistant_auth&&this.props.assistant_auth===true?
+													<a style={{textAlign: "center"}} className="color-blue"
+														 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
+													:
 													(//是否截止
 														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
 															<a style={{textAlign: "center"}} className="color-blue"
@@ -1169,8 +1172,6 @@ class Studentshavecompletedthelist extends Component {
 															:
 															<span style={{textAlign: "center", color: '#999999'}}>--</span>
 													)
-													:
-													<span style={{textAlign: "center", color: '#999999'}}>--</span>
 											)
 											:
 											<a style={{textAlign: "center"}} className="color-blue"
@@ -1181,6 +1182,10 @@ class Studentshavecompletedthelist extends Component {
 										this.props.isAssistant()&&this.props.isAssistant()===true?
 											(//助教是否有权限
 												this.props.assistant_auth&&this.props.assistant_auth===true?
+													<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>
+													:
 													(//是否截止
 														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
 															<a style={{textAlign: "center"}} className="color-blue"
@@ -1189,8 +1194,6 @@ class Studentshavecompletedthelist extends Component {
 															:
 															<span style={{textAlign: "center", color: '#999999'}}>--</span>
 													)
-													:
-													<span style={{textAlign: "center", color: '#999999'}}>--</span>
 											)
 											:
 											<a style={{textAlign: "center"}} className="color-blue"
@@ -1413,6 +1416,9 @@ class Studentshavecompletedthelist extends Component {
 										this.props.isAssistant()&&this.props.isAssistant()===true?
 											(//助教是否有权限
 												this.props.assistant_auth&&this.props.assistant_auth===true?
+													<a style={{textAlign: "center"}} className="color-blue"
+														 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
+													:
 													(//是否截止
 														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
 															<a style={{textAlign: "center"}} className="color-blue"
@@ -1420,8 +1426,6 @@ class Studentshavecompletedthelist extends Component {
 															:
 															<span style={{textAlign: "center", color: '#999999'}}>--</span>
 													)
-													:
-													<span style={{textAlign: "center", color: '#999999'}}>--</span>
 											)
 											:
 											<a style={{textAlign: "center"}} className="color-blue"
@@ -1432,6 +1436,10 @@ class Studentshavecompletedthelist extends Component {
 										this.props.isAssistant()&&this.props.isAssistant()===true?
 											(//助教是否有权限
 												this.props.assistant_auth&&this.props.assistant_auth===true?
+													<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>
+													:
 													(//是否截止
 														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
 															//是助教就是评阅
@@ -1441,8 +1449,6 @@ class Studentshavecompletedthelist extends Component {
 															:
 															<span style={{textAlign: "center", color: '#999999'}}>--</span>
 													)
-													:
-													<span style={{textAlign: "center", color: '#999999'}}>--</span>
 											)
 											:
 											//是老师就是评阅