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

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