From 2343bd2dba65ebdaa654f354050aa3320861f2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 28 Oct 2019 17:05:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AF=95=E8=AE=BE=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../graduation/tasks/GraduationTaskDetail.js | 2 +- .../tasks/GraduationTaskssettinglist.js | 163 +++++++++--------- 2 files changed, 85 insertions(+), 80 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js index 118b92607..5c5a47ccd 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js @@ -515,7 +515,7 @@ class GraduationTaskDetail extends Component{ - + {/*//毕设任务列表*/} (this.setend_time(time)} tab={`list`}/>) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index ebe931eb0..a1f91bb4f 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -19,7 +19,7 @@ const Search = Input.Search; const qs = require('qs'); - +//毕设任务列表 class GraduationTaskssettinglist extends Component{ constructor(props){ @@ -160,12 +160,68 @@ class GraduationTaskssettinglist extends Component{ }) } - TablePagination=(e)=>{ + TablePagination = (pagination, filters, sorter) => { + // console.log(e.current); + // this.setState({ + // page:e.current + // }) + if (JSON.stringify(sorter) === "{}") { + //没有选择 + } else { + //stduynumber 学号 + try { + //学生学号排序 + if (sorter.columnKey === "stduynumber") { + let orderlumn = ""; + if (sorter.order === "ascend") { + //升序 + orderlumn = "asc"; + } else if (sorter.order === "descend") { + //降序 + orderlumn = "desc"; + } + this.funorder("student_id", orderlumn) + } + } catch (e) { - this.setState({ - page:e.current - }) + } + //turnovertime 时间 + try { + //学生学号排序 + if (sorter.columnKey === "turnovertime") { + let orderlumn = ""; + if (sorter.order === "ascend") { + //升序 + orderlumn = "asc"; + } else if (sorter.order === "descend") { + //降序 + orderlumn = "desc"; + } + this.funorder("update_time", orderlumn); + } + } catch (e) { + + } + + //finalscore 成绩 + try { + //学生学号排序 + if (sorter.columnKey === "finalscore") { + let orderlumn = ""; + if (sorter.order === "ascend") { + //升序 + orderlumn = "asc"; + } else if (sorter.order === "descend") { + //降序 + orderlumn = "desc"; + } + this.funorder("work_score", orderlumn); + } + } catch (e) { + + } + } } funteachercomment=(list,key)=> { @@ -234,47 +290,14 @@ class GraduationTaskssettinglist extends Component{ } - funorder=(value)=>{ + funorder = (value, newb_order) => { let {teacher_comment, task_status, course_group, cross_comment, b_order, search,order} = this.state; - let newb_order; - if(order===value){ - if(b_order==="desc"){ - - this.setState({ - order:value, - b_order:"asc" - }) - newb_order="asc"; - }else{ - - this.setState({ - order:value, - b_order:"desc" - }) - newb_order="desc"; - } - }else{ - if(b_order==="desc"){ - - this.setState({ - order:value, - b_order:"desc" - }) - newb_order="desc"; - }else{ - - this.setState({ - order:value, - b_order:"asc" - }) - newb_order="asc"; - } - } - - this.setState({ - loadingstate:true - }) + this.setState({ + order: value, + b_order: newb_order, + loadingstate: true + }) this.seacthdata(teacher_comment, task_status, course_group, cross_comment, value, newb_order, search,this.state.page); } @@ -747,6 +770,7 @@ class GraduationTaskssettinglist extends Component{ dataIndex: 'stduynumber', key: 'stduynumber', className:'edu-txt-center', + sorter: true, render: (text, record) => (
{record.stduynumber}
@@ -798,6 +822,7 @@ class GraduationTaskssettinglist extends Component{ dataIndex: 'turnovertime', key: 'turnovertime', className:'edu-txt-center', + sorter: true, render: (text, record) => ( @@ -839,6 +864,7 @@ class GraduationTaskssettinglist extends Component{ key: 'finalscore', dataIndex: 'finalscore', className:'edu-txt-center', + sorter: true, render: (text, record) => ( @@ -1220,20 +1246,20 @@ class GraduationTaskssettinglist extends Component{ {this.props.isAdmin()===true? {taskslistdata&&taskslistdata.work_count} 个检索结果（{taskslistdata&&taskslistdata.all_work_count} 学生）:""} - {this.props.isAdmin()===true?
-

- - {order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序 -

- -
:""} + {/*{this.props.isAdmin()===true?
*/} + {/*

*/} + {/* */} + {/* {order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序*/} + {/*

*/} + {/*
    */} + {/*
  • this.funorder("update_time")}>更新时间*/} + {/*
    • */} + {/*
  • this.funorder("work_score" )}>最终成绩*/} + {/*
    • */} + {/*
  • this.funorder("student_id" )}>学生学号*/} + {/*
    • */} + {/*
*/} + {/*
:""}*/} {this.props.isStudent()===true? @@ -1409,27 +1435,6 @@ class GraduationTaskssettinglist extends Component{
- {this.props.isAdmin()===true? -
- - {taskslistdata&&taskslistdata.work_count} - 个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） - -
-

- {order==="update_time"?"时间":order==="work_score"?"成绩":order==="student_id"?"学号":""}排序

-
    -
  • this.funorder("update_time")} className={order==="update_time"?"none":""}>时间 -
    • -
  • this.funorder("work_score" )} className={order==="work_score"?"none":""}>成绩 -
    • -
  • this.funorder("student_id" )} className={order==="student_id"?"none":""}>学号 -
    • -
-
-
- :""} {this.props.isStudent()===true?