From 30f6c31896cb748dbad10770a008505c124a35f1 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 26 Jun 2019 18:14:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?index.html=E6=9C=89=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/TPMIndexHOC.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 10e4e4641..9a1de2846 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -33,8 +33,10 @@ if (!window['indexHOCLoaded']) {
   $('head').append($('<link rel="stylesheet" type="text/css" />')
       .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440977`));
 
-    $('head').append($('<link rel="stylesheet" type="text/css" />')
-        .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`));
+  // index.html有加载
+    // $('head').append($('<link rel="stylesheet" type="text/css" />')
+    //     .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`));
+
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //       .attr('href', `${_url_origin}/stylesheets/educoder/css_min_all.css?1525440977`));

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 2/6] =?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 3/6] =?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: '关卡',

From 6d927716e8493452696cb1af70203ee1eb80a436 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 27 Jun 2019 09:50:10 +0800
Subject: [PATCH 4/6] css

---
 .../src/modules/courses/boards/BoardsNew.js   | 14 +++++-
 .../courses/busyWork/CommonWorkSetting.js     | 46 +++++++++++--------
 .../react/src/modules/courses/css/Courses.css |  8 ++++
 .../modules/tpm/challengesnew/TPMMDEditor.js  |  4 +-
 4 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index 718b6de42..303d683ce 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -78,6 +78,7 @@ class BoardsNew extends Component{
             if (data) {
               this.editTopic = data;
               this.props.form.setFieldsValue({
+                sticky: !!data.sticky,
                 content: data.content,
                 subject: data.subject,
                 select_board_id: data.board_id // TODO 没返回给前端
@@ -309,6 +310,14 @@ class BoardsNew extends Component{
                   label="标题"
                   className="topicTitle "
                 >
+                  {getFieldDecorator('sticky', {
+                    valuePropName: 'checked',
+                  })(
+                    <Checkbox style={{ right: '0px',
+                      top: '-50px',
+                      position: 'absolute'
+                    }}>置顶</Checkbox>
+                  )}
                   {getFieldDecorator('subject', {
                     rules: [{
                       required: true, message: '请输入标题',
@@ -347,7 +356,7 @@ class BoardsNew extends Component{
                   )}
                 </Form.Item>
 
-                { isAdmin && <Form.Item
+                {/* { isAdmin && <Form.Item
                   label=""
                   style={{ display: 'inline-block', marginLeft: "14px" }}
                 >
@@ -355,7 +364,7 @@ class BoardsNew extends Component{
                   })(
                     <Checkbox>置顶</Checkbox>
                   )}
-                </Form.Item> }
+                </Form.Item> } */}
               </div>
 
               <style>{`
@@ -380,6 +389,7 @@ class BoardsNew extends Component{
 
               <Form.Item
                 label="内容"
+                className="mdInForm"
               >
               {getFieldDecorator('content', {
                 rules: [{
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index ca5668961..177d3929d 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -1028,9 +1028,11 @@ class CommonWorkSetting extends Component{
             <React.Fragment>
             <div className={"h20 mb30 ml30"}>
               <span>发布时间：</span>
-              <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}>
+              {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}>
+              </Tooltip> */}
+
+              <ConditionToolTip condition={moment(this.state.init_publish_time) < moment()} title={"时间已过，不能再修改"}>
               <span>
-                  <ConditionToolTip condition={moment(this.state.init_publish_time) < moment()} title={"时间已过，不能再修改"}>
 
                     <DatePicker
                       dropdownClassName="hideDisable"
@@ -1051,17 +1053,18 @@ class CommonWorkSetting extends Component{
                       //     return publish_time && publish_time < moment().add(-1, 'days'); } 
                       //   }
                     />
-                  </ConditionToolTip>
               </span>
-              </Tooltip>
+              </ConditionToolTip>
+
               <span className={"font-14 color-grey-9 ml10"}>（学生收到作业的时间）</span>
             </div>
 
             <div className={"h20 mb30 ml30"}>
               <span>截止时间：</span>
-              <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}>
-              <span>
+              {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}>
+              </Tooltip> */}
               <ConditionToolTip condition={moment(this.state.init_end_time) < moment()} title={"时间已过，不能再修改"}>
+              <span>
                 <DatePicker
                   dropdownClassName="hideDisable"
                   showTime={{ format: 'HH:mm' }}
@@ -1087,9 +1090,9 @@ class CommonWorkSetting extends Component{
                   //     return end_time.valueOf() < moment(publish_time, dateFormat).valueOf(); } 
                   //   }
                 />
-              </ConditionToolTip>
               </span>
-              </Tooltip>
+              </ConditionToolTip>
+
               <span className={"font-14 color-grey-9 ml10"}>（学生“按时”提交作品的时间截点）</span>
             </div>
 
@@ -1133,6 +1136,7 @@ class CommonWorkSetting extends Component{
                 <div className={" mb10 ml30"}>
                   <span>结束时间：</span>
                   <ConditionToolTip condition={moment(init_late_time) < moment()} title={"时间已过，不能再修改"}>
+                  <span>
                   <DatePicker
                       showToday={false}
                     dropdownClassName="hideDisable"
@@ -1153,6 +1157,7 @@ class CommonWorkSetting extends Component{
                     //     return late_time < moment(end_time, dateFormat).add(-1, 'days'); } 
                     //   }
                   />
+                  </span>
                   </ConditionToolTip>
                   <span className={"font-14 color-grey-9 ml10"}>（学生“延时”提交作品的时间截点）</span>
                   {<div className={"latetimetype color-red "}>{latetimetype}</div>}
@@ -1178,8 +1183,8 @@ class CommonWorkSetting extends Component{
             <div className={"h20 mb30 ml60"}>
               <span>开启时间：</span>
               <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
+              <ConditionToolTip condition={moment(init_evaluation_start) < moment()} title={"时间已过，不能再修改"}>
               <span>
-                  <ConditionToolTip condition={moment(init_evaluation_start) < moment()} title={"时间已过，不能再修改"}>
                   <DatePicker
                     dropdownClassName="hideDisable"
                     showTime={{ format: 'HH:mm' }}
@@ -1200,16 +1205,17 @@ class CommonWorkSetting extends Component{
                     //     return evaluation_start.valueOf() < moment(end_time, dateFormat).valueOf(); } 
                     //   }
                   />
-                  </ConditionToolTip>
               </span>
+              </ConditionToolTip>
+
               </Tooltip>
               <span className={"font-14 color-grey-9 ml10"}>（匿评开始时间之前提交作品的学生，参与匿评）</span>
             </div>
             <div className={"h20 mb30 ml60"}>
               <span>结束时间：</span>
               <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
+              <ConditionToolTip condition={moment(init_evaluation_end) < moment()} title={"时间已过，不能再修改"}>
               <span>
-                  <ConditionToolTip condition={moment(init_evaluation_end) < moment()} title={"时间已过，不能再修改"}>
                   <DatePicker
                     dropdownClassName="hideDisable"
                     showTime={{ format: 'HH:mm' }}
@@ -1230,15 +1236,18 @@ class CommonWorkSetting extends Component{
                     //     return evaluation_end.valueOf() < moment(evaluation_start, dateFormat).valueOf(); } 
                     //   }
                   />
-                  </ConditionToolTip>
-                  <span className={"font-14 color-grey-9 ml10"}>（学生匿评TA人作品的时间截点）</span>
 
               </span>
+              </ConditionToolTip>
+              <span className={"font-14 color-grey-9 ml10"}>（学生匿评TA人作品的时间截点）</span>
+
+
               </Tooltip>
               <span className={"font-14 color-grey-9 ml10"}></span>
 
             </div>
-            {<div className={" anonymous_comment_time_tip color-red ml60"} style={{marginTop: '-6px'}}>{anonymous_comment_time_tip}</div>}
+            {/* marginTop: '-6px' */}
+            {<div className={" anonymous_comment_time_tip color-red ml60"} style={{}}>{anonymous_comment_time_tip}</div>}
 
             {/* 匿评数量 */}
             <div className={"h20 mb30 ml60"}>
@@ -1301,9 +1310,10 @@ class CommonWorkSetting extends Component{
             {/* 启用匿评申述 结束时间： */}                  
             <div className={"h20 mb30 ml60"}>
               <span>结束时间：</span>
-              <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
+              {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
+              </Tooltip> */}
+              <ConditionToolTip condition={moment(init_appeal_time) < moment()} title={"时间已过，不能再修改"}>
               <span>
-                  <ConditionToolTip condition={moment(init_appeal_time) < moment()} title={"时间已过，不能再修改"}>
                   <DatePicker
                     dropdownClassName="hideDisable"
                     showTime={{ format: 'HH:mm' }}
@@ -1318,9 +1328,9 @@ class CommonWorkSetting extends Component{
                     onChange={this.appeal_time_change}
                     disabled={ (anonymous_appeal && !noAuth ? false : true) || moment(init_appeal_time) < moment()}
                   />
-                  </ConditionToolTip>
               </span>
-              </Tooltip>
+              </ConditionToolTip>
+              
 
               <span className={"font-14 color-grey-9 ml10"}>（学生提交匿评申诉的时间截点）</span>
             </div>
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 3579f983b..173ff6b60 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -945,11 +945,19 @@ a.white-btn.use_scope-btn:hover{
     font-size: 12px !important;
 }
 /* md编辑器在form中时，使用这个样式，可以把错误信息绝对定位 */
+/* 去掉form下边距 */
+.mdInForm {
+    margin-bottom: 0px;
+}
 .mdInForm .has-error .ant-form-explain {
     position: absolute;
     margin-top: -2px;
     margin-left: -7px;
 }
+.courseForm .ant-select-selection--single, .courseForm .ant-select-selection__rendered{
+    height: 40px;
+    line-height: 40px;
+}
 
 
 /*新建课堂*/
diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
index e86923cbc..e70454056 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -302,8 +302,8 @@ export default class TPMMDEditor extends Component {
                     </div>
                 </div>
                 <div className={"fr rememberTip"}>
-                    {noStorage == true ? '' : <p id={`e_tip_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>}
-                    {noStorage == true ? '' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>}
+                    {noStorage == true ? '　' : <p id={`e_tip_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>}
+                    {noStorage == true ? '　' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>}
                 </div>
             </React.Fragment>
         )

From c65440c4e7c1dc211ed24a534f96c127f16ef221 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 27 Jun 2019 09:52:42 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81=E8=AF=BE?=
 =?UTF-8?q?=E5=A0=82=E4=B8=8B=E7=BB=9F=E4=B8=80=E7=9A=84form=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=89=8D=E7=BC=80=20courseForm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/css/Courses.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 173ff6b60..26501fe99 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -946,7 +946,7 @@ a.white-btn.use_scope-btn:hover{
 }
 /* md编辑器在form中时，使用这个样式，可以把错误信息绝对定位 */
 /* 去掉form下边距 */
-.mdInForm {
+.mdInForm.ant-form-item {
     margin-bottom: 0px;
 }
 .mdInForm .has-error .ant-form-explain {
@@ -954,6 +954,7 @@ a.white-btn.use_scope-btn:hover{
     margin-top: -2px;
     margin-left: -7px;
 }
+/* ！！！课堂下统一的form样式前缀 courseForm */
 .courseForm .ant-select-selection--single, .courseForm .ant-select-selection__rendered{
     height: 40px;
     line-height: 40px;

From 736857f38735d2c0dd4e4d8c687fee2aa1473316 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 27 Jun 2019 09:59:25 +0800
Subject: [PATCH 6/6] bug

---
 public/react/src/AppConfig.js                 |  4 +-
 .../courses/common/button/CheckAllGroup.js    | 13 ++-
 .../courses/poll/PollDetailTabForth.js        | 84 ++++++++++---------
 .../courses/poll/PollDetailTabForthRules.js   | 64 +++++++-------
 .../courses/poll/PollDetailTabThird.js        |  4 +-
 .../src/modules/courses/poll/PollInfo.js      | 28 +++++--
 .../src/modules/courses/poll/PollListItem.js  |  4 +
 7 files changed, 121 insertions(+), 80 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 8b7eb02d6..a164828ef 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -30,8 +30,8 @@ export function initAxiosInterceptors(props) {
     var proxy = "http://localhost:3000"
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
-        proxy = "https://testeduplus2.educoder.net"
-        //proxy="http://47.96.87.25:48080"
+        //proxy = "https://testeduplus2.educoder.net"
+        proxy="http://47.96.87.25:48080"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
diff --git a/public/react/src/modules/courses/common/button/CheckAllGroup.js b/public/react/src/modules/courses/common/button/CheckAllGroup.js
index b8a548447..b19b684f7 100644
--- a/public/react/src/modules/courses/common/button/CheckAllGroup.js
+++ b/public/react/src/modules/courses/common/button/CheckAllGroup.js
@@ -41,13 +41,20 @@ class CheckAllGroup extends Component{
     const { checkAll, checkedValues } = this.state;
     return (
       <li className="clearfix">
+        <style>{`
+        .groupList .ant-checkbox-group-item{
+          margin-bottom:5px;
+        }
+        `}</style>
         <span className="fl mr10 color-grey-8">{label}</span>
         <span className="fl mr25">
           <a href="javascript:void(0);" id="comment_no_limit" className={`pl10 pr10 ${checkAll ? 'check_on' : ''}`} onClick={this.onCheckAll}>不限</a>
         </span>
-        {
-          options.length > 1 && <CheckboxGroup options={options} onChange={this.onChange} value={checkedValues} style={checkboxGroupStyle}/>
-        }
+        <div className="fl groupList" style={{maxWidth:"990px"}}>
+          {
+            options.length > 1 && <CheckboxGroup options={options} onChange={this.onChange} value={checkedValues} style={checkboxGroupStyle}/>
+          }
+        </div>
       </li>
     )
   }
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForth.js b/public/react/src/modules/courses/poll/PollDetailTabForth.js
index 01366c2f9..3dff2bc87 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForth.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForth.js
@@ -1,7 +1,7 @@
 import React,{ Component } from "react";
 import {Form,Checkbox,DatePicker,Button,Input,Select,Tooltip} from "antd";
 
-import { handleDateString } from 'educoder';
+import { handleDateString,ConditionToolTip } from 'educoder';
 import PollDetailTabForthRules from './PollDetailTabForthRules'
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 
@@ -585,48 +585,56 @@ class PollDetailTabForth extends Component{
 										<div>
 											<div className="clearfix mb5">
 												<span className="font-16 mr15 fl mt6">发布时间：</span>
-												<div className="fl">
-													<DatePicker
-														showToday={false}
-														dropdownClassName="hideDisable"
-														showTime={{ format: 'HH:mm' }}
-														placeholder="请选择发布时间"
-														locale={locale}
-														className={unit_p_tip && unit_p_tip != "" ?"noticeTip winput-240-40":"winput-240-40" }
-														style={{"height":"42px"}}
-														format="YYYY-MM-DD HH:mm"
-														disabledTime={disabledDateTime}
-														onChange={this.onChangeTimepublish}
-														value={publish_time && moment(publish_time,dataformat)}
-														disabled={un_change_unified == true ? true : !flagPageEdit }
-													></DatePicker>
-													<p className="color-red lineh-25 clearfix" style={{height:"25px"}}>
-														{
-															unit_p_tip && unit_p_tip != "" ? <span className="fl">{ unit_p_tip }</span>:""
-														}
-													</p>
-												</div>
+													<div className="fl">
+														<Tooltip placement="bottom" title={un_change_unified ? "发布时间已过，不能再修改":""}>
+															<span>
+																<DatePicker
+																	showToday={false}
+																	dropdownClassName="hideDisable"
+																	showTime={{ format: 'HH:mm' }}
+																	placeholder="请选择发布时间"
+																	locale={locale}
+																	className={unit_p_tip && unit_p_tip != "" ?"noticeTip winput-240-40":"winput-240-40" }
+																	style={{"height":"42px"}}
+																	format="YYYY-MM-DD HH:mm"
+																	disabledTime={disabledDateTime}
+																	onChange={this.onChangeTimepublish}
+																	value={publish_time && moment(publish_time,dataformat)}
+																	disabled={un_change_unified == true ? true : !flagPageEdit }
+																></DatePicker>
+															</span>
+														</Tooltip>
+														<p className="color-red lineh-25 clearfix" style={{height:"25px"}}>
+															{
+																unit_p_tip && unit_p_tip != "" ? <span className="fl">{ unit_p_tip }</span>:""
+															}
+														</p>
+													</div>
 												<span className="color-grey-c ml20 fl mt10 font-14">（学生收到问卷的时间）</span>
 											</div>
 											<div className="clearfix">
 												<span className="mr15 fl mt10 font-16">截止时间：</span>
 												<div className="fl">
-													<DatePicker
-														showToday={false}
-														dropdownClassName="hideDisable"
-														showTime={{ format: 'HH:mm' }}
-														locale={locale}
-														placeholder="请选择截止时间"
-														style={{"height":"42px"}}
-														className={unit_e_tip && unit_e_tip != "" ? "noticeTip winput-240-40 mr20":"winput-240-40 mr20" }
-														width={"240px"}
-														format="YYYY-MM-DD HH:mm"
-														disabledTime={disabledDateTime}
-														onChange={this.onChangeTimeEnd}
-														value={ end_time && moment(end_time,dataformat) }
-														disabled={un_change_end == true ? true : !flagPageEdit }
-													>
-													</DatePicker>
+													<Tooltip placement="bottom" title={un_change_end ? "截止时间已过，不能再修改":""}>
+														<span>
+															<DatePicker
+																showToday={false}
+																dropdownClassName="hideDisable"
+																showTime={{ format: 'HH:mm' }}
+																locale={locale}
+																placeholder="请选择截止时间"
+																style={{"height":"42px"}}
+																className={unit_e_tip && unit_e_tip != "" ? "noticeTip winput-240-40 mr20":"winput-240-40 mr20" }
+																width={"240px"}
+																format="YYYY-MM-DD HH:mm"
+																disabledTime={disabledDateTime}
+																onChange={this.onChangeTimeEnd}
+																value={ end_time && moment(end_time,dataformat) }
+																disabled={un_change_end == true ? true : !flagPageEdit }
+															>
+															</DatePicker>
+														</span>
+													</Tooltip>
 													<p className="color-red lineh-25 clearfix" style={{height:"25px"}}>
 														{
 															unit_e_tip && unit_e_tip != "" ? <span className="fl">{ unit_e_tip }</span>:""
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index 4193cdc62..2f3621844 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -390,20 +390,24 @@ class PollDetailTabForthRules extends Component{
                 </div>
               </div>
               <div className="fl pr20 with25">
-                <DatePicker
-                  showToday={false}
-                  dropdownClassName="hideDisable"
-                  placeholder="请选择发布时间"
-                  locale={locale}
-                  className={rule.publish_flag && rule.publish_flag!=""?"noticeTip winput-240-40":"winput-240-40"}
-                  value={rule.publish_time && moment(rule.publish_time,dataformat)}
-                  onChange={(e, date)=>this.changeRulePublishTime(e, date,r)}
-                  showTime={{ format: 'HH:mm' }}
-                  format="YYYY-MM-DD HH:mm"
-                  disabledTime={disabledDateTime}
-                  disabled={ rule.e_timeflag ===undefined?rule.publish_time===null?false:!flagPageEdit:rule.p_timeflag == true ? true : !flagPageEdit}
-                  style={{"height":"42px",width:'100%'}}
-                ></DatePicker>
+                <Tooltip placement="bottom" title={rule.e_timeflag ? "发布时间已过，不能再修改":""}>
+                  <span>
+                    <DatePicker
+                      showToday={false}
+                      dropdownClassName="hideDisable"
+                      placeholder="请选择发布时间"
+                      locale={locale}
+                      className={rule.publish_flag && rule.publish_flag!=""?"noticeTip winput-240-40":"winput-240-40"}
+                      value={rule.publish_time && moment(rule.publish_time,dataformat)}
+                      onChange={(e, date)=>this.changeRulePublishTime(e, date,r)}
+                      showTime={{ format: 'HH:mm' }}
+                      format="YYYY-MM-DD HH:mm"
+                      disabledTime={disabledDateTime}
+                      disabled={ rule.e_timeflag ===undefined?rule.publish_time===null?false:!flagPageEdit:rule.p_timeflag == true ? true : !flagPageEdit}
+                      style={{"height":"42px",width:'100%'}}
+                    ></DatePicker>
+                  </span>
+                </Tooltip>
                 <p className="color-orange-tip lineh-25 clearfix" style={{height:"25px"}}>
                   {
                     rule.publish_flag && rule.publish_flag!=""?<span className="fl color-red  mt10">{rule.publish_flag}</span>:""
@@ -411,20 +415,24 @@ class PollDetailTabForthRules extends Component{
                 </p>
               </div>
               <div className="fl mr20">
-                <DatePicker
-                    showToday={false}
-                dropdownClassName="hideDisable"
-                placeholder="请选择截止时间"
-                locale={locale}
-                className={rule.end_flag && rule.end_flag !="" ? "noticeTip winput-240-40":"winput-240-40" }
-                value={rule.end_time && moment(rule.end_time,dataformat)}
-                onChange={(e, date)=>this.changeRuleEndTime(e, date,r)}
-                showTime={{ format: 'HH:mm' }}
-                format="YYYY-MM-DD HH:mm"
-                disabledTime={disabledDateTime}
-                disabled={  rule.e_timeflag ===undefined?rule.publish_time===null?false:!flagPageEdit:rule.e_timeflag == true ? true : !flagPageEdit}
-                style={{"height":"42px"}}
-                ></DatePicker>
+                <Tooltip placement="bottom" title={rule.e_timeflag ? "截止时间已过，不能再修改":""}>
+                  <span>
+                    <DatePicker
+                      showToday={false}
+                      dropdownClassName="hideDisable"
+                      placeholder="请选择截止时间"
+                      locale={locale}
+                      className={rule.end_flag && rule.end_flag !="" ? "noticeTip winput-240-40":"winput-240-40" }
+                      value={rule.end_time && moment(rule.end_time,dataformat)}
+                      onChange={(e, date)=>this.changeRuleEndTime(e, date,r)}
+                      showTime={{ format: 'HH:mm' }}
+                      format="YYYY-MM-DD HH:mm"
+                      disabledTime={disabledDateTime}
+                      disabled={  rule.e_timeflag ===undefined?rule.publish_time===null?false:!flagPageEdit:rule.e_timeflag == true ? true : !flagPageEdit}
+                      style={{"height":"42px"}}
+                    ></DatePicker>
+                  </span>
+                </Tooltip>
                 <p className="color-orange-tip lineh-25 clearfix" style={{height:"25px"}}>
                   {
                     rule.end_flag && rule.end_flag!=""?<span className="fl color-red  mt10">{rule.end_flag}</span>:""
diff --git a/public/react/src/modules/courses/poll/PollDetailTabThird.js b/public/react/src/modules/courses/poll/PollDetailTabThird.js
index 5d9a01fb8..c3994c7c0 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabThird.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabThird.js
@@ -70,9 +70,9 @@ class PollDetailTabThird extends Component{
                 <div className="previewList">
                   <p className="pl30 pr30 pt30 pb15 font-16 clearfix">
                     <span className="color-blue mr8 fl">{item.question.question_number}、{map[item.question.question_type]}</span>
-                    { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:"" }
+                    { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10">选答</span> }
                     { item.question.question_type == 2 ? 
-                    <span className="color-grey-9">
+                    <span className="color-grey-9 font-14 fl mt2">
                       {
                         item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
                         "可选"+item.question.min_choices+"-"+item.question.max_choices+"项"
diff --git a/public/react/src/modules/courses/poll/PollInfo.js b/public/react/src/modules/courses/poll/PollInfo.js
index 7177cb6b9..8256e3710 100644
--- a/public/react/src/modules/courses/poll/PollInfo.js
+++ b/public/react/src/modules/courses/poll/PollInfo.js
@@ -185,9 +185,11 @@ class PollInfo extends Component{
       flag=answers.indexOf(a_id) > -1?true:false;
       answers= type == 1 ? answers[0] : answers;
     }else{
-      flag=answers==a_id?true:false;
+      flag = answers==a_id?true:false;
+    }
+    if(answers && (answers.length>0 || answers !="")){
+      this.postAnswer(q_id,answers,flag ? inputs.text : "",key);
     }
-    this.postAnswer(q_id,answers,flag ? inputs.text : "",key);
   }
 
   //提交主观题
@@ -379,13 +381,21 @@ class PollInfo extends Component{
                     <div className="previewList" id={'Anchor_'+`${key}`}>
                       <div className="pl30 pr30 mt30 mb10 clearfix">
                         <span className="color-blue fl font-16">{item.question.question_number}、{map[item.question.question_type]}</span>
-                        { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mt5">必答</span>:"" }
+                        { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10 mt5">必答</span>:<span className="mustAnswer fl ml10 mr10 mt5">选答</span> }
+                        { item.question.question_type == 2 ? 
+                          <span className="color-grey-9 font-14 fl mt2">
+                            {
+                              item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
+                              "可选"+item.question.min_choices+"-"+item.question.max_choices+"项"
+                            }
+                          </span>:""
+                        }
                       </div>
                       <li className="pl30 pr30 mb10 lineh-20">{item.question.question_title}</li>
                       {
                         //单选
                         item.question.question_type==1 && 
-                        <Radio.Group  disabled={isAdmin?true:false} className="answerList" defaultValue={item.question.poll_answer_ids[0]} name={[item.question.id,key]} onChange={this.ChangeOptionSingle}>
+                        <Radio.Group  disabled={isAdmin || (isStudent && poll && poll.user_poll_status == 1)?true:false} className="answerList" defaultValue={item.question.poll_answer_ids[0]} name={[item.question.id,key]} onChange={this.ChangeOptionSingle}>
                           {
                             item.question.answers &&  item.question.answers.map((i,k)=>{
                               return(
@@ -422,7 +432,12 @@ class PollInfo extends Component{
                       {
                         //多选
                         item.question.question_type==2 && 
-                        <Checkbox.Group  onChange={(value)=>this.ChangeOptionMuntil(value,item.question.id,key)} disabled={isAdmin?true:false} defaultValue={item.question.poll_answer_ids} className="answerList" name={key}>
+                        <Checkbox.Group  
+                        onChange={(value)=>this.ChangeOptionMuntil(value,item.question.id,key)} 
+                        disabled={isAdmin || (isStudent && poll && poll.user_poll_status == 1)?true:false} 
+                        defaultValue={item.question.poll_answer_ids} 
+                        className="answerList" 
+                        name={key}>
                           {
                             item.question.answers &&  item.question.answers.map((i,k)=>{
                               return(
@@ -466,14 +481,13 @@ class PollInfo extends Component{
                                 <React.Fragment>
                                 {
                                   j.id == item.question.id ? 
-                                  <textarea placeholder="在此填入答案" disabled={isAdmin?true:false} value={j.text && j.text} className="winput-100-130" name={key} onInput={this.blurTxt} onBlur={()=>this.commitText(key,item.question.id)}></textarea>
+                                  <textarea placeholder="在此填入答案" disabled={isAdmin || (isStudent && poll && poll.user_poll_status == 1) ? true:false} value={j.text && j.text} className="winput-100-130" name={key} onInput={this.blurTxt} onBlur={()=>this.commitText(key,item.question.id)}></textarea>
                                   : ""
                                 }
                                 </React.Fragment>
                               )
                             })
                           }
-                          
                         </div>
                       }
                       
diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js
index 3ebb6eb73..8c1d814ed 100644
--- a/public/react/src/modules/courses/poll/PollListItem.js
+++ b/public/react/src/modules/courses/poll/PollListItem.js
@@ -45,6 +45,10 @@ class PollListItem extends Component{
               item.lock_status === 0 ? <Tooltip title="私有属性,非课堂成员不能访问"><i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i></Tooltip>:""
             }
             <CoursesListType typelist={[polls_status[`${item.polls_status}`]]} typesylename={""}></CoursesListType>
+            {
+              isStudent && ((item.polls_status == 1 && (item.current_status ==0 ||item.current_status ==2)) || (item.polls_status==3 && item.current_status==2)) ? 
+              <span className="edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle">未提交</span>:""
+            }
           </p>
           <p className="color-grey-9 clearfix">
             {