From 64cab73cf74843a10f77ba477ca1d482b4ae4461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 30 Jul 2019 22:44:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/busyWork/CommonWorkDetailIndex.js | 15 +++++++++++----
 .../exercise/Studentshavecompletedthelist.js  | 11 +++++++----
 .../exercise/Testpapersettinghomepage.js      | 19 ++++++++++---------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index 2a211007b..9989de401 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -104,7 +104,14 @@ class CommonWorkDetailIndex extends Component{
   }
 
   /// 确认是否下载
-  confirmysl(url,params){
+  confirmysl(url,child){
+		let params = {}
+		if (isListModule) {
+			// TODO
+			if(child!=undefined) {
+				params = child._getRequestParams() !== undefined ? child._getRequestParams() : {};
+			}
+		}
     axios.get(url+ '&export=true',{
       params
     }).then((response) => {
@@ -131,7 +138,7 @@ class CommonWorkDetailIndex extends Component{
         this.setState({ donwloading: true })
         downloadFile({
           url: url,
-					params:params,
+					params,
           successCallback: (url) => {
             this.setState({ donwloading: false })
             console.log('successCallback')
@@ -317,13 +324,13 @@ class CommonWorkDetailIndex extends Component{
                             <li>
 
                               <a href={"javascript:void(0)"} className="color-dark"
-                              	  onClick={() => this.confirmysl(exportResultUrl, exportParams)}
+                              	  onClick={() => this.confirmysl(exportResultUrl,this.child)}
                               >导出成绩</a>
 
                             </li>
                             <li>
                               <a href={"javascript:void(0)"} className="color-dark"
-                              	  onClick={() => this.confirmysl(exportUrl, exportParams)}
+                              	  onClick={() => this.confirmysl(exportUrl,this.child)}
                               >导出作品附件</a>
                             </li>
                         </ul>
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index fcfea19c3..3f60710c1 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -1389,7 +1389,8 @@ class Studentshavecompletedthelist extends Component {
 						loadingstate: true,
 					})
 				}
-
+       console.log(response);
+				console.log(1393);
 				thiss.Generatenewdatasy(response.data.exercise_users, response);
 			}
 		}).catch((error) => {
@@ -1992,6 +1993,8 @@ class Studentshavecompletedthelist extends Component {
 			this.setState({
 				loadingstate: false,
 			})
+			console.log(response);
+			console.log(1997);
 			this.Generatenewdatasy(response.data.exercise_users, response);
 		}).catch((error) => {
 			console.log(error)
@@ -2306,13 +2309,13 @@ class Studentshavecompletedthelist extends Component {
 
 	};
 	_getRequestParams() {
-		const { order, course_groups,searchtext, page ,limit} = this.state
+		const { order, checkedValuesineinfo,searchtext, page ,limit} = this.state
 		return {
 			page,
 			search:searchtext,
-			order,
+			group_id:checkedValuesineinfo,
 			limit: limit,
-			group_id:course_groups,
+			order,
 		}
 	}
 
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index ec7fc189c..243ab98f5 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -163,9 +163,15 @@ class Testpapersettinghomepage extends Component{
 
 	}
     /// 确认是否下载
-        confirmysl(url,params){
+        confirmysl(url,child){
+					let params ={}
+					if(child!=undefined){
+						params =child._getRequestParams()!==undefined?child._getRequestParams():{};
+					}
+					console.log("170");
+					console.log(params);
             axios.get(url,{
-                params
+							params
             }).then((response) => {
             if(response.data.status&&response.data.status===-1){
 
@@ -240,12 +246,7 @@ class Testpapersettinghomepage extends Component{
         const isAdmin =this.props.isAdmin();
         const isStudent = this.props.isStudent();
             // TODO
-        let params ={}
-        if(this.child!=undefined){
-            params =this.child._getRequestParams()!==undefined?this.child._getRequestParams():{};
-        }
-        // console.log("246");
-        // console.log(this.child);
+
         return(
             <div className="newMain clearfix ">
 								{/*<DownloadMessage*/}
@@ -354,7 +355,7 @@ class Testpapersettinghomepage extends Component{
                                 {isAdmin  === true? <li className="li_line drop_down fr color-blue font-15" style={{"paddingLeft":"0px"}}>
                                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                                        <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`,params)}>学生成绩</a></li>
+                                        <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`,this.child)}>学生成绩</a></li>
                                         {/*<li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>*/}
                                         {/*<li><a onClick={()=>this.confirmysl(`/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval===null||this.state.groupyslsval===undefined?null:this.state.groupyslsval}`)}>学生答题试卷</a></li>*/}
                                     </ul>