From c0d4fa59c6aad20cf2f9c3c00b9e83ade8cfc85e 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 16:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/busyWork/CommonWorkList.js | 133 +++++++++++++----- .../shixunHomework/Listofworksstudentone.js | 2 + 2 files changed, 100 insertions(+), 35 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 5a6d460c3..0d78372ed 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -112,7 +112,7 @@ function buildColumns(that, student_works, studentData) { title: '学号', dataIndex: 'student_id', key: 'student_id', - sorter: (a, b) => a.student_id - b.student_id, + sorter: true, render: (text, record) => ( a.update_time - b.update_time, - + sorter: true, render: (update_time, record) => ( {update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'} @@ -310,8 +309,7 @@ function buildColumns(that, student_works, studentData) { title: '最终成绩', key: 'work_score', dataIndex: 'work_score', - sorter: (a, b) => a.work_score - b.work_score, - + sorter: true, render: (work_score, record) => { return ( @@ -398,6 +396,7 @@ class CommonWorkList extends Component{ isSpin:true, left_time: {}, category: {}, + b_order: 'desc', } } onTablePagination = (page) => { @@ -433,7 +432,7 @@ class CommonWorkList extends Component{ } _getRequestParams() { - const { search, arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work } = this.state + const {search, arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work, b_order} = this.state return { page, search, @@ -442,7 +441,7 @@ class CommonWorkList extends Component{ teacher_comment: arg_teacher_comment.length == 0 ? '' : arg_teacher_comment[0], order, limit: PAGE_SIZE, - b_order: orderMap[order], + b_order: b_order, group_id:arg_course_group, member_work: arg_member_work } @@ -497,8 +496,12 @@ class CommonWorkList extends Component{ this.fetchList() }) } - funorder = (order) => { - this.setState({ order }, () => { + funorder = (order, b_order) => { + this.setState({ + order: order + , + b_order: b_order + }, () => { this.fetchList() }) } @@ -550,6 +553,64 @@ class CommonWorkList extends Component{ } + //tbale 列表塞选数据 + table1handleChange = (pagination, filters, sorter) => { + //"ascend" 升序 + //"descend" 降序 + if (JSON.stringify(sorter) === "{}") { + //没有选择 + } else { + // 时间 + try { + if (sorter.columnKey === "update_time") { + let myyslorder = ""; + if (sorter.order === "ascend") { + myyslorder = "asc"; + } else if (sorter.order === "descend") { + myyslorder = "desc"; + } + this.funorder("update_time", myyslorder); + } + + } catch (e) { + + } + + //成绩 + try { + if (sorter.columnKey === "work_score") { + let myyslorder = ""; + if (sorter.order === "ascend") { + myyslorder = "asc"; + } else if (sorter.order === "descend") { + myyslorder = "desc"; + } + this.funorder("work_score", myyslorder) + } + + } catch (e) { + + } + + //学号 + try { + if (sorter.columnKey === "student_id") { + let myyslorder = ""; + if (sorter.order === "ascend") { + myyslorder = "asc"; + } else if (sorter.order === "descend") { + myyslorder = "desc"; + } + this.funorder("student_id", myyslorder) + } + + } catch (e) { + + } + + } + } + render(){ const { getFieldDecorator } = this.props.form; const dateFormat = 'YYYY-MM-DD HH:mm'; @@ -745,21 +806,21 @@ class CommonWorkList extends Component{ } */} - { - isAdminOrStudent && student_works && !!student_works.length && -
-
  • - - {order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""} - -
      -
    • this.funorder("update_time")}>更新时间
      • -
    • this.funorder("work_score")}>最终成绩
      • -
    • this.funorder("student_id")}>学生学号
      • -
    -
    • -
    - } + {/*{*/} + {/* isAdminOrStudent && student_works && !!student_works.length &&*/} + {/*
    */} + {/*
  • */} + {/* */} + {/* {order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}*/} + {/* */} + {/*
      */} + {/*
    • this.funorder("update_time")}>更新时间
      • */} + {/*
    • this.funorder("work_score")}>最终成绩
      • */} + {/*
    • this.funorder("student_id")}>学生学号
      • */} + {/*
    */} + {/*
    • */} + {/*
    */} + {/*}*/} } @@ -794,11 +855,12 @@ class CommonWorkList extends Component{ `} { isStudent &&StudentData===undefined?"":StudentData===undefined?"": } @@ -836,12 +898,13 @@ class CommonWorkList extends Component{ onChange={this.onTablePagination} */}
    diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 966813852..81086a75b 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1207,6 +1207,7 @@ class Listofworksstudentone extends Component { key: 'stduynumber', align: "center", className: 'font-14 maxnamewidth110', + sorter: true, render: (text, record) => ( {record.stduynumber === undefined ? @@ -1419,6 +1420,7 @@ class Listofworksstudentone extends Component { key: 'finalscore', align: 'center', className: 'font-14', + sorter: true, render: (text, record) => ( {