From 19c9d2d5107ee5e5471532f77ce6e68ffb5796b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 24 Dec 2019 11:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E6=88=AA=E6=AD=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=92=8C=E5=AD=A6=E9=99=A2=E7=BB=9F=E8=AE=A1url?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/exercise/Exercisesetting.js  | 12 ++++++------
 .../modules/courses/poll/PollDetailTabForthRules.js  |  2 +-
 public/react/src/modules/tpm/NewHeader.js            |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js
index 515607e16..87d05255c 100644
--- a/public/react/src/modules/courses/exercise/Exercisesetting.js
+++ b/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(this.props);
-			 console.log(this.props.Commonheadofthetestpaper);
+			// console.log("asdasdasda");
+			//  console.log(this.props);
+			//  console.log(this.props.Commonheadofthetestpaper);
         return(
             <div>
                 <Modals
@@ -654,7 +654,7 @@ class Exercisesetting extends Component{
                                             <div className="clearfix"  id={"publishtimeid"}>
                                                 <span className="font-16 mr15 fl mt6">发布时间：</span>
                                                 <div className="fl">
-																									<Tooltip placement="bottom" title={publish_timetype===true?this.props.isAdmin()? "":"发布时间已过，不能再修改":""}>
+																									<Tooltip placement="bottom" title={publish_timetype===true?this.props.isAdmin()? "发布时间已过，不能再修改":"":""}>
                                                     <DatePicker
                                                         dropdownClassName="hideDisable"
                                                         placeholder="请选择发布时间"
@@ -667,7 +667,7 @@ class Exercisesetting extends Component{
 																												disabledDate={disabledDate}
                                                         onChange={this.onChangeTimepublish}
                                                         value={publish_time && moment(publish_time,"YYYY-MM-DD HH:mm")}
-                                                        disabled={ publish_timetype===true?this.props.isAdmin()?!flagPageEdit:true:!flagPageEdit }
+                                                        disabled={ publish_timetype===true?true:!flagPageEdit }
                                                     ></DatePicker>
 																									</Tooltip>
                                                     <p className="color-red lineh-25 clearfix" style={{height:"25px"}}>
@@ -694,7 +694,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?true:!flagPageEdit}
+                                                        disabled={   end_timetype===true?this.props.isAdmin()?!flagPageEdit:true:!flagPageEdit}
                                                     >
                                                     </DatePicker>
                                                     <p className="color-red lineh-25 clearfix" style={{height:"25px"}}>
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index 90ec27cce..72aceb87e 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -461,7 +461,7 @@ 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={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}
 											style={{"height":"42px"}}
                     ></DatePicker>
                   </span>
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 84354369c..b4d5a2c2b 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/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 &&