From f336c2674ba16acdb8d7689c3535baa1c010832e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 4 Jul 2019 18:09:49 +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/shixunHomework/Listofworks.js     | 58 +++++++++----------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index a720cffd4..b86bcfce5 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1336,48 +1336,42 @@ class Listofworks extends Component {
 	}
 
   // 导出实习报告批量
-	internshipreport = ()=>{
+	internshipreport = (url)=>{
 		console.log("internshipreport");
-		let url = "/zip/shixun_report";
-		let homeworkid = this.props.match.params.homeworkid;
-		axios.get((url),{
-			params: {
-				homework_common_id: homeworkid,
-				work_status: this.state.course_groupyslstwo,
-				course_group: this.state.checkedValuesineinfo,
-				search: this.state.searchtext,
-			}
-		},{responseType: 'blob'}).then((response) => {
-			console.log("1342");
-			console.log(response);
+		// params: {
+		// 	homework_common_id: homeworkid,
+		// 		work_status: this.state.course_groupyslstwo,
+		// 		course_group: this.state.checkedValuesineinfo,
+		// 		search: this.state.searchtext,
+		// }
+		// let url = "/zip/shixun_report";
+		// let homeworkid = this.props.match.params.homeworkid;
+		axios.get(url).then((response) => {
 			if(response.status === 200){
 				window.open(url, '_blank');
-			}else{
 
 			}
- 		}).catch((error) => {
+		}).catch((error) => {
 			console.log(error)
 		});
 	}
 
 	// 课堂学生成绩的导出下载
-	Classstudentachievement=()=>{
+	Classstudentachievement=(url)=>{
 		console.log("Classstudentachievement");
-		const course_id = this.props.match.params.coursesId;
-		let url = "/courses/"+course_id+"/export_member_scores_excel.xlsx";
-		axios.get((url),{
-			params: {
-				group_id: this.state.checkedValuesineinfo,
-				search:  this.state.searchtext,
-			}
-		},{responseType: 'blob'}).then((response) => {
-			console.log("1306");
-			console.log(response);
-				if(response.status === 200){
-					window.open(url, '_blank');
-				}else{
+		// const course_id = this.props.match.params.coursesId;
+		// let url = "/courses/"+course_id+"/export_member_scores_excel.xlsx";
+	// ,{
+	// 		params: {
+	// 			group_id: this.state.checkedValuesineinfo,
+	// 				search:  this.state.searchtext,
+	// 		}
+	// 	},{responseType: 'blob'})
+		axios.get(url).then((response) => {
+			if(response.status === 200){
+				window.open(url, '_blank');
 
-				}
+			}
 		}).catch((error) => {
 			console.log(error)
 		});
@@ -1531,8 +1525,8 @@ class Listofworks extends Component {
 								{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
 									导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 									<ul className="drop_down_menu" style={{"right":"-0px","left":"unset","height":"auto"}}>
-										<li><a onClick={()=>this.internshipreport()}>实训报告</a></li>
-										<li><a onClick={()=>this.Classstudentachievement()} >学生成绩</a></li>
+										<li><a onClick={()=>this.internshipreport(`/api/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>实训报告</a></li>
+										<li><a onClick={()=>this.Classstudentachievement(`/api/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx?group_id=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)} >学生成绩</a></li>
 									</ul>
 								</li>:""}
 								{this.props.isAdmin() ?