Merge branches 'dev_cxt', 'dev_newysm' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

 Conflicts:

	public/react/src/modules/courses/exercise/Exercisesetting.js

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

public/react/src/modules/courses/exercise/Exercisesetting.js

@@ -608,9 +608,9 @@ class Exercisesetting extends Component{
         };
 
         // console.log(flagPageEdit===true?polls&&polls.exercise_status===1?3:2:1)
-			console.log("asdasdasda");
+			// console.log("asdasdasda");
-			 console.log(this.props);
+			//  console.log(this.props);
-			 console.log(this.props.Commonheadofthetestpaper);
+			//  console.log(this.props.Commonheadofthetestpaper);
         return(
             <div>
                 <Modals
@@ -695,7 +695,7 @@ class Exercisesetting extends Component{
 																												disabledDate={disabledDate}
                                                         onChange={this.onChangeTimeEnd}
                                                         value={end_time && moment(end_time,"YYYY-MM-DD HH:mm")}
-                                                        disabled={   end_timetype===true?this.props.isAdmin()?false:true:!flagPageEdit}
+                                                        disabled={   end_timetype===true?this.props.isAdmin()?!flagPageEdit:true:!flagPageEdit}
                                                     >
                                                     </DatePicker>
                                                     </Tooltip>

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

@@ -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 ?this.props.isAdmin()?false: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() ? true : !flagPageEdit : rule.e_timeflag == true ? 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/NewHeader.js

@@ -1214,7 +1214,7 @@ submittojoinclass=(value)=>{
 								</li>
                 {
                   this.props.Headertop && this.props.Headertop.college_identifier &&
-                  <li><a href={`${this.props.Headertop.old_url}/colleges/${this.props.Headertop.college_identifier}/statistics`}>学院统计</a></li>
+                  <li><a href={`/colleges/${this.props.Headertop.college_identifier}/statistics`}>学院统计</a></li>
                 }
                 {
                   this.props.Headertop && this.props.Headertop.laboratory_user &&

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{