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

dev_home
cxt 5 years ago
commit 58170eb574

@ -1030,15 +1030,17 @@ class Studentshavecompletedthelist extends Component {
className: "edu-txt-center font-14", className: "edu-txt-center font-14",
render: (text, record) => ( render: (text, record) => (
<span> <span>
{record.finalscore==="--"? {
<a style={{textAlign: "center"}} className="color-blue" record.submitstate === "未提交"||record.commit_method===5?
target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a> <a style={{textAlign: "center"}} className="color-blue"
: target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
<a style={{textAlign: "center"}} className="color-blue" :record.submitstate === "已提交"?
target="_blank" <a style={{textAlign: "center"}} className="color-blue"
href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a> target="_blank"
href={`/courses/${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> </span>
) )
}, },
@ -1226,15 +1228,17 @@ class Studentshavecompletedthelist extends Component {
className: "edu-txt-center font-14", className: "edu-txt-center font-14",
render: (text, record) => ( render: (text, record) => (
<span> <span>
{record.finalscore==="--"? {
<a style={{textAlign: "center"}} className="color-blue" record.submitstate === "未提交"||record.commit_method===5?
target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a> <a style={{textAlign: "center"}} className="color-blue"
: target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
<a style={{textAlign: "center"}} className="color-blue" :record.submitstate === "已提交"?
target="_blank" <a style={{textAlign: "center"}} className="color-blue"
href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a> target="_blank"
href={`/courses/${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> </span>
) )
}, },
@ -1521,7 +1525,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, 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, efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
operating: "评阅" operating: "评阅",
commit_method:exercise_users[i].commit_method
}) })
} else { } else {
datalist.push({ datalist.push({
@ -1536,7 +1541,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, 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, efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
operating: "--" operating: "--",
commit_method:exercise_users[i].commit_method
}) })
} }
@ -1599,7 +1605,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, 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, efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
operating: "查看" operating: "查看",
commit_method:exercise_users[i].commit_method,
}) })
noclassroom = exercise_users[i].user_group_name; noclassroom = exercise_users[i].user_group_name;
} }
@ -1744,7 +1751,8 @@ 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, 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 === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
finalscore: "评阅", finalscore: "评阅",
user_id: exercise_users[i].user_id user_id: exercise_users[i].user_id,
commit_method:exercise_users[i].commit_method
}) })
} else { } else {
datalist.push({ datalist.push({
@ -1760,7 +1768,8 @@ 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, 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 === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
finalscore: "--", finalscore: "--",
user_id: exercise_users[i].user_id user_id: exercise_users[i].user_id,
commit_method:exercise_users[i].commit_method
}) })
indexi++; indexi++;
} }
@ -2032,7 +2041,8 @@ class Studentshavecompletedthelist extends Component {
columnsys: arr, columnsys: arr,
subjective: response.data.exercise_types.subjective, subjective: response.data.exercise_types.subjective,
objective_score: response.data.exercise_types.objective_score, objective_score: response.data.exercise_types.objective_score,
subjective_score: response.data.exercise_types.subjective_score, subjective_score: response.data.exercise_types.subjective_score
}) })
} }

Loading…
Cancel
Save