From bfcb26af6712ca7ffce4bc855e916fa6e5a99ebc Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 6 Sep 2019 11:00:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exercise/Testpapersettinghomepage.js      | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 2c56b8b58..5775bd240 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -200,19 +200,20 @@ class Testpapersettinghomepage extends Component{
                     })
                 }
             }else {
-							this.setState({ donwloading: true })
-							downloadFile({
-								url: urll,
-								successCallback: (url) => {
-									this.setState({ donwloading: false })
-									console.log('successCallback')
-								},
-								failCallback: (responseHtml, url) => {
-									this.setState({ donwloading: false })
-									console.log('failCallback')
-								}
-							})
-							this.props.showNotification(`正在下载中`);
+                this.props.slowDownload(urll)
+							// this.setState({ donwloading: true })
+							// downloadFile({
+							// 	url: urll,
+							// 	successCallback: (url) => {
+							// 		this.setState({ donwloading: false })
+							// 		console.log('successCallback')
+							// 	},
+							// 	failCallback: (responseHtml, url) => {
+							// 		this.setState({ donwloading: false })
+							// 		console.log('failCallback')
+							// 	}
+							// })
+							// this.props.showNotification(`正在下载中`);
 
 							// window.open("/api"+url+`?${queryString.stringify(params)}`+ '&export=true', '_blank');
             }
@@ -380,7 +381,8 @@ 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.confpdf(`/api/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>
+                                        {/* <li><a onClick={()=>this.confpdf(`/api/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li> */}
+                                        <li><a href={`/api/exercises/${this.props.match.params.Id}/export_exercise`} target="_blank">空白试卷</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></Spin>:""}