courseware
杨树林 5 years ago
parent 558738ec01
commit 25f56e5aa0

@ -297,16 +297,15 @@ class Studentshavecompletedthelist extends Component {
} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
{
//主观题老师没有评分是
parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
</span>
:""
}
</span>
}
@ -371,7 +370,7 @@ class Studentshavecompletedthelist extends Component {
<span>主观题得分{record.subjective_score}</span>}
</div>
{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
<div>
<span>待批阅</span>
</div>
@ -397,15 +396,15 @@ class Studentshavecompletedthelist extends Component {
textAlign: "center"
}}>{record.efficiencyscore}</span>
{//只有一个主观题的时候
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<span style={{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
""
}
</Tooltip>
}
@ -644,16 +643,14 @@ class Studentshavecompletedthelist extends Component {
} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
{
//主观题老师没有评分是
parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
</span> :""
}
</span>
}
@ -720,7 +717,7 @@ class Studentshavecompletedthelist extends Component {
<span>主观题得分{record.subjective_score}</span>}
</div>
{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
<div>
<span>待批阅</span>
</div>
@ -750,15 +747,15 @@ class Studentshavecompletedthelist extends Component {
width: "199px"
}}>{record.efficiencyscore}</span>
{//只有一个主观题的时候
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<span style={{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
""
}
</Tooltip>
}
@ -980,7 +977,7 @@ class Studentshavecompletedthelist extends Component {
} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
{
//主观题老师没有评分是
parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false?
<span style={{
color: '#DD1717',
textAlign: "center",
@ -989,7 +986,6 @@ class Studentshavecompletedthelist extends Component {
(待批阅)
</span> :
""
}
</span>
}
@ -1051,7 +1047,7 @@ class Studentshavecompletedthelist extends Component {
<span>主观题得分{record.subjective_score}</span>}
</div>
{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
<div>
<span>待批阅</span>
</div>
@ -1077,8 +1073,8 @@ class Studentshavecompletedthelist extends Component {
textAlign: "center",
}}>{record.efficiencyscore}</span>
{//只有一个主观题的时候
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<span style={{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
@ -1288,8 +1284,8 @@ class Studentshavecompletedthelist extends Component {
} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
{
//主观题老师没有评分是
parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
<span style={{
parseInt(record.levelscore) === 0 && myssubjective === 1&&record.review_status===false?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
@ -1297,7 +1293,6 @@ class Studentshavecompletedthelist extends Component {
(待批阅)
</span> :
""
}
</span>
@ -1361,8 +1356,8 @@ class Studentshavecompletedthelist extends Component {
<span>主观题得分{record.subjective_score}</span>}
</div>
{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<div>
parseInt(record.efficiencyscore) === 0 && myssubjective === 0&& record.review_status===false?
<div>
<span>待批阅</span>
</div>
:
@ -1392,7 +1387,7 @@ class Studentshavecompletedthelist extends Component {
textAlign: "center",
}}>{parseInt(record.efficiencyscore) === 0 ? 0 : record.efficiencyscore}</span>
{//只有一个主观题的时候
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && record.review_status===false?
<span style={{
color: '#DD1717',
textAlign: "center",
@ -1759,7 +1754,8 @@ class Studentshavecompletedthelist extends Component {
subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
operating: exercise_users[i].has_comment === true ? "已评阅" : "评阅",
commit_method: exercise_users[i].commit_method,
has_comment: exercise_users[i].has_comment
has_comment: exercise_users[i].has_comment,
review_status: exercise_users[i].review_status,
})
} else {
datalist.push({
@ -1778,7 +1774,9 @@ class Studentshavecompletedthelist extends Component {
subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
operating: exercise_users[i].has_comment === true ? "已评阅" : "--",
commit_method: exercise_users[i].commit_method,
has_comment: exercise_users[i].has_comment
has_comment: exercise_users[i].has_comment,
review_status: exercise_users[i].review_status,
})
}
@ -1808,7 +1806,7 @@ class Studentshavecompletedthelist extends Component {
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,
commit_method: current_answer_user.commit_method
commit_method: current_answer_user.commit_method,
})
@ -1850,7 +1848,9 @@ class Studentshavecompletedthelist extends Component {
subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
operating: exercise_users[i].has_comment === true ? "已评阅" : "查看",
commit_method: exercise_users[i].commit_method,
has_comment: exercise_users[i].has_comment
has_comment: exercise_users[i].has_comment,
review_status: exercise_users[i].review_status,
})
noclassroom = exercise_users[i].user_group_name;
}
@ -2003,7 +2003,9 @@ class Studentshavecompletedthelist extends Component {
finalscore: exercise_users[i].has_comment === true ? "已评阅" : "评阅",
user_id: exercise_users[i].user_id,
commit_method: exercise_users[i].commit_method,
has_comment: exercise_users[i].has_comment
has_comment: exercise_users[i].has_comment,
review_status: exercise_users[i].review_status,
})
} else {
datalist.push({
@ -2023,7 +2025,8 @@ class Studentshavecompletedthelist extends Component {
finalscore: exercise_users[i].has_comment === true ? "已评阅" : "--",
user_id: exercise_users[i].user_id,
commit_method: exercise_users[i].commit_method,
has_comment: exercise_users[i].has_comment
has_comment: exercise_users[i].has_comment,
review_status: exercise_users[i].review_status,
})
indexi++;
}

Loading…
Cancel
Save