From 5ace28129d93acb40fd64277f0be3378e301d12f 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, 6 Sep 2019 14:19: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

---
 .../modules/courses/poll/PollNewQuestbank.js  | 20 +++++++++----------
 .../shixunHomework/Listofworksstudentone.js   |  9 +++++++++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js
index a84a4cc16..e152c5163 100644
--- a/public/react/src/modules/courses/poll/PollNewQuestbank.js
+++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js
@@ -1062,7 +1062,7 @@ class PollNewQuestbank extends Component {
 			} else if (object.question.question_type === 2) {
 				//插入多选题
 				if (object.question.max_choices < object.question.min_choices) {
-					this.props.showNotification(`可选的最大限制不能小于最小限制`);
+					this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
 
 					return;
 				}
@@ -1087,11 +1087,11 @@ class PollNewQuestbank extends Component {
 					if(object.question.min_choices>0){
 						if(object.question.max_choices){
 							if(object.question.max_choices===0){
-								this.props.showNotification(`可选的最大限制不能小于最小限制！`);
+								this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
 								return;
 							}
 						}else {
-							this.props.showNotification(`可选的最大限制不能小于最小限制！`);
+							this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
 							return;
 
 						}
@@ -1293,7 +1293,7 @@ class PollNewQuestbank extends Component {
 				//插入多选题
 
 				if (object.question.max_choices < object.question.min_choices) {
-					this.props.showNotification('可选的最大限制不能小于最小限制！');
+					this.props.showNotification('可选：最小和最大限制须同时为数值或者“--"');
 
 					return;
 				}
@@ -1623,7 +1623,7 @@ class PollNewQuestbank extends Component {
 			} else if (object.question.question_type === 2) {
 				//插入多选题
 				if (object.question.max_choices < object.question.min_choices) {
-					this.props.showNotification(`可选的最大限制不能小于最小限制`);
+					this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
 
 					return;
 				}
@@ -1649,11 +1649,11 @@ class PollNewQuestbank extends Component {
 					if(object.question.min_choices>0){
 						if(object.question.max_choices){
 							if(object.question.max_choices===0){
-								this.props.showNotification(`可选的最大限制不能小于最小限制！`);
+								this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
 								return;
 							}
 						}else {
-							this.props.showNotification(`可选的最大限制不能小于最小限制！`);
+							this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
 							return;
 
 						}
@@ -1827,7 +1827,7 @@ class PollNewQuestbank extends Component {
 			} else if (object.question.question_type === 2) {
 				//插入多选题
 				if (object.question.max_choices < object.question.min_choices) {
-					this.props.showNotification(`可选的最大限制不能小于最小限制`);
+					this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
 
 					return;
 				}
@@ -1853,11 +1853,11 @@ class PollNewQuestbank extends Component {
 					if(object.question.min_choices>0){
 						if(object.question.max_choices){
 							if(object.question.max_choices===0){
-								this.props.showNotification(`可选的最大限制不能小于最小限制！`);
+								this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
 								return;
 							}
 						}else {
-							this.props.showNotification(`可选的最大限制不能小于最小限制！`);
+							this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
 							return;
 
 						}
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 29797ae43..4c2d099b4 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2504,6 +2504,15 @@ class Listofworksstudentone extends Component {
 		// console.log(this.props.isAdmin());
 
 	 let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
+	 // if(this.props.isAdmin() === false){
+	 // 	if(teacherdata.student_works!==undefined){
+	 // 		if(teacherdata.student_works.length>0){
+   //
+	 //
+		// 	}
+		// }
+	 //
+	 // }
 		return (
 			this.props.isAdmin() === true ?
 				(