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

调整

Browse Source
dev_forum
杨树明 6 years ago
parent fffcdd6270
commit f4193a6edf
2 changed files with 96 additions and 47 deletions
Show Stats Download Patch File Download Diff File

141
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
Unescape View File

@ -92,7 +92,7 @@ class GraduationTaskssettinglist extends Component{
if (worklists.length != 0) { if (worklists.length != 0) {
for (var i = 0; i < worklists.length; i++) { for (var i = 0; i < worklists.length; i++) {
debugger
datalist.push({ datalist.push({
name: worklists[i].name, name: worklists[i].name,
number: (parseInt(page)-1)*parseInt(limit)+(i+1), number: (parseInt(page)-1)*parseInt(limit)+(i+1),
@ -101,7 +101,7 @@ class GraduationTaskssettinglist extends Component{
grouping: result.data.have_grouping === true ? worklists[i].grouping_name : null, grouping: result.data.have_grouping === true ? worklists[i].grouping_name : null,
submitstate: worklists[i].status === 0 ? "未提交" : worklists[i].status === 1 ? "按时提交" : worklists[i].status === 2 ? "延时提交" : "", submitstate: worklists[i].status === 0 ? "未提交" : worklists[i].status === 1 ? "按时提交" : worklists[i].status === 2 ? "延时提交" : "",
turnovertime:worklists[i].update_time, turnovertime:worklists[i].update_time,
associationitems: worklists[i].project_info === undefined ?"--": worklists[i].project_info.name , associationitems: {name:worklists[i].project_info === undefined ?"--": worklists[i].project_info.name,id:worklists[i].project_info.id},
teacherrating: worklists[i].teacher_comment_score, teacherrating: worklists[i].teacher_comment_score,
crossrating: worklists[i].cross_comment_score, crossrating: worklists[i].cross_comment_score,
finalscore: worklists[i].final_score.work_score === null ? "--" : worklists[i].final_score.work_score, finalscore: worklists[i].final_score.work_score === null ? "--" : worklists[i].final_score.work_score,
@ -611,7 +611,7 @@ class GraduationTaskssettinglist extends Component{
course_groups course_groups
} =this.state; } =this.state;
let columns; let columns;
// console.log("taskslistdata.course_group_count"); // console.log("taskslistdata.course_group_count");
// console.log(taskslistdata); // console.log(taskslistdata);
@ -662,9 +662,11 @@ class GraduationTaskssettinglist extends Component{
key: 'associationitems', key: 'associationitems',
render: (text, record) => ( render: (text, record) => (
<span> <div>
<a style={{color:'#4CACFF'}}>{record.associationitems}</a> <a style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
</span> <div className={"projectsdiv"} title={record.associationitems.name}>{record.associationitems.name}</div>
</a>
</div>
), ),
},{ },{
title: '提交状态', title: '提交状态',
@ -694,9 +696,11 @@ class GraduationTaskssettinglist extends Component{
dataIndex: 'teacherrating', dataIndex: 'teacherrating',
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)}</a> <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
</span> <a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '交叉评分', title: '交叉评分',
@ -705,8 +709,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)}</a> <Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
</span> <a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '最终成绩', title: '最终成绩',
@ -715,8 +721,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)}</a> <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
</span> <a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '操作', title: '操作',
@ -794,9 +802,11 @@ class GraduationTaskssettinglist extends Component{
key: 'associationitems', key: 'associationitems',
render: (text, record) => ( render: (text, record) => (
<span> <div>
<a style={{color:'#4CACFF'}}>{record.associationitems}</a> <a style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
</span> <div className={"projectsdiv"} title={record.associationitems.name}>{record.associationitems.name}</div>
</a>
</div>
), ),
},{ },{
title: '提交状态', title: '提交状态',
@ -827,8 +837,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)}</a> <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
</span> <a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '交叉评分', title: '交叉评分',
@ -837,8 +849,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)}</a> <Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
</span> <a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '最终成绩', title: '最终成绩',
@ -847,8 +861,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)}</a> <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
</span> <a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '操作', title: '操作',
@ -944,9 +960,12 @@ class GraduationTaskssettinglist extends Component{
key: 'associationitems', key: 'associationitems',
render: (text, record) => ( render: (text, record) => (
<span> <div>
<a style={{color:'#4CACFF'}}>{record.associationitems}</a> <a style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
</span> <div className={"projectsdiv"} title={record.associationitems.name}>{record.associationitems.name}
</div>
</a>
</div>
), ),
},{ },{
title: '提交状态', title: '提交状态',
@ -977,8 +996,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)}</a> <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
</span> <a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '交叉评分', title: '交叉评分',
@ -987,8 +1008,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)}</a> <Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
</span> <a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '最终成绩', title: '最终成绩',
@ -997,8 +1020,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)}</a> <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
</span> <a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '操作', title: '操作',
@ -1078,9 +1103,13 @@ class GraduationTaskssettinglist extends Component{
key: 'associationitems', key: 'associationitems',
render: (text, record) => ( render: (text, record) => (
<span> <div className={"projectsdiv"} >
<a style={{color:'#4CACFF'}}>{record.associationitems}</a> <a style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
</span> <div title={record.associationitems.name}>
{record.associationitems.name}
</div>
</a>
</div>
), ),
},{ },{
title: '提交状态', title: '提交状态',
@ -1111,8 +1140,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)}</a> <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
</span> <a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '交叉评分', title: '交叉评分',
@ -1121,8 +1152,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)}</a> <Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
</span> <a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '最终成绩', title: '最终成绩',
@ -1131,8 +1164,10 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)}</a> <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
</span> <a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)}</a>
</Tooltip>
</span>
), ),
}, { }, {
title: '操作', title: '操作',
@ -1190,6 +1225,19 @@ class GraduationTaskssettinglist extends Component{
<React.Fragment> <React.Fragment>
<div> <div>
<style>
{
`
.projectsdiv{
width: 100px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
`
}
</style>
{/*提示*/} {/*提示*/}
<Modals <Modals
modalsType={Modalstype} modalsType={Modalstype}
@ -1453,11 +1501,12 @@ class GraduationTaskssettinglist extends Component{
<div id="graduation_work_list" style={{padding:'0px 40px 10px 40px'}}> <div id="graduation_work_list" style={{padding:'0px 40px 10px 40px'}}>
<div className="clearfix"> <div className="clearfix">
<span className="fl color-grey-6 font-12"><span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） </span> {this.props.isAdmin()?<span className="fl color-grey-6 font-12"><span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） </span>:""}
<div className="fr color-grey-6 edu-menu-panel"> {this.props.isAdmin()?<div className="fr color-grey-6 edu-menu-panel">
<p><a data-remote="true"> <p>
{order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a><i <a data-remote="true">
className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p> {order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
<ul className="edu-menu-list"> <ul className="edu-menu-list">
<li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a> <li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a>
</li> </li>
@ -1466,7 +1515,7 @@ class GraduationTaskssettinglist extends Component{
<li onClick={(e)=>this.funorder("student_id" )}><a data-remote="true">学生学号</a> <li onClick={(e)=>this.funorder("student_id" )}><a data-remote="true">学生学号</a>
</li> </li>
</ul> </ul>
</div> </div>:""}
</div> </div>
</div> </div>

2
public/react/src/modules/courses/graduation/tasks/index.js
Unescape View File

@ -6,7 +6,7 @@ import Titlesearchsection from '../../common/titleSearch/TitleSearchSection';
import HomeworkModal from "../../coursesPublic/HomeworkModal"; import HomeworkModal from "../../coursesPublic/HomeworkModal";
import { WordsBtn } from 'educoder'; import { WordsBtn } from 'educoder';
import axios from 'axios'; import axios from 'axios';
import _ from 'lodash' import moment from 'moment';
import GraduateTaskItem from './GraduateTaskItem'; import GraduateTaskItem from './GraduateTaskItem';
import TaskPublishModal from "./TaskPublishModal"; import TaskPublishModal from "./TaskPublishModal";
import Modals from '../../../modals/Modals'; import Modals from '../../../modals/Modals';

Write Preview
Loading…
Cancel
Save