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

调整

Browse Source
dev_auth
杨树林 6 years ago
parent 867b21f1ce
commit ac8cdb3ea8
2 changed files with 1157 additions and 1106 deletions
Show Stats Download Patch File Download Diff File

137
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -347,7 +347,11 @@ class Listofworksstudentone extends Component {
<span style={{
width: '99px',
}}>
<span style={{color: '#07111B',textAlign: "center", width:'99px'}}>{record.completion+"/"+this.state.challenges_count}</span>
<span style={{
color: '#07111B',
textAlign: "center",
width: '99px'
}}>{record.completion + "/" + this.state.challenges_count}</span>
</span>
),
},
@ -695,7 +699,11 @@ class Listofworksstudentone extends Component {
<span style={{
width: '99px',
}}>
<span style={{color: '#07111B',textAlign: "center", width:'99px'}}>{record.completion+"/"+this.state.challenges_count}</span>
<span style={{
color: '#07111B',
textAlign: "center",
width: '99px'
}}>{record.completion + "/" + this.state.challenges_count}</span>
</span>
),
},
@ -854,7 +862,8 @@ class Listofworksstudentone extends Component {
className: 'font-14 maxnamewidth100',
width: '100px',
render: (text, record) => (
<a className="maxnamewidth100" title={record.name} style={{color: '#07111B', textAlign: "center"}}>{record.name}</a>
<a className="maxnamewidth100" title={record.name}
style={{color: '#07111B', textAlign: "center"}}>{record.name}</a>
)
},
{
@ -908,7 +917,15 @@ class Listofworksstudentone extends Component {
className: 'font-14',
render: (text, record) => (
<span>
{record.classroom === undefined ?<span className="ysltable" style={{color: '#07111B', textAlign: "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{color: '#07111B',textAlign: "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span> : <span className="ysltable" style={{color: '#07111B',textAlign: "center"}}>{record.classroom}</span>}
{record.classroom === undefined ? <span className="ysltable" style={{
color: '#07111B',
textAlign: "center"
}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{
color: '#07111B',
textAlign: "center"
}}>--</span> : record.classroom === null ?
<span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span> :
<span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>{record.classroom}</span>}
</span>
)
},
@ -990,7 +1007,10 @@ class Listofworksstudentone extends Component {
<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
<div>完成任务评测之前查看了参考答案：{record.view_answer_count}关</div>
</div>}>
<span style={{color: '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
<span style={{
color: '#07111B',
"text-align": "center"
}}>{record.completion + "/" + this.state.challenges_count} </span>
</Tooltip>
</span>
@ -1077,7 +1097,8 @@ class Listofworksstudentone extends Component {
record.ultimate_score === true ?
<Tooltip placement="bottom" title={<div>
<div>{record.user_name}{record.user_login}</div>
<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
<div>{record.finalscore === "--" ? <span>最终调整成绩：0分</span> :
<span>最终调整成绩：{record.finalscore}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
@ -1103,10 +1124,14 @@ class Listofworksstudentone extends Component {
<Tooltip placement="bottom" title={<div>
<div>{record.user_name}{record.user_login}</div>
<div>完成任务评测之前查看了参考答案：{record.view_answer_count}关</div>
<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
<div>{record.finalscore === "--"?<span>当前成绩：0分</span> :<span>当前成绩：{record.finalscore}分</span>}</div>
<div>{record.levelscore === "--" ? <span>关卡得分：0分</span> :
<span>关卡得分：{record.levelscore}分</span>}</div>
<div>{record.efficiencyscore === "--" ? <span>效率评分：0分</span> :
<span>效率评分：{record.efficiencyscore}分</span>}</div>
<div>{record.late_penalty === "--" ? <span>迟交扣分：0分</span> :
<span>迟交扣分：{record.late_penalty}分</span>}</div>
<div>{record.finalscore === "--" ? <span>当前成绩：0分</span> :
<span>当前成绩：{record.finalscore}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
@ -1169,7 +1194,8 @@ class Listofworksstudentone extends Component {
className: 'font-14 maxnamewidth100',
width: '100px',
render: (text, record) => (
<a className="maxnamewidth100" title={record.name} style={{color: '#07111B', "text-align": "center"}}>{record.name}</a>
<a className="maxnamewidth100" title={record.name}
style={{color: '#07111B', "text-align": "center"}}>{record.name}</a>
)
},
{
@ -1223,7 +1249,15 @@ class Listofworksstudentone extends Component {
className: 'font-14',
render: (text, record) => (
<span>
{record.classroom === undefined ?<span className="ysltable" style={{color: '#07111B',textAlign: "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span> : <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>{record.classroom}</span>}
{record.classroom === undefined ? <span className="ysltable" style={{
color: '#07111B',
textAlign: "center"
}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{
color: '#07111B',
textAlign: "center"
}}>--</span> : record.classroom === null ?
<span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span> :
<span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>{record.classroom}</span>}
</span>
)
},
@ -1298,7 +1332,10 @@ class Listofworksstudentone extends Component {
<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
<div>完成任务评测之前查看了参考答案：{record.view_answer_count}关</div>
</div>}>
<span style={{color: '#07111B',textAlign: "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
<span style={{
color: '#07111B',
textAlign: "center"
}}>{record.completion + "/" + this.state.challenges_count} </span>
</Tooltip>
</span>
@ -1385,7 +1422,8 @@ class Listofworksstudentone extends Component {
record.ultimate_score === true ?
<Tooltip placement="bottom" title={<div>
<div>{record.user_name}{record.user_login}</div>
<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
<div>{record.finalscore === "--" ? <span>最终调整成绩：0分</span> :
<span>最终调整成绩：{record.finalscore}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
@ -1411,10 +1449,14 @@ class Listofworksstudentone extends Component {
<Tooltip placement="bottom" title={<div>
<div>{record.user_name}{record.user_login}</div>
<div>完成任务评测之前查看了参考答案：{record.view_answer_count}关</div>
<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
<div>{record.finalscore === "--"?<span>当前成绩：0分</span> :<span>当前成绩：{record.finalscore}分</span>}</div>
<div>{record.levelscore === "--" ? <span>关卡得分：0分</span> :
<span>关卡得分：{record.levelscore}分</span>}</div>
<div>{record.efficiencyscore === "--" ? <span>效率评分：0分</span> :
<span>效率评分：{record.efficiencyscore}分</span>}</div>
<div>{record.late_penalty === "--" ? <span>迟交扣分：0分</span> :
<span>迟交扣分：{record.late_penalty}分</span>}</div>
<div>{record.finalscore === "--" ? <span>当前成绩：0分</span> :
<span>当前成绩：{record.finalscore}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
@ -1463,12 +1505,14 @@ class Listofworksstudentone extends Component {
}
}
componentDidCatch(error, info) {
// console.log("-----------------------------905错误信息");
// console.log(error);
// console.log(info);
}
// componentWillReceiveProps(nextProps) {
// console.log("+++++++++916");
// console.log(nextProps);
@ -1493,6 +1537,7 @@ class Listofworksstudentone extends Component {
// console.log(this.props.isAdmin())
this.student();
}
isupdatas = () => {
var homeworkid = this.props.match.params.homeworkid;
// this.Gettitleinformation(homeworkid);
@ -1706,17 +1751,14 @@ class Listofworksstudentone extends Component {
}
if (item.title === "学号") {
continue
}
else{
} else {
arr.push(item);
}
}
else{
} else {
if (work_efficiency === false) {
if (item.title === "关卡得分") {
continue
}
else if(item.title==="效率分"){
} else if (item.title === "效率分") {
continue
} else {
@ -1743,17 +1785,14 @@ class Listofworksstudentone extends Component {
}
if (item.title === "学号") {
continue
}
else{
} else {
arr2.push(item);
}
}
else{
} else {
if (work_efficiency === false) {
if (item.title === "关卡得分") {
continue
}
else if(item.title==="效率分"){
} else if (item.title === "效率分") {
continue
} else {
@ -2300,7 +2339,6 @@ class Listofworksstudentone extends Component {
})
}
@ -2420,8 +2458,7 @@ class Listofworksstudentone extends Component {
}
if (item.title === "效率分") {
continue
}
else {
} else {
columns2js.push(item);
}
}
@ -2495,8 +2532,6 @@ class Listofworksstudentone extends Component {
}
} else {
// console.log("1849");
// console.log(this.props.isNotMember());
@ -3093,7 +3128,6 @@ class Listofworksstudentone extends Component {
}
confirmysl(url) {
axios.get(url + '&export=true').then((response) => {
if (response === undefined) {
@ -3133,6 +3167,7 @@ class Listofworksstudentone extends Component {
DownloadMessageval: undefined
})
}
render() {
let {columns, course_groupysls, datajs, isAdmin, homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, game_list, columnsstu, columnsstu2, limit, experience, boolgalist, viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate, computeTimetype} = this.state;
@ -3318,7 +3353,6 @@ class Listofworksstudentone extends Component {
{/*<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
</li>
<li className="clearfix mt10">
@ -3427,9 +3461,12 @@ class Listofworksstudentone extends Component {
{orders === "update_time" ? "时间" : orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12 "></i>
<ul className="edu-position-hide undis mt10">
<li> <a onClick={(e) => this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间</a></li>
<li> <a onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>当前成绩</a></li>
<li> <a onClick={(e) => this.funordert("student_id")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>学生学号</a></li>
<li><a onClick={(e) => this.funordert("update_time")} data-remote="true"
className=" font-12" style={{textAlign: "center"}}>更新时间</a></li>
<li><a onClick={(e) => this.funordert("work_score")} data-remote="true"
className=" font-12" style={{textAlign: "center"}}>当前成绩</a></li>
<li><a onClick={(e) => this.funordert("student_id")} data-remote="true"
className=" font-12" style={{textAlign: "center"}}>学生学号</a></li>
</ul>
</li>
</ul>
@ -3627,9 +3664,15 @@ class Listofworksstudentone extends Component {
}}>
<span className="fl color-grey-6 font-12">
<span className="color-grey-9A">已开始做题</span>
<span className=" ml3 mr3 color-grey-9A">
{teacherdata === undefined ? "0" : teacherdata.commit_count === undefined ? "0" : teacherdata.commit_count}
</span><span className="color-grey-9A">人</span>
<span className="ml10 color-grey-9A">未开始做题</span>
<span
className="color-orange-tip">{teacherdata === undefined ? "0" : teacherdata.commit_count === undefined ? "0" : teacherdata.commit_count}</span>已交<span
className="ml10">{teacherdata === undefined ? "0" : teacherdata.uncommit_count}</span><span>未交</span>
className="ml3 mr3 color-grey-9A">{teacherdata === undefined ? "0" : teacherdata.uncommit_count}</span><span
className="color-grey-9A">人</span>
{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
<span className="ml20">{teacherdata.left_time.status}</span>
}
@ -3817,10 +3860,14 @@ class Listofworksstudentone extends Component {
textAlign: "center;"
}}>
<span className="fl color-grey-6 font-12">
<span className="color-orange-tip">
<span className="color-grey-9A">已开始做题</span>
<span className=" ml3 mr3 color-grey-9A">
{teacherdata === undefined ? "0" : teacherdata.commit_count === undefined ? "0" : teacherdata.commit_count}
</span>已交
<span className="ml10">{teacherdata === undefined ? "0" : teacherdata.uncommit_count}</span><span>未交</span>
</span><span className="color-grey-9A">人</span>
<span className="ml10 color-grey-9A">未开始做题</span>
<span
className="ml3 mr3 color-grey-9A">{teacherdata === undefined ? "0" : teacherdata.uncommit_count}</span><span
className="color-grey-9A">人</span>
{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
<span className="ml20">{teacherdata.left_time.status}</span>}
{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" :

4
public/stylesheets/educoder/edu-main.css
Unescape View File

@ -206,6 +206,10 @@ input::-ms-clear{display:none;}
.color-grey-c{color: #ccc!important;}
.color-grey-cd{color: #cdcdcd!important;}
.color-grey-9{color: #999999!important;}
.color-grey-9A {
color: #9A9A9A !important;
}
.color-grey-98{color: #989898!important;}
.color-grey-8{color: #888!important;}
.color-grey-6{color: #666!important;}

Write Preview
Loading…
Cancel
Save