Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -510,7 +510,7 @@ class Listofworksstudentone extends Component {
 					),
 				},
 			],
-			orders: "update_time",
+			orders: "work_score",
 			columnsstu2: [
 				{
 					title: '序号',

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>:""}
 

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>;

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 || '成绩计算中，请稍候...';