From ea5d5dceaea5fe4323ae7bd96c315de4efe908d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 31 Jul 2019 13:58:06 +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/exercise/Studentshavecompletedthelist.js        | 6 ++++--
 .../modules/courses/exercise/Testpapersettinghomepage.js    | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index f7a989f79..0556d94e9 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -2312,11 +2312,13 @@ class Studentshavecompletedthelist extends Component {
 
 	};
 	_getRequestParams() {
-		const { order, checkedValuesineinfo,searchtext, page ,limit} = this.state
+		const { order, checkedValuesineinfo,course_groupyslstwo ,searchtext, page ,limit,course_groupyslsthree} = this.state
 		return {
 			page,
+			review:course_groupyslsthree,
+			commit_status:course_groupyslstwo,
 			search:searchtext,
-			group_id:checkedValuesineinfo,
+			exercise_group_id:checkedValuesineinfo,
 			limit: limit,
 			order,
 		}
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 24e960a9d..8e895b852 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -170,7 +170,7 @@ class Testpapersettinghomepage extends Component{
 					}
 					console.log("170");
 					console.log(params);
-            axios.get(url+`?${queryString.stringify(params)}`).then((response) => {
+            axios.get(url+`?${queryString.stringify(params)}`+ '&export=true').then((response) => {
             	if(response===undefined){
             		return
 							}
@@ -193,7 +193,7 @@ class Testpapersettinghomepage extends Component{
                 }
             }else {
                 this.props.showNotification(`正在下载中`);
-                window.open("/api"+url+`?${queryString.stringify(params)}`, '_blank');
+                window.open("/api"+url+`?${queryString.stringify(params)}`+ '&export=true', '_blank');
             }
         }).catch((error) => {
             console.log(error)
@@ -357,7 +357,7 @@ class Testpapersettinghomepage extends Component{
                                     导出<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`,this.child)}>学生成绩</a></li>
-                                        {/*<li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>*/}
+                                        <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/export_exercise`,this.child)} >空白试卷</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>
                                 </li>:""}