From 04206f389762da418f3cdde17c5c30c365b7fc00 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:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E6=9F=A5?=
 =?UTF-8?q?=E9=87=8D=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/Listofworksstudentone.js   |   2 +-
 .../shixunHomework/ShixunStudentWork.js       | 131 ++++++++++--------
 2 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index fedcde663..e94038a28 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1589,7 +1589,7 @@ class Listofworksstudentone extends Component {
 			}
 
 			try {
-				//学生学号排序
+				//学生成绩排序
 				if (sorter.columnKey === "finalscore") {
 					if (sorter.order === "ascend") {
 						//升序
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 1fdc4303a..a3c2230a0 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -43,7 +43,7 @@ const qs = require('qs');
 //课堂作业设置
 
 
-//作品列表(教师)
+//代码查重
 class ShixunStudentWork extends Component {
 	constructor(props) {
 		super(props);
@@ -341,48 +341,15 @@ class ShixunStudentWork extends Component {
 		this.getcode_review_results(order,b_order,page,limit,group_infolist,search)
 	}
 
-	funorder=(value)=>{
+	funorder = (value, myyslorder) => {
 
 		let {order,b_order,page,limit,group_infolist,search} = 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,
+			order: value,
+			b_order: myyslorder
 		})
-		this.getcode_review_results(value,newb_order,page,limit,group_infolist,search)
+		this.getcode_review_results(value, myyslorder, page, limit, group_infolist, search)
 
 	}
 	groupgroup=(checkedValues)=>{
@@ -668,7 +635,56 @@ class ShixunStudentWork extends Component {
 			DownloadType:false,
 			DownloadMessageval:undefined
 		})
+	};
+
+
+	//代码查重tbale 列表塞选数据
+	table1handleChange = (pagination, filters, sorter) => {
+		//"ascend" 升序
+		//"descend" 降序
+		if (JSON.stringify(sorter) === "{}") {
+			//没有选择
+		} else {
+			// console.log(sorter);
+			try {
+				//学生学号排序
+				if (sorter.columnKey === "stduynumber") {
+					var myyslorder = "";
+					if (sorter.order === "ascend") {
+						//升序
+						myyslorder = "asc";
+					} else if (sorter.order === "descend") {
+						//降序
+						myyslorder = "desc";
+					}
+					this.funorder("student_id", myyslorder);
+				}
+			} catch (e) {
+
+			}
+
+			try {
+				//相似度排序
+				if (sorter.columnKey === "classroom") {
+					var myyslorder = "";
+					if (sorter.order === "ascend") {
+						//升序
+						myyslorder = "asc";
+					} else if (sorter.order === "descend") {
+						//降序
+						myyslorder = "desc";
+					}
+					this.funorder("code_rate", myyslorder);
+				}
+			} catch (e) {
+
+			}
+
+		}
+
 	}
+
+
 	render() {
 		let {
 			data,
@@ -708,6 +724,7 @@ class ShixunStudentWork extends Component {
 				title: '学号',
 				dataIndex: 'stduynumber',
 				key: 'stduynumber',
+				sorter: true,
 				render: (text, record) => (
 					<span>
              <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
@@ -718,6 +735,7 @@ class ShixunStudentWork extends Component {
 				title: '相似度',
 				key: 'classroom',
 				dataIndex: 'classroom',
+				sorter: true,
 				render: (text, record) => (
 					<span>
              <a style={{"color": record.classroom>=90?'#FF6800':"#747A7F", "text-align": "center"}}>{isNaN(record.classroom)?"--":record.classroom}%</a>
@@ -929,24 +947,24 @@ class ShixunStudentWork extends Component {
 		                {data&&data.copy_reviews_count}</span>
 	                  个疑似抄袭作品（{data&&data.all_reviews_count}作品） </span>
 
-								<div className="fr color-grey-6 edu-menu-panel" style={{color: '#989898'}}>
-									<p>
-										<a data-remote="true" className={"color-grey-9 font-12"}>
-										{order === "code_rate" ? "相似度" : order === "student_id" ? "学号" : ""}
-										</a>
-										<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
-									</p>
-
-									<ul className="edu-menu-list" style={{"width": "80px"}}>
-										<li onClick={(e) => this.funorder("code_rate")}>
-											<a className={"color-grey-9 font-12"} style={{"text-align": "center "}}>相似度</a>
-										</li>
-										<li onClick={(e) => this.funorder("student_id")}>
-											<a className={"color-grey-9 font-12"} style={{"text-align": "center "}}>学号</a>
-										</li>
-									</ul>
-
-								</div>
+								{/*<div className="fr color-grey-6 edu-menu-panel" style={{color: '#989898'}}>*/}
+								{/*	<p>*/}
+								{/*		<a data-remote="true" className={"color-grey-9 font-12"}>*/}
+								{/*		{order === "code_rate" ? "相似度" : order === "student_id" ? "学号" : ""}*/}
+								{/*		</a>*/}
+								{/*		<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>*/}
+								{/*	</p>*/}
+
+								{/*	<ul className="edu-menu-list" style={{"width": "80px"}}>*/}
+								{/*		<li onClick={(e) => this.funorder("code_rate")}>*/}
+								{/*			<a className={"color-grey-9 font-12"} style={{"text-align": "center "}}>相似度</a>*/}
+								{/*		</li>*/}
+								{/*		<li onClick={(e) => this.funorder("student_id")}>*/}
+								{/*			<a className={"color-grey-9 font-12"} style={{"text-align": "center "}}>学号</a>*/}
+								{/*		</li>*/}
+								{/*	</ul>*/}
+
+								{/*</div>*/}
 
 							</div>
 
@@ -968,6 +986,7 @@ class ShixunStudentWork extends Component {
 							</div>:<Table
 								dataSource={datalist}
 								columns={columns}
+								onChange={this.table1handleChange}
 								pagination={false}
 							/>}