调整问卷截止时间

public/react/src/modules/courses/poll/PollDetailTabForth.js

@@ -584,7 +584,7 @@ class PollDetailTabForth extends Component{
 											<div className="clearfix">
 												<span className="mr15 fl mt10 font-16">截止时间：</span>
 												<div className="fl">
-													<Tooltip placement="bottom" title={un_change_end ? this.props.isAdmin()?"截止时间已过，不能再修改":"":""}>
+													<Tooltip placement="bottom" title={un_change_end ? this.props.isAdmin()?"":"截止时间已过，不能再修改":""}>
 														<span>
 															<DatePicker
 																showToday={false}
@@ -599,7 +599,7 @@ class PollDetailTabForth extends Component{
 																disabledTime={disabledDateTime}
 																onChange={this.onChangeTimeEnd}
 																value={ end_time && moment(end_time,dataformat) }
-																disabled={un_change_end == true ? true : !flagPageEdit }
+																disabled={un_change_end == true ? this.props.isAdmin()?!flagPageEdit:true : !flagPageEdit }
 															>
 															</DatePicker>
 														</span>
@@ -619,6 +619,7 @@ class PollDetailTabForth extends Component{
 											{...this.state}
 											ref="pollDetailTabForthRules"
 											rules={rules}
+											type={"polls"}
 											course_group={course_group}
 											flagPageEdit={flagPageEdit}
 											rulesCheckInfo={(info)=>this.rulesCheckInfo(info)}

public/react/src/modules/courses/poll/PollDetailTabForthRules.js

@@ -461,7 +461,11 @@ class PollDetailTabForthRules extends Component{
 											format="YYYY-MM-DD HH:mm"
 											disabledTime={disabledDateTime}
 											disabledDate={disabledDate}
-											disabled={rule.e_timeflag === undefined ? rule.publish_time === null ? false : moment(rule.end_time, dataformat) <= moment() ?this.props.isAdmin()?!flagPageEdit: true : !flagPageEdit : rule.e_timeflag == true ? this.props.isAdmin()?!flagPageEdit :true : !flagPageEdit}
+											disabled={
+											  this.props.type==="polls"||this.props.type==="Exercise"?
+											  rule.e_timeflag === undefined ? rule.publish_time === null ? false : moment(rule.end_time, dataformat) <= moment() ?this.props.isAdmin()?!flagPageEdit: true : !flagPageEdit : rule.e_timeflag == true ? this.props.isAdmin()?!flagPageEdit :true : !flagPageEdit:
+                          rule.e_timeflag === undefined ? rule.publish_time === null ? false : moment(rule.end_time, dataformat) <= moment() ? true : !flagPageEdit : rule.e_timeflag == true ? true : !flagPageEdit
+                      }
 											style={{"height":"42px"}}
                     ></DatePicker>
                   </span>

public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css

@@ -140,11 +140,13 @@
 .shixunstartbutton33BD8C{
     background: #33BD8C !important;
     border: #33BD8C !important;
+    cursor: inherit !important;
 }
 
 .shixunstartbuttonFF6601{
     background: #FF6601 !important;
     border: #FF6601 !important;
+    cursor: inherit !important;
 }
 
 .shixunstartbutton666666{