From 6cf2eb078e7356bf890e076b5aae1f1d89020c9d 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, 26 Jun 2019 15:54:19 +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     | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 23cb9c601..697ff92e4 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -94,6 +94,8 @@ class Listofworks extends Component {
 			boolgalist:true,
 			challenges_count:0,
 			experience:0,
+			exportResultUrl:"",
+			exportUrl:"",
 			columns: [
 				{
 					title: '序号',
@@ -1597,7 +1599,7 @@ class Listofworks extends Component {
 	render() {
 		// console.log("Listofworks.js000")
 
-		let {columns, page, boolgalist,limit, experience,course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state;
+		let {columns, page, boolgalist,limit,exportUrl, exportResultUrl,experience,course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state;
 		//
 		// console.log(teacherdata&&teacherdata.shixun_identifier)
 		// console.log(course_group_info)
@@ -1714,10 +1716,34 @@ class Listofworks extends Component {
 								<Link
 									to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/settings`}
 								>设置</Link>
-								{this.props.isAdmin() ? <a
-									className="fr color-blue font-16"
-									href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}
-								>导出</a> : ""}
+								{/*{this.props.isAdmin() ? <a*/}
+								{/*	className="fr color-blue font-16"*/}
+								{/*	href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/}
+								{/*>导出</a> : ""}*/}
+								<style>{`
+                        .drop_down_menu li a {
+                            padding: 0px;
+                            font-size: 14px;
+                        }
+                        .drop_down_menu {
+                            width: 121px;
+                        }
+                        .drop_down_menu li {
+                            overflow: visible;
+                            width: 121px;
+                        }
+                        .drop_down_menu, .drop_down_normal {
+                            padding-top: 10px;
+                            padding-bottom: 8px;
+                        }
+                        `}</style>
+								{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":"-34px","left":"unset","height":"auto"}}>
+										<li><a href={`/api/student_works/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/export_shixun_work_report.pdf`} calssName="color-dark">实训报告</a></li>
+										<li><a href={`/api/homework_commons/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/works_list.xlsx`} calssName="color-dark">学生成绩</a></li>
+									</ul>
+								</li>:""}
 								{this.props.isAdmin() ?
 									teacherdata && teacherdata.end_immediately === true ?
 										<a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a> : ""