|
|
|
@ -590,7 +590,28 @@ class Studentshavecompletedthelist extends Component {
|
|
|
|
|
|
|
|
|
|
</span>
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
title: '操作',
|
|
|
|
|
dataIndex: 'finalscore',
|
|
|
|
|
key: 'finalscore',
|
|
|
|
|
align: 'center',
|
|
|
|
|
className: "edu-txt-center font-14",
|
|
|
|
|
render: (text, record) => (
|
|
|
|
|
<span>
|
|
|
|
|
{
|
|
|
|
|
record.submitstate === "未提交"||record.commit_method===5?
|
|
|
|
|
<span style={{textAlign: "center", color: '#999999'}}>--</span>
|
|
|
|
|
:record.submitstate === "已提交"?
|
|
|
|
|
<a style={{textAlign: "center"}} className="color-blue"
|
|
|
|
|
target="_blank"
|
|
|
|
|
href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>查看</a>
|
|
|
|
|
:
|
|
|
|
|
<span style={{textAlign: "center", color: '#999999'}}>--</span>
|
|
|
|
|
}
|
|
|
|
|
</span>
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
columnss: [
|
|
|
|
|
{
|
|
|
|
@ -1477,7 +1498,7 @@ class Studentshavecompletedthelist extends Component {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
thiss.Generatenewdata(response.data.exercise_users, response.data.current_answer_user);
|
|
|
|
|
thiss.Generatenewdata(response.data.exercise_users, response.data.current_answer_user,response.data.exercise_types);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//老师
|
|
|
|
@ -1503,7 +1524,7 @@ class Studentshavecompletedthelist extends Component {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Generatenewdata(exercise_users, current_answer_user) {
|
|
|
|
|
Generatenewdata(exercise_users, current_answer_user,exercise_types) {
|
|
|
|
|
let {page, limit} = this.state;
|
|
|
|
|
let datalist = [];
|
|
|
|
|
let datalisttwo = [];
|
|
|
|
@ -1526,7 +1547,7 @@ class Studentshavecompletedthelist extends Component {
|
|
|
|
|
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
|
|
|
|
|
efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
|
|
|
|
|
operating: "评阅",
|
|
|
|
|
commit_method:exercise_users[i].commit_method
|
|
|
|
|
commit_method:exercise_users[i].commit_method,
|
|
|
|
|
})
|
|
|
|
|
} else {
|
|
|
|
|
datalist.push({
|
|
|
|
@ -1569,6 +1590,7 @@ class Studentshavecompletedthelist extends Component {
|
|
|
|
|
review_status: current_answer_user.review_status,
|
|
|
|
|
completion: current_answer_user.objective_score === undefined ? "--" : current_answer_user.objective_score === null ? "--" : current_answer_user.objective_score === "" ? "--" : current_answer_user.objective_score,
|
|
|
|
|
levelscore: current_answer_user.subjective_score === undefined ? "--" : current_answer_user.subjective_score === null ? "--" : current_answer_user.subjective_score === "" ? "--" : current_answer_user.subjective_score,
|
|
|
|
|
score_open:exercise_types.score_open,
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1716,7 +1738,7 @@ class Studentshavecompletedthelist extends Component {
|
|
|
|
|
loadingstate: false,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
this.Generatenewdata(response.data.exercise_users, response.data.current_answer_user);
|
|
|
|
|
this.Generatenewdata(response.data.exercise_users, response.data.current_answer_user,response.data.exercise_types);
|
|
|
|
|
}).catch((error) => {
|
|
|
|
|
//console.log(error)
|
|
|
|
|
this.setState({
|
|
|
|
|