From 213602138ccfe6d007b8b977dfbb0557c1d82d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 29 Oct 2019 10:54:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/poll/PollDetailTabFirst.js | 122 +++++++++++++----- .../shixunHomework/Listofworksstudentone.js | 52 -------- 2 files changed, 93 insertions(+), 81 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollDetailTabFirst.js b/public/react/src/modules/courses/poll/PollDetailTabFirst.js index ad7b957b1..032e9e3b6 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabFirst.js +++ b/public/react/src/modules/courses/poll/PollDetailTabFirst.js @@ -49,7 +49,8 @@ class PollDetailTabFirst extends Component{ poll_types:undefined, course_groups:undefined, options_Class:[], - poll_end_at:"" + poll_end_at: "", + order_type: "desc" } } // 搜索框搜索 @@ -59,12 +60,12 @@ class PollDetailTabFirst extends Component{ }) } searchInfo=()=>{ - let{order,search,commit_status,poll_group_id,page}=this.state - this.getTableList(order,search,commit_status,poll_group_id,page); + let {order, search, commit_status, poll_group_id, page, order_type} = this.state + this.getTableList(order, search, commit_status, poll_group_id, page, order_type); } // 获取接口数据 - getTableList=(order,search,commit_status,poll_group_id,page)=>{ + getTableList = (order, search, commit_status, poll_group_id, page, order_type) => { let pollId=this.props.match.params.pollId; let courseid=this.props.match.params.coursesId; let url=`/polls/${pollId}/poll_lists.json`; @@ -76,7 +77,8 @@ class PollDetailTabFirst extends Component{ search:search, commit_status:commit_status, poll_group_id:poll_group_id, - page:page + page: page, + order_type: order_type } }).then((result)=>{ if(result){ @@ -128,8 +130,8 @@ class PollDetailTabFirst extends Component{ } componentDidMount(){ - let {order,search,commit_status,poll_group_id,page}=this.state; - this.getTableList(order,search,commit_status,poll_group_id,page); + let {order, search, commit_status, poll_group_id, page, order_type} = this.state; + this.getTableList(order, search, commit_status, poll_group_id, page, order_type); } // 翻页 @@ -137,17 +139,17 @@ class PollDetailTabFirst extends Component{ this.setState({ page:pageNumber }) - let {order,search,commit_status,poll_group_id}=this.state; - this.getTableList(order,search,commit_status,poll_group_id,pageNumber); + let {order, search, commit_status, poll_group_id, order_type} = this.state; + this.getTableList(order, search, commit_status, poll_group_id, pageNumber, order_type); } //排序 - changeOrder=(order)=>{ + changeOrder = (order, order_type) => { this.setState({ order:order }) let {search,commit_status,poll_group_id,page}=this.state; - this.getTableList(order,search,commit_status,poll_group_id,page); + this.getTableList(order, search, commit_status, poll_group_id, page, order_type); } //选择分班情况 classOptionsChange = (values,all) => { @@ -155,8 +157,8 @@ class PollDetailTabFirst extends Component{ this.setState({ poll_group_id:status }) - let {order,search,commit_status,page}=this.state; - this.getTableList(order,search,commit_status,status,page); + let {order, search, commit_status, page, order_type} = this.state; + this.getTableList(order, search, commit_status, status, page, order_type); } //选择提交状态 statusOptionChange=(values,all)=>{ @@ -164,10 +166,69 @@ class PollDetailTabFirst extends Component{ this.setState({ commit_status:status }) - let {order,search,poll_group_id,page}=this.state; - this.getTableList(order,search,status,poll_group_id,page); - } + let {order, search, poll_group_id, page, order_type} = this.state; + this.getTableList(order, search, status, poll_group_id, page, order_type); + } + //问卷table 列表塞选数据 + table1handleChange = (pagination, filters, sorter) => { + //"ascend" 升序 + //"descend" 降序 + if (JSON.stringify(sorter) === "{}") { + //没有选择 + } else { + + try { + //学生学号排序 + if (sorter.columnKey === "StudentNo") { + if (sorter.order === "ascend") { + //升序 + this.setState({ + order_type: "asc", + order: "student_id", + loadingstate: true, + }); + this.changeOrder("student_id", "asc"); + } else if (sorter.order === "descend") { + //降序 + this.setState({ + order_type: "desc", + order: "student_id", + loadingstate: true, + }) + this.changeOrder("student_id", "desc"); + } + } + } catch (e) { + + } + + try { + //提交时间排序 + if (sorter.columnKey === "time") { + if (sorter.order === "ascend") { + //升序 + this.setState({ + order_type: "asc", + order: "end_at", + loadingstate: true, + }) + this.changeOrder("end_at", "asc"); + } else if (sorter.order === "descend") { + //降序 + this.setState({ + order_type: "desc", + order: "end_at", + loadingstate: true, + }) + this.changeOrder("end_at", "desc"); + } + } + } catch (e) { + + } + } + } render(){ let {order,search,data,page,limit,course_groups,poll_types,options_Class,dataInfo,poll_end_at}=this.state; const isAdmin =this.props.isAdmin(); @@ -197,6 +258,7 @@ class PollDetailTabFirst extends Component{ dataIndex: 'StudentNo', key: 'StudentNo', className:"edu-txt-center", + sorter: true, render:(StudentNo,item,index)=>{ return( item.StudentNo ? {item.StudentNo} : "--" @@ -230,6 +292,7 @@ class PollDetailTabFirst extends Component{ key: 'time', className:"edu-txt-center", width:160, + sorter: true, render:(time,item,index)=>{ return( item.time == null ? -- : moment(item.time).format('YYYY-MM-DD HH:mm') @@ -316,22 +379,23 @@ class PollDetailTabFirst extends Component{ :"" } - { - isAdmin && -
-
  • - {order=="end_at"?"提交时间":"学生学号"} - -
    • -
    - } + {/*{*/} + {/* isAdmin && */} + {/*
    */} + {/*
  • */} + {/* {order=="end_at"?"提交时间":"学生学号"}*/} + {/* */} + {/*
    • */} + {/*
    */} + {/*}*/} }
    { - data && data.length>0 ?
    : + data && data.length > 0 ?
    : }
    { diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index e94038a28..3b19630bc 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2771,39 +2771,6 @@ class Listofworksstudentone extends Component { this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, 20, this.state.myorders); } } - //排序 - funordert = (e) => { - if (e === "update_time") { - // 时间 - // 时间排序是从小到大 - this.setState({ - orders: "update_time", - loadingstate: true, - }) - this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, this.state.myorders); - } - - if (e === "work_score") { - // 成绩 - //成绩排序是从大到小 - this.setState({ - orders: "work_score", - loadingstate: true, - }) - this.Startsortingt("work_score", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, this.state.myorders); - } - - if (e === "student_id") { - //学号 - //学号排序是从大到小 - this.setState({ - orders: "student_id", - loadingstate: true, - }) - this.Startsortingt("student_id", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, this.state.myorders); - } - } - // 调分 @@ -3530,25 +3497,6 @@ class Listofworksstudentone extends Component { } - {/*
    */} - {/* */} - {/*
    */} - -