From 33bb561e38005e0dfa6aa8891023a210a40581d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 9 Jan 2020 11:15:35 +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/AppConfig.js                 |  2 +-
 .../courses/busyWork/CommonWorkPost.js        | 31 +++++++++++--------
 .../tasks/GraduationTasksSubmitedit.js        | 25 +++++++++------
 .../tasks/GraduationTaskssettinglist.js       |  3 +-
 .../graduation/tasks/Graduationclass.css      |  7 +++++
 5 files changed, 44 insertions(+), 24 deletions(-)
 create mode 100644 public/react/src/modules/courses/graduation/tasks/Graduationclass.css

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 535b19a94..1c626a12c 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -42,7 +42,7 @@ if (isDev) {
 // 老师
 //debugType="teacher";
 // 学生
-//debugType="student";
+debugType="student";
 
 
  function railsgettimes(proxy) {
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
index 5e01b21a1..46bdbca5c 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
@@ -68,6 +68,7 @@ class CommonWorkPost extends Component{
                 uid: item.id,
                 name: appendFileSizeToUploadFile(item),
                 url: item.url,
+                delete: item.delete,
                 status: 'done'
               }
             })
@@ -320,19 +321,23 @@ class CommonWorkPost extends Component{
     //   ModalSave: ()=>this.deleteAttachment(file),
     //   ModalCancel:this.cancelAttachment
     // })
-
-    if(!file.percent || file.percent == 100){
-			this.props.confirm({
-				content: '是否确认删除?',
-				onOk: () => {
-					this.deleteAttachment(file)
-				},
-				onCancel() {
-					console.log('Cancel');
-				},
-			});
-			return false;
-		}
+    if (file.delete === false) {
+      this.props.showNotification(`该作品已被评阅，不能删除该附件`);
+      return false
+    } else {
+      if (!file.percent || file.percent == 100) {
+        this.props.confirm({
+          content: '是否确认删除?',
+          onOk: () => {
+            this.deleteAttachment(file)
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+        return false;
+      }
+    }
   }
 
   cancelAttachment=()=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index 65fcf4d19..f9e93a0de 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -56,6 +56,7 @@ class GraduationTasksSubmitedit extends Component{
 						name: appendFileSizeToUploadFile(item),
 						url: item.url,
 						filesize: item.filesize,
+            delete:item.delete,
 						status: 'done'
 					}
 				})
@@ -133,15 +134,21 @@ class GraduationTasksSubmitedit extends Component{
   }
 
   onAttachmentRemove = (file) => {
-		if(!file.percent || file.percent == 100){
-			this.setState({
-				Modalstype:true,
-				Modalstopval:'确定要删除这个附件吗?',
-				ModalSave: ()=>this.deleteAttachment(file),
-				ModalCancel:this.cancelAttachment
-			})
-			return false;
-		}
+    if(file.delete===false){
+      this.props.showNotification(`该作品已被评阅，不能删除该附件`);
+      return false
+    }else{
+      if(!file.percent || file.percent == 100){
+        this.setState({
+          Modalstype:true,
+          Modalstopval:'确定要删除这个附件吗?',
+          ModalSave: ()=>this.deleteAttachment(file),
+          ModalCancel:this.cancelAttachment
+        })
+        return false;
+      }
+    }
+
 
   }
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index c00542233..c9ef0ec0d 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -12,6 +12,7 @@ import ModulationModal from "../../coursesPublic/ModulationModal";
 import AllocationModal from "../../coursesPublic/AllocationModal";
 import Associationmodel from '../../coursesPublic/Associationmodel';
 import AccessoryModal from "../../coursesPublic/AccessoryModal";
+import './Graduationclass.css';
 
 
 const CheckboxGroup = Checkbox.Group;
@@ -826,7 +827,7 @@ class GraduationTaskssettinglist extends Component{
 			className:'edu-txt-center',
 			render: (text, record) => (
 				<span>
-             <a style={{color:'#9A9A9A'}}>{record.classroom==="未分班"?"--":record.classroom}</a>
+             <a style={{color:'#9A9A9A'}} className={"classroomclass"} title={record.classroom==="未分班"?"":record.classroom}>{record.classroom==="未分班"?"--":record.classroom}</a>
         </span>
 			),
 		}, {
diff --git a/public/react/src/modules/courses/graduation/tasks/Graduationclass.css b/public/react/src/modules/courses/graduation/tasks/Graduationclass.css
new file mode 100644
index 000000000..9788284bb
--- /dev/null
+++ b/public/react/src/modules/courses/graduation/tasks/Graduationclass.css
@@ -0,0 +1,7 @@
+.classroomclass{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: 110px;
+    display: inline-block;
+}
\ No newline at end of file