调整毕设任务列表排序

public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js

@@ -515,7 +515,7 @@ class GraduationTaskDetail extends Component{
 							</div>
 						</div>
 						<Switch {...this.props}>
-
+							{/*//毕设任务列表*/}
 							<Route exact path="/courses/:coursesId/graduation_tasks/:category_id/detail/:task_Id/list"
 										 render={
 											 (props) => (<GraduationTaskslist {...this.props} {...props} {...this.state} {...commom} triggerRef={this.bindRef} setend_time={(time)=>this.setend_time(time)} tab={`list`}/>)

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;
+		this.setState({
-		if(order===value){
+			order: value,
-			if(b_order==="desc"){
+			b_order: newb_order,
-
+			loadingstate: true
-				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.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) => (
 				<span>
              <div style={{color:'#9A9A9A'}} className={"studentnumber"} title={record.stduynumber}>{record.stduynumber}</div>
@@ -798,6 +822,7 @@ class GraduationTaskssettinglist extends Component{
 			dataIndex: 'turnovertime',
 			key: 'turnovertime',
 			className:'edu-txt-center',
+				sorter: true,
 			render: (text, record) => (
 				<span>
              <a style={{color:'#989898'}}>
@@ -839,6 +864,7 @@ class GraduationTaskssettinglist extends Component{
 			key: 'finalscore',
 			dataIndex: 'finalscore',
 			className:'edu-txt-center',
+				sorter: true,
 			render: (text, record) => (
 				<span>
 			 <Tooltip placement="right" title={record.finalscore.work_score==="--"?"未评阅":	<pre>
@@ -1220,20 +1246,20 @@ class GraduationTaskssettinglist extends Component{
 													{this.props.isAdmin()===true?<span className="fl color-grey-6 font-12">
 														<span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>
 														个检索结果（{taskslistdata&&taskslistdata.all_work_count} 学生）</span>:""}
-													{this.props.isAdmin()===true?<div className="fr color-grey-6 edu-menu-panel">
+													{/*{this.props.isAdmin()===true?<div className="fr color-grey-6 edu-menu-panel">*/}
-														<p>
+													{/*	<p>*/}
-															<a data-remote="true" class="color-grey-6 font-12">
+													{/*		<a data-remote="true" class="color-grey-6 font-12">*/}
-															{order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
+													{/*		{order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>*/}
-															<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
+													{/*		<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>*/}
-														<ul className="edu-menu-list edu-menu-lists" style={{width: '87px'}}>
+													{/*	<ul className="edu-menu-list edu-menu-lists" style={{width: '87px'}}>*/}
-															<li onClick={(e)=>this.funorder("update_time")}><a data-remote="true">更新时间</a>
+													{/*		<li onClick={(e)=>this.funorder("update_time")}><a data-remote="true">更新时间</a>*/}
-															</li>
+													{/*		</li>*/}
-															<li onClick={(e)=>this.funorder("work_score" )}><a  data-remote="true">最终成绩</a>
+													{/*		<li onClick={(e)=>this.funorder("work_score" )}><a  data-remote="true">最终成绩</a>*/}
-															</li>
+													{/*		</li>*/}
-															<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>
 
 												{this.props.isStudent()===true?
@@ -1409,27 +1435,6 @@ class GraduationTaskssettinglist extends Component{
 
 
 												<div id="graduation_work_list" style={{ padding: '18px 40px 10px',height: '56px'}}>
-														{this.props.isAdmin()===true?
-															<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>
-																	 <div className="fr color-grey-6 edu-menu-panel">
-																		<p><a data-remote="true">
-																			{order==="update_time"?"时间":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">
-																			<li onClick={(e)=>this.funorder("update_time")} className={order==="update_time"?"none":""}><a data-remote="true">时间</a>
-																			</li>
-																			<li onClick={(e)=>this.funorder("work_score" )} className={order==="work_score"?"none":""}><a  data-remote="true">成绩</a>
-																			</li>
-																			<li  onClick={(e)=>this.funorder("student_id" )} className={order==="student_id"?"none":""}><a data-remote="true">学号</a>
-																			</li>
-																		</ul>
-																	</div>
-															</div>
-															:""}
 														{this.props.isStudent()===true?
 															<div className="clearfix">
 																<span className="mr15 color-grey9">