From 3500e6caf5cd3f116b3250150959bd1bbb45d817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 8 Jul 2019 16:31:18 +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

---
 public/react/src/modules/courses/shixunHomework/Listofworks.js | 1 +
 .../modules/courses/shixunHomework/Listofworksstudentone.js    | 3 ++-
 .../src/modules/courses/shixunHomework/ShixunStudentWork.js    | 1 +
 .../src/modules/courses/shixunHomework/ShixunWorkReport.js     | 1 +
 .../src/modules/courses/shixunHomework/Trainingjobsetting.js   | 1 +
 .../modules/courses/shixunHomework/Workquestionandanswer.js    | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index a937283c7..e8d76679e 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1364,6 +1364,7 @@ class Listofworks extends Component {
 					})
 				}
 			}else {
+				this.props.showNotification(`正在下载中`);
 				window.open("/api"+url, '_blank');
 			}
 		}).catch((error) => {
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 5648c6083..99d2e3c0a 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -102,6 +102,7 @@ class Listofworksstudentone extends Component {
 					key: 'name',
 					align: "center",
 					className:'font-14',
+					width:'100px',
 					render: (text, record) => (
 						<span>
 						{record.name === undefined ?
@@ -158,7 +159,7 @@ class Listofworksstudentone extends Component {
 					dataIndex: 'classroom',
 					align: "center",
 					className:'font-14',
-					width:'288px',
+					width:'260px',
 					render: (text, record) => (
 						<span>
              <span style={{
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 070744cdb..82b9aef3e 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -479,6 +479,7 @@ class ShixunStudentWork extends Component {
 					})
 				}
 			}else {
+				this.props.showNotification(`正在下载中`);
 				window.open("/api"+url, '_blank');
 			}
 		}).catch((error) => {
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 50cb0e81c..0903ad225 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -52,6 +52,7 @@ class ShixunWorkReport extends Component {
 					})
 				}
 			}else {
+				this.props.showNotification(`正在下载中`);
 				window.open("/api"+url, '_blank');
 			}
 		}).catch((error) => {
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 998940aa5..51b491861 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1687,6 +1687,7 @@ class Trainingjobsetting extends Component {
 									})
                 }
             }else {
+                this.props.showNotification(`正在下载中`);
                 window.open("/api"+url, '_blank');
             }
         }).catch((error) => {
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index c9366c2da..170051ca6 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -333,6 +333,7 @@ class Workquestionandanswer extends Component {
 					})
 				}
 			}else {
+				this.props.showNotification(`正在下载中`);
 				window.open("/api"+url, '_blank');
 			}
 		}).catch((error) => {