From 890ca0017f689638da3e8ebb92b49624d4dd1d48 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, 3 Jul 2019 18:26:05 +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

---
 .../react/src/modules/courses/poll/PollNew.js | 171 ++++++++++--------
 .../shixunHomework/Trainingjobsetting.js      |  34 ++--
 .../react/src/modules/login/EducoderLogin.js  |   2 +-
 3 files changed, 113 insertions(+), 94 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index be6b7e5eb..0316cd8fe 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2339,95 +2339,114 @@ class PollNew extends Component {
 					</div>
 
 					{/*<Form {...formItemLayout} onSubmit={this.handleSubmit}>*/}
-					<div className="edu-back-white">
-						<div className="createPage bor-bottom-greyE">
-							<style>
-								{`
+							{
+								this.state.mysave === false ?
+							<div className="padding20-30" style={{ background: '#fff'}}>
+								<div className="displayTitle font-16">
+									<span>{this.state.polls_nametest}</span>
+
+											<a className="fr" onClick={() => { this.adddomeditit() }} style={{ lineHeight: '32px'}}>
+												<Tooltip title="编辑"><i className="iconfont icon-bianjidaibeijing font-20 color-green"></i></Tooltip>
+											</a>
+								</div>
+								<div className="displayDescription color-grey-9" dangerouslySetInnerHTML={{__html: this.state.polls_descriptiontest}}
+										 style={{whiteSpace: 'pre-wrap'}}
+								></div>
+
+							</div>
+							:""
+					}
+					{
+						this.state.mysave === true ?
+							<div className="edu-back-white">
+								<div className="createPage bor-bottom-greyE">
+									<style>
+										{`
                    .ant-form-item-label{width:180px;}
                   `}
-							</style>
+									</style>
 
-							<div>
-								<div style={{"color": "#212121", "font-size": "16px"}} className="fl"><span
-									style={{"color": "#f5222d"}}>*</span>问卷标题
-								</div>
-								{
-									this.props.match.params.news === undefined ? "" : this.props.match.params.news === "new" ?
-										(
-											this.state.mysave === false ?
-												<div className="fr">
-									<span><a onClick={() => this.adddomeditit()}><Tooltip title="编辑"><i
-										className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip></a></span>
-												</div>
-												: "")
-										:
-										<div className="fr">
+									<div>
+										<div style={{"color": "#212121", "font-size": "16px"}} className="fl"><span
+											style={{"color": "#f5222d"}}>*</span>问卷标题
+										</div>
+										{
+											this.props.match.params.news === undefined ? "" : this.props.match.params.news === "new" ?
+												(
+													this.state.mysave === false ?
+														<div className="fr">
 									<span><a onClick={() => this.adddomeditit()}><Tooltip title="编辑"><i
 										className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip></a></span>
-										</div>
-								}
+														</div>
+														: "")
+												:""
+										}
 
-							</div>
+									</div>
+
+									<Input placeholder="请输入问卷标题，最大限制60个字符" maxLength="60"
+												 style={{"margin-top": "15px", "text-align": "left"}}
+												 onInput={this.changeTopicName}
+												 readOnly={readOnlys}
+												 autoComplete="off" addonAfter={String(addonAfter)}
+												 value={this.state.polls_nametest}
+												 className="searchViewAfter"></Input>
 
-							<Input placeholder="请输入问卷标题，最大限制60个字符" maxLength="60"
-										 style={{"margin-top": "15px", "text-align": "left"}}
-										 onInput={this.changeTopicName}
-										 readOnly={readOnlys}
-										 autoComplete="off" addonAfter={String(addonAfter)}
-										 value={this.state.polls_nametest}
-										 className="searchViewAfter"></Input>
-
-						</div>
-						<div style={{
-							"padding": "20px 30px 50px",
-							"position": "relative",
-							"border-bottom": "1px solid #EDEDED",
-							"margin-bottom": " 0px"
-						}}>
-							<style>
-								{`
+								</div>
+								<div style={{
+									"padding": "20px 30px 50px",
+									"position": "relative",
+									"border-bottom": "1px solid #EDEDED",
+									"margin-bottom": " 0px"
+								}}>
+									<style>
+										{`
                    .ant-form-item-label{width:80px;}
                   `}
-							</style>
+									</style>
 
-							<div style={{"color": "#212121", "font-size": "16px"}}>问卷须知</div>
+									<div style={{"color": "#212121", "font-size": "16px"}}>问卷须知</div>
 
-							<TextArea placeholder="请输入本次问卷答题的相关说明，最大限制100个字符"
-												style={{"height": "120px", "margin-top": "15px", "text-align": "left"}}
-												maxLength="100"
-												readOnly={readOnlys}
-												onInput={this.changeTopicNametwo}
-												value={this.state.polls_descriptiontest}
-												autoComplete="off" addonAfter={"100"}></TextArea>
-							{
-								this.state.Newedit === true || this.state.mysave === true ?
-									<div>
-										<Button type="primary" onClick={this.onSaveExercise} className=" fr   "
-														style={{
-															"margin-top": "10px",
-															"height": "32px",
-															"width": " 70px",
-															"font-size": "14px",
-															"line-height": " 30px",
-														}}>保存</Button>
-										{cancellation === false ?
-											<Button onClick={this.onSaveExercisetwo} className="defalutCancelbtn  fr mr20  "
-															style={{
-																"margin-top": "10px",
-																"height": "32px",
-																"width": " 70px",
-																"font-size": "14px",
-																"line-height": " 30px"
-															}}>取消</Button>
-											: ""}
+									<TextArea placeholder="请输入本次问卷答题的相关说明，最大限制100个字符"
+														style={{"height": "120px", "margin-top": "15px", "text-align": "left"}}
+														maxLength="100"
+														readOnly={readOnlys}
+														onInput={this.changeTopicNametwo}
+														value={this.state.polls_descriptiontest}
+														autoComplete="off" addonAfter={"100"}></TextArea>
+									{
+										this.state.Newedit === true || this.state.mysave === true ?
+											<div>
+												<Button type="primary" onClick={this.onSaveExercise} className=" fr   "
+																style={{
+																	"margin-top": "10px",
+																	"height": "32px",
+																	"width": " 70px",
+																	"font-size": "14px",
+																	"line-height": " 30px",
+																}}>保存</Button>
+												{cancellation === false ?
+													<Button onClick={this.onSaveExercisetwo} className="defalutCancelbtn  fr mr20  "
+																	style={{
+																		"margin-top": "10px",
+																		"height": "32px",
+																		"width": " 70px",
+																		"font-size": "14px",
+																		"line-height": " 30px"
+																	}}>取消</Button>
+													: ""}
+
+											</div>
+											: ""
+									}
+
+								</div>
+
+							</div>:""
+					}
 
-									</div>
-									: ""
-							}
 
-						</div>
 
-					</div>
 					<p className="clearfix padding20-30 color-grey-9">
 
 
@@ -2507,7 +2526,7 @@ class PollNew extends Component {
 										{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
 											return (
 												<div className="h20 pt20" style={{"clear": "both"}}>
-													<Radio value={i} className={"fl"} style={{"text-align": "left"}}></Radio>
+													<Radio value={i} className={"fl"} style={{"text-align": "left",marginTop:"3px"}}></Radio>
 													{/*<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>*/}
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 11017259a..8837b83c3 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1715,8 +1715,8 @@ class Trainingjobsetting extends Component {
                         {/*发布设置*/}
                         <div className="stud-class-set bor-bottom-greyE edu-back-white">
                             <div className=" mt20 pl20">
-                                <p className=" clearfix ">
-                                    <span className="font-16 fl  "style={{"color":"#05101A"}}>发布设置 <span className="ml15 color-grey-9" style={{"font-size":"14px","text-align":"left"}}>(选中则所有分班使用相同的发布设置，否则各个分班单独设置)</span></span>
+                                <p className=" clearfix " style={{height:"41px"}}>
+                                    <span className="font-16 fl  "style={{"color":"#05101A"}}>发布设置 <span className="ml15 color-grey-9" style={{"font-size":"14px","text-align":"left"}}></span></span>
                                     {
                                         !flagPageEdit && this.props.isAdmin() === true ?
                                             <a className="fr" onClick={this.editSetting}><Tooltip title="编辑"><i
@@ -1746,7 +1746,7 @@ class Trainingjobsetting extends Component {
                                     unifiedsetting === undefined ? "" : unifiedsetting=== true  ?
                                         <div>
                                             <div className="clearfix mb5 ml15">
-                                                <span className="font-16 mr15 fl mt6" style={{"color":"#999999"}}>发布时间：</span>
+                                                <span className="font-16  fl mt6" style={{"color":"#999999"}}>发布时间：</span>
                                                 <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true ? "发布时间已过，则不能修改" : ""}>
                                                 <div className="fl">
                                                     <DatePicker
@@ -1768,18 +1768,18 @@ class Trainingjobsetting extends Component {
                                                         disabled={!flagPageEditstwo}
                                                         dropdownClassName="hideDisable"
                                                     />
-
-                                                    <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>
                                                 </Tooltip>
                                                 <span className="ml20 fl mt10" style={{"color":"#999999","text-align":"left","font-size":"14px"}}>(学生收到作业的时间)</span>
                                             </div>
-                                            <div className="clearfix ml15">
-                                                <span className="mr15 fl mt10 font-16" style={{"color":"#999999"}}>截止时间：</span>
+                                            <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 className="clearfix ml15 mb5">
+                                                <span className=" fl mt10 font-16" style={{"color":"#999999"}}>截止时间：</span>
                                                 <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true ? "截止时间已过，则不能修改" : ""}>
                                                 <div className="fl">
                                                     <DatePicker
@@ -1801,16 +1801,16 @@ class Trainingjobsetting extends Component {
                                                         disabled={!flagPageEditsthrees}
                                                         dropdownClassName="hideDisable"
                                                     />
-
-                                                    <p className="color-red lineh-25 clearfix" style={{height:"25px"}}>
-                                                        {
-                                                            unit_e_tip && unit_e_tip != "" ? <span className="fl">{ unit_e_tip }</span>:""
-                                                        }
-                                                    </p>
                                                 </div>
                                                 </Tooltip>
+
                                                 <span className=" ml20 fl mt10 color-grey-9" style={{"text-align":"left","font-size":"14px"}}>(学生“按时”提交作品的时间截点)</span>
                                             </div>
+                                            <p className="color-red lineh-25 clearfix" style={{height:"25px"}}>
+                                            {
+                                                unit_e_tip && unit_e_tip != "" ?   <span className="fl">{ unit_e_tip }</span> :""
+                                            }
+                                            </p>
                                         </div>
                                         :
                                         <div
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 7c6dcbe9e..10d792aa2 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -192,7 +192,7 @@ class EducoderLogin extends Component {
                     }}>
                         <div className="font-14 color-grey-9 " style={{marginTop:"15px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
                     </div>
-                    <div style={{"height":"55px"}}></div>
+                    <div style={{"height":"100px"}}></div>
                 </div>
             </div>
         )