From f04f6f7e5ebe47e1b519643e175fca75d71ce6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 5 Jul 2019 15:17:43 +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     | 14 ++--
 .../shixunHomework/ShixunStudentWork.js       | 75 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index d697694cb..17b9179d4 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -115,6 +115,7 @@ class Listofworks extends Component {
 					key: 'name',
 					align: 'center',
 					className:'font-14',
+					width:'120px',
 					render: (text, record) => (
 						<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
 					)
@@ -139,7 +140,7 @@ class Listofworks extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className:'font-14',
-					width:'288px',
+					width:"260px",
 					render: (text, record) => (
 						<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
 					)
@@ -239,9 +240,9 @@ class Listofworks extends Component {
 												</span>
 											</Tooltip>
 											:
-											<a style={{color:"#9A9A9A"}}>
+											<span style={{color:"#9A9A9A"}}>
 												--
-											</a>
+											</span>
 								)
 								:
 								<span style={parseInt(record.efficiencyscore) <= 60 ? {
@@ -367,6 +368,7 @@ class Listofworks extends Component {
 					key: 'name',
 					align: 'center',
 					className:'font-14',
+					width:'120px',
 					render: (text, record) => (
 						<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
 					)
@@ -391,7 +393,7 @@ class Listofworks extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className:'font-14',
-					width:'288px',
+					width:"260px",
 					render: (text, record) => (
 						<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
 					)
@@ -491,9 +493,9 @@ class Listofworks extends Component {
 												</span>
 											</Tooltip>
 											:
-											<a style={{color:"#9A9A9A"}}>
+											<span style={{color:"#9A9A9A"}}>
 												--
-											</a>
+											</span>
 								)
 								:
 								<span style={parseInt(record.efficiencyscore) <= 60 ? {
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index ea554c208..3171349a0 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -443,8 +443,50 @@ class ShixunStudentWork extends Component {
 			starttimes:undefined,
 		})
 	}
+// 导出实习报告批量
+	internshipreport = (url) => {
+		console.log("internshipreport");
+		// var homeworkid = this.props.match.params.homeworkid;
+		// let url = "/zip/shixun_report";
+		axios.get(url).then((response) => {
+			console.log("326");
+			console.log(response);
+			if(response.data.status&&response.data.status===-1){
+
+
+			}else if(response.data.status&&response.data.status===-2){
+
+			}else{
+				window.open("/api"+url, '_blank');
+			}
+
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
+
+	// 课堂学生成绩的导出下载
+	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).then((response) => {
+			console.log("1374");
+			console.log(response);
+			if(response.data.status&&response.data.status===-1){
 
 
+			}else if(response.data.status&&response.data.status===-2){
+
+			}else{
+				window.open("/api"+url, '_blank');
+
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
+
 	render() {
 		let {
 			data,
@@ -606,10 +648,35 @@ class ShixunStudentWork 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> : ""}
+								<style>{`
+                        .drop_down_menu li a {
+                            padding: 0px;
+                            font-size: 14px;
+                        }
+                        .drop_down_menu {
+                            width: 93px;
+                        }
+                        .drop_down_menu li {
+                            overflow: visible;
+                            width: 93px;
+                        }
+                        .drop_down_menu, .drop_down_normal {
+                            padding-top: 10px;
+                            padding-bottom: 8px;
+                        }
+                        a:hover {
+                        color:#1A0B00 !important;
+                        }
+                        `}</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": "-0px", "left": "unset", "height": "auto"}}>
+										<li><a onClick={()=>this.internshipreport(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}`)}>实训报告</a>
+										</li>
+										<li><a onClick={()=>this.Classstudentachievement(`/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx`)}>学生成绩</a>
+										</li>
+									</ul>
+								</li> : ""}
 								{this.props.isAdmin()?
 									data&&data.end_immediately===true?
 									<a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a> : "" : ""}