调整

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) => (
         <span>
           <a href="javascript:;"  
@@ -200,8 +200,7 @@ function buildColumns(that, student_works, studentData) {
     title: '更新时间',
     dataIndex: 'update_time',
     key: 'update_time',
-		sorter: (a, b) => a.update_time - b.update_time,
+		sorter: true,
-
     render: (update_time, record) => (
       <span>
         <a href="javascript:;"  style={{color:'#989898', cursor: 'default'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a>
@@ -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 (
         <span>
@@ -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) => {
+	funorder = (order, b_order) => {
-    this.setState({ 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{
                     </li>
                   </ul>
                 </div> } */}
-                {
+								{/*{*/}
-                  isAdminOrStudent && student_works && !!student_works.length &&
+								{/*  isAdminOrStudent && student_works && !!student_works.length &&*/}
-                  <div className="fr">
+								{/*  <div className="fr">*/}
-                    <li className="drop_down">
+								{/*    <li className="drop_down">*/}
-                      <span className="color-grey-9 font-12">
+								{/*      <span className="color-grey-9 font-12">*/}
-                        {order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}
+								{/*        {order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}*/}
-                      </span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>
+								{/*      </span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>*/}
-                      <ul className="drop_down_normal">
+								{/*      <ul className="drop_down_normal">*/}
-                        <li className={''} onClick={()=>this.funorder("update_time")}>更新时间</li>
+								{/*        <li className={''} onClick={()=>this.funorder("update_time")}>更新时间</li>*/}
-                        <li className={''} onClick={()=>this.funorder("work_score")}>最终成绩</li>
+								{/*        <li className={''} onClick={()=>this.funorder("work_score")}>最终成绩</li>*/}
-                        <li className={''} onClick={()=>this.funorder("student_id")}>学生学号</li>
+								{/*        <li className={''} onClick={()=>this.funorder("student_id")}>学生学号</li>*/}
-                      </ul>
+								{/*      </ul>*/}
-                    </li>
+								{/*    </li>*/}
-                  </div>
+								{/*  </div>*/}
-                }
+								{/*}*/}
 
               </div>
             </div> }
@@ -794,11 +855,12 @@ class CommonWorkList extends Component{
             `}</style>
             { isStudent &&StudentData===undefined?"":StudentData===undefined?"":
               <Table
-                className="studentTable"
+								className="studentTable"
-                dataSource={StudentData}
+								dataSource={StudentData}
-                columns={columns}
+								onChange={this.table1handleChange}
-                pagination={false}
+								columns={columns}
-                showHeader={ !student_works || student_works.length == 0}
+								pagination={false}
+								showHeader={ !student_works || student_works.length == 0}
               />
             }
 
@@ -836,12 +898,13 @@ class CommonWorkList extends Component{
                 onChange={this.onTablePagination}
                 */}
               <Table
-                className="stageTable"
+								className="stageTable"
-                dataSource={student_works}
+								dataSource={student_works}
-                columns={columns}
+								columns={columns}
-                showQuickJumper
+								showQuickJumper
-                pagination={false}
+								pagination={false}
-                loading={loadingstate}
+								onChange={this.table1handleChange}
+								loading={loadingstate}
               />
               </React.Fragment>
 

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) => (
 						<span className="maxnamewidth110">
 							{record.stduynumber === undefined ?
@@ -1419,6 +1420,7 @@ class Listofworksstudentone extends Component {
 					key: 'finalscore',
 					align: 'center',
 					className: 'font-14',
+					sorter: true,
 					render: (text, record) => (
 						<span>
 									{