From fc01504e1deaa108b077dc70bd7e26d9da2b30c7 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 18:12:30 +0800
Subject: [PATCH 1/5] =?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/public/index.html                |  2 +-
 .../react/src/modules/courses/poll/PollNew.js | 22 ++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/public/react/public/index.html b/public/react/public/index.html
index f197c4698..1e49b874c 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -67,7 +67,7 @@
 
       <!-- <link rel="stylesheet" type="text/css" href="https://www.educoder.net/stylesheets/css/font-awesome.css?1510652321"> -->
 
-      <link rel="stylesheet" type="text/css" href="/stylesheets/educoder/iconfont/iconfont.css">
+      <link rel="stylesheet" type="text/css" href="http://47.96.87.25:48080/stylesheets/educoder/iconfont/iconfont.css">
       <link rel="stylesheet" type="text/css" href="/css/iconfont.css">
     <style>
         /*<!--去除浏览器点击操作后有蓝色的底块-->*/
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 392acf57c..a39ae5bf7 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2061,8 +2061,8 @@ class PollNew extends Component {
 		// console.log(this.state.adddom);
 	}
 
-	//提交题目//没有就创建新的题库，新建问题和保存题目不一样不能同时保存 这里只是新建 和编辑 标题和须知
-	submitQuestionnaire = () => {
+	//提交题目//没有就创建新的题库，新建问newz题和保存题目不一样不能同时保存 这里只是新建 和编辑 标题和须知
+	submitQuestionnaire = (mews) => {
 		console.log("调用了submitQuestionnaire")
 		if (this.state.Newedit === true) {
 
@@ -2084,6 +2084,12 @@ class PollNew extends Component {
 				pollid = this.state.pollid;
 			}
 
+			 if(mews ==="new"){
+         if(this.state.poll_questions&&this.state.poll_questions.length===0){
+					 this.props.showNotification("至少创建1个题目");
+					 return;
+				 }
+			 }
 
 			var url = `/polls/${pollid}.json`;
 			axios.put(url, {
@@ -2804,9 +2810,9 @@ class PollNew extends Component {
 									}}
 								>
 									<li className="clearfix mt30 mb50">
-										<a type="primary" className="defalutSubmitbtn fl mr20"
-											 onClick={() => this.submitQuestionnaire()}>提交</a>
-										<a className="defalutCancelbtn fl" onClick={() => this.props.history.goBack()}>取消</ a>
+										<a  className="defalutCancelbtn  fl mr20" onClick={() => this.props.history.goBack()}>取消</a>
+										<a type="primary" className="defalutSubmitbtn fl"
+											 onClick={() => this.submitQuestionnaire(this.props.match.params.news)}>提交</a>
 									</li>
 
 
@@ -2823,9 +2829,9 @@ class PollNew extends Component {
 								}}
 							>
 								<li className="clearfix mt30 mb50">
-									<a   className="defalutSubmitbtn fl mr20"onClick={() => this.props.history.goBack()}>取消</a>
-									<a type="primary" className="defalutCancelbtn fl"
-										 onClick={() => this.submitQuestionnaire()}>提交</a>
+									<a   className="defalutCancelbtn fl mr20"onClick={() => this.props.history.goBack()}>取消</a>
+									<a type="primary" className="  defalutSubmitbtn fl"
+										 onClick={() => this.submitQuestionnaire(this.props.match.params.news)}>提交</a>
 								</li>
 							</div>
 					}

From f62484aecd6a03f24fd4a42a0db1838c59c600ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 26 Jun 2019 18:12:30 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/GraduationTaskssettinglist.js         | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 21672ba65..5cd7527ad 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -734,13 +734,6 @@ class GraduationTaskssettinglist extends Component{
 			),
 		}, {
 
-		  //			finalscore: {work_score:worklists[i].final_score.work_score === null ? "--" : worklists[i].final_score.work_score,
-				// 								teacher_comment_score:worklists[i].teacher_comment_score,
-				// 								cross_comment_score:worklists[i].cross_comment_score,
-				// 								late_penalty:worklists[i].late_penalty
-				// 							},
-
-
 			title: '最终成绩',
 			key: 'finalscore',
 			dataIndex: 'finalscore',
@@ -748,11 +741,11 @@ class GraduationTaskssettinglist extends Component{
 			render: (text, record) => (
 				<span>
 			 <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":	<pre>
-								{record.final_score.username}{(record.final_score.login)}<br/>
-							  {record.ultimate_score===true?"":"教师评分："+record.final_score.teacher_comment_score+"分"}<br/>
-				        {taskslistdata.cross_comment===true?"":"交叉评分："+record.final_score.cross_comment_score+"分"}<br/>
-				        {record.final_score.late_penalty===undefined?"":"迟交扣分："+record.final_score.late_penalty+"分"}<br/>
-							  最终成绩：{record.final_score.work_score}分<br/>
+								{record.finalscore.final_score.username}{(record.finalscore.final_score.login)}<br/>
+							  {record.finalscore.ultimate_score===true?"":"教师评分："+record.finalscore.teacher_comment_score+"分"}<br/>
+				        {taskslistdata.cross_comment===true?"":"交叉评分："+record.finalscore.cross_comment_score+"分"+<br/>}
+				        {record.finalscore.late_penalty===undefined?"":"迟交扣分："+record.finalscore.late_penalty+"分"+<br/>}
+							  最终成绩：{record.finalscore.work_score}分<br/>
 							</pre>}>
 						<a style={{color:parseInt(record.finalscore.work_score)>90?'#DD1717':parseInt(record.finalscore.work_score)>60&&parseInt(record.finalscore.work_score)<90?"#FF6800":'#747A7F'}}>{record.finalscore.work_score==="--"?"--":record.finalscore.work_score}</a>
 			 </Tooltip>

From df3f1184812f72cc5c12e805fb874037d25263d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 26 Jun 2019 18:19:14 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/graduation/tasks/GraduationTaskssettinglist.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 5cd7527ad..fe53c347c 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -741,9 +741,9 @@ class GraduationTaskssettinglist extends Component{
 			render: (text, record) => (
 				<span>
 			 <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":	<pre>
-								{record.finalscore.final_score.username}{(record.finalscore.final_score.login)}<br/>
+								{record.finalscore.final_score.username}({record.finalscore.final_score.login})<br/>
 							  {record.finalscore.ultimate_score===true?"":"教师评分："+record.finalscore.teacher_comment_score+"分"}<br/>
-				        {taskslistdata.cross_comment===true?"":"交叉评分："+record.finalscore.cross_comment_score+"分"+<br/>}
+				        {record.finalscore.cross_comment_score===undefined?"":"交叉评分："+record.finalscore.cross_comment_score+"分"+<br/>}
 				        {record.finalscore.late_penalty===undefined?"":"迟交扣分："+record.finalscore.late_penalty+"分"+<br/>}
 							  最终成绩：{record.finalscore.work_score}分<br/>
 							</pre>}>

From d65f6b67e0108466b89983f31a1bd51e6d6e4ba8 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 18:25:45 +0800
Subject: [PATCH 4/5] =?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/poll/PollNew.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index a39ae5bf7..3f7a4a7b6 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2489,7 +2489,7 @@ class PollNew extends Component {
 									}
 
 								</p>
-								<p className="mt20"> <span className="font-16  flex1" style={item.question.question_type === 1?{"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}:item.question.question_type === 2? {"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1120px"}: {"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{item.question.question_title}</span></p>
+								<p className="mt20"> <span className="font-16  flex1" style={{"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{item.question.question_title}</span></p>
 								{/*<pre className="mt20 mb20 font-16 break_word flex1">{item.question.question_title}</pre>*/}
 								{item.question.question_type === 1 ?
 									(<RadioGroup defaultChecked={false} disabled>
@@ -2500,7 +2500,7 @@ class PollNew extends Component {
 													{/*<pre className={"break_word flex1 fl"}*/}
 													{/*		 style={{"text-align": "left"}}>{items.answer_text}</pre>*/}
 													{/*<span className={"break_word flex1"}><pre className={"break_word flex1"}>{items.answer_text}</pre> </span>*/}
-													<span className={" flex1 "} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}} >{items.answer_text}</span>
+													<span className={" flex1 "} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}} >{items.answer_text}</span>
 
 												</div>
 											)
@@ -2512,7 +2512,7 @@ class PollNew extends Component {
 												return (
 													<div className="mt10 mt20 mb20 " style={{"clear": "both"}}>
 														<Checkbox value={i} className={"fl"} style={{"text-align": "left"}}></Checkbox>
-														<span className={" flex1"} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{items.answer_text}</span>
+														<span className={" flex1"} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1120px"}}>{items.answer_text}</span>
 
 														{/*<span*/}
 														{/*	className={"break_word flex1 fl"} style={{"text-align": "left"}}><pre*/}

From 66dea92f25754de52901a0950a1cc32f130ffacd 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 23:09:53 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/poll/PollNew.js | 12 +++---
 .../TraineetraininginformationModal.js        | 43 +++++++++----------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 3f7a4a7b6..fa2ed08b4 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -779,13 +779,13 @@ class PollNew extends Component {
 			}
 
 		}
-		if (maxtie < 2) {
+		if (maxtie < 3) {
 			if (object.question.question_type === 1) {
-				this.props.showNotification(`选项不能少于2个!`);
+				this.props.showNotification(`选项不能少于3个!`);
 
 				return
 			} else if (object.question.question_type === 2) {
-				this.props.showNotification(`选项不能少于2个!`);
+				this.props.showNotification(`选项不能少于3个!`);
 
 				return
 			}
@@ -1259,12 +1259,12 @@ class PollNew extends Component {
 			}
 
 		}
-		if (maxtie < 2) {
+		if (maxtie < 3) {
 			if (object.question.question_type === 1) {
-				this.props.showNotification('选项不能少于2个!');
+				this.props.showNotification('选项不能少于3个!');
 				return
 			} else if (object.question.question_type === 2) {
-				this.props.showNotification('选项不能少于2个!');
+				this.props.showNotification('选项不能少于3个!');
 				return
 			}
 
diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
index 7d34eb9a1..10db61e1b 100644
--- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
+++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
@@ -36,7 +36,6 @@ class TraineetraininginformationModal extends Component {
             props: this.props,
             userids: this.props.userids,
             game_list:this.props.game_list,
-            boolgalist:this.props.boolgalist,
             experience:this.props.experience,
 
         })
@@ -52,26 +51,26 @@ class TraineetraininginformationModal extends Component {
         // this.seacthdata();
 
     }
-  componentWillReceiveProps(nextProps) {
-    // console.log("46");
-    // console.log(nextProps);
-    // console.log(this.props);
-    if (nextProps.boolgalist != this.props.boolgalist) {
-      // console.log("50");
-      // console.log(nextProps.user);
-      if (nextProps.boolgalist !== undefined) {
-        // console.log("53");
-        // console.log(nextProps.user);
-        this.setState({
-          boolgalist: nextProps.boolgalist,
-        })
-      }
-
-
-    }
-
-
-  }
+  // componentWillReceiveProps(nextProps) {
+  //   // console.log("46");
+  //   // console.log(nextProps);
+  //   // console.log(this.props);
+  //   if (nextProps.boolgalist != this.props.boolgalist) {
+  //     // console.log("50");
+  //     // console.log(nextProps.user);
+  //     if (nextProps.boolgalist !== undefined) {
+  //       // console.log("53");
+  //       // console.log(nextProps.user);
+  //       this.setState({
+  //         boolgalist: nextProps.boolgalist,
+  //       })
+  //     }
+  //
+  //
+  //   }
+  //
+  //
+  // }
   LimitNumber=(txt)=> {
     var str = txt;
     if(str.length>25){
@@ -81,7 +80,7 @@ class TraineetraininginformationModal extends Component {
   }
     render() {
       var columns;
-      if(this.state.boolgalist&&this.state.boolgalist === true) {
+      if(this.props.boolgalist&&this.props.boolgalist === true) {
         columns = [
           {
             title: '关卡',