From 16eb9fff0073132d4f12b829b7ba17f12a8fb692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 18 Mar 2020 12:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=9F=E8=AE=A1=E3=80=81?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/shixunHomework/Listofworksstudentone.js   | 2 +-
 .../src/modules/courses/shixunHomework/ShixunHomeworkPage.js  | 2 +-
 public/react/src/modules/courses/statistics/Statistics.js     | 4 +++-
 public/react/src/modules/tpm/TPMIndexHOC.js                   | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index fb9c244cd..23869ac62 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -510,7 +510,7 @@ class Listofworksstudentone extends Component {
 					),
 				},
 			],
-			orders: "update_time",
+			orders: "work_score",
 			columnsstu2: [
 				{
 					title: '序号',
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index c539cb7b2..cc88065a6 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -279,7 +279,7 @@ class ShixunHomeworkPage extends Component {
 								typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
 							/>
 							<a className="color-grey-9 fr font-16  summaryname  ml20 mr20" onClick={()=>this.gotohome()}>返回</a>
-							{teacherdatapage&&teacherdatapage.shixun_status>1?<a className="color-grey-9 fr font-16 mr20"
+							{teacherdatapage&&teacherdatapage.shixun_status>1?<a className="color-blue fr font-16 mr20"
 																																	 href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
 																																	 target={"_blank"}>实训详情</a>:""}
 
diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js
index 589d8eb90..8d0d0984e 100644
--- a/public/react/src/modules/courses/statistics/Statistics.js
+++ b/public/react/src/modules/courses/statistics/Statistics.js
@@ -172,6 +172,8 @@ class Statistics extends Component{
 				}
 
 			})
+
+		// console.log(getRandomcode(`${url}?${urllist}`))
 		this.props.slowDownload(getRandomcode(`${url}?${urllist}`));
 	}
 
@@ -420,7 +422,7 @@ class Statistics extends Component{
 			{
 				this.props.isAdmin()===true?
 					// 这里是文件下载 不能替换路由
-					<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/classrooms/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
+					<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
 					:""
 			}
 		</React.Fragment>;
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 1731a55fa..dcf723ee6 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -662,6 +662,7 @@ export function TPMIndexHOC(WrappedComponent) {
             console.log('failCallback')
           }
         })
+				this.setState({ globalLoading: false })
       }
       yslslowCheckresults =(tip) =>{
 				this._gLoadingTip = tip || '成绩计算中，请稍候...';