m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
courseware
cxt 5 years ago
parent 6b4c16c623 25f56e5aa0
commit d318f9b9d9
3 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/courses/coursesDetail/CoursesBanner.js
Unescape View File

@ -620,7 +620,7 @@ class CoursesBanner extends Component {
</div> </div>
<div className="clearfix "> <div className="clearfix ">
<div className="fl fl mr40" > <div className="fl fl mr40 mb20" >
<div className="task-hide" style={{height:25,marginBottom:10,marginLeft:60}}> <div className="task-hide" style={{height:25,marginBottom:10,marginLeft:60}}>
{coursedata.teacher_users.length===0?'': {coursedata.teacher_users.length===0?'':
<span className="color-white" >协作老师： <span className="color-white" >协作老师：

55
public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
Unescape View File

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

2
public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
Unescape View File

@ -378,7 +378,7 @@ class ShixunhomeWorkItem extends Component{
} }
{this.props.isAdmin()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400 "}>重命名</a>:""} {this.props.isAdmin?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400 "}>重命名</a>:""}
{/*<WordsBtn className="btn colorblue ml20 font-16" to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`} > 设置</WordsBtn>*/} {/*<WordsBtn className="btn colorblue ml20 font-16" to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`} > 设置</WordsBtn>*/}
<WordsBtn className="btn colorblue font-16 ml15 fontweight400 " to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`} > 设置</WordsBtn> <WordsBtn className="btn colorblue font-16 ml15 fontweight400 " to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`} > 设置</WordsBtn>
</span>:""} </span>:""}

Write Preview
Loading…
Cancel
Save