From d97f251e02586525b49c7ad62a93121f208dc921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 10 Oct 2019 16:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/busyWork/CommonWorkDetailIndex.js |  2 +-
 .../courses/busyWork/CommonWorkSetting.js     | 20 +++++++++----------
 .../busyWork/common/WorkDetailPageHeader.js   |  2 +-
 .../courses/coursesPublic/AppraiseModal.js    |  4 ++--
 .../graduation/tasks/GraduationAcross.js      |  2 +-
 .../graduation/tasks/GraduationTaskDetail.js  |  1 +
 .../courses/poll/PollDetailTabForth.js        |  4 ++--
 .../courses/poll/PollDetailTabForthRules.js   |  4 ++--
 .../shixunHomework/ShixunHomeworkPage.js      |  4 ++--
 .../shixunHomework/Trainingjobsetting.js      |  6 +++---
 10 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index e49d4fb28..7ba231b99 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -311,7 +311,7 @@ class CommonWorkDetailIndex extends Component{
                   <Link
                         onClick={() => this.setState({moduleName: '设置'})}
                         className={`${childModuleName == '设置' ? 'active' : '' } `}
-                        style={{paddingLeft:'38px'}}
+                        style={{paddingLeft:this.props.isAdmin()?'38px':'20px'}}
                         to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
                   
 
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index 3217b7318..5d9a7dc16 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -1055,7 +1055,7 @@ class CommonWorkSetting extends Component{
               {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}>
               </Tooltip> */}
 
-              <ConditionToolTip condition={moment(this.state.init_publish_time) < this.fetchMoment} title={"时间已过，不能再修改"}>
+              <ConditionToolTip condition={moment(this.state.init_publish_time) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
               <span>
 
                     <DatePicker
@@ -1087,7 +1087,7 @@ class CommonWorkSetting extends Component{
               <span>截止时间：</span>
               {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}>
               </Tooltip> */}
-              <ConditionToolTip condition={moment(this.state.init_end_time) < this.fetchMoment} title={"时间已过，不能再修改"}>
+              <ConditionToolTip condition={moment(this.state.init_end_time) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
               <span>
                 <DatePicker
                   dropdownClassName="hideDisable"
@@ -1210,8 +1210,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) < this.fetchMoment} title={"时间已过，不能再修改"}>
+              <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
+              <ConditionToolTip condition={moment(init_evaluation_start) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
               <span>
                   <DatePicker
                     dropdownClassName="hideDisable"
@@ -1244,7 +1244,7 @@ class CommonWorkSetting extends Component{
               {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
               </Tooltip> */}
 
-              <ConditionToolTip condition={moment(init_evaluation_end) < this.fetchMoment} title={"时间已过，不能再修改"}>
+              <ConditionToolTip condition={moment(init_evaluation_end) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
               <span>
                   <DatePicker
                     dropdownClassName="hideDisable"
@@ -1283,7 +1283,7 @@ 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?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
               <span>
                 <Input type="number" className="mr10" style={{width:"100px" }} value={evaluation_num}  onInput={this.evaluation_num_change}
                   disabled={anonymous_comment && !noAuth? false : true} min={0} max={100}
@@ -1296,7 +1296,7 @@ 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?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
               <span>
                 <Input type="number" className="mr10" style={{width:"100px" }} value={absence_penalty}  onInput={this.absence_penalty_change}
                   disabled={ anonymous_comment && !noAuth ? false : true} min={0} max={100}
@@ -1343,7 +1343,7 @@ class CommonWorkSetting extends Component{
               <span>结束时间：</span>
               {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
               </Tooltip> */}
-              <ConditionToolTip condition={moment(init_appeal_time) < this.fetchMoment} title={"时间已过，不能再修改"}>
+              <ConditionToolTip condition={moment(init_appeal_time) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
               <span>
                   <DatePicker
                     dropdownClassName="hideDisable"
@@ -1371,7 +1371,7 @@ 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?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
               <span>
                 <Input type="number" className="mr10" style={{width:"100px" }} value={appeal_penalty}  onInput={this.appeal_penalty_change}
                   disabled={ anonymous_appeal && !noAuth ? false : true} min={0} max={100}
@@ -1393,7 +1393,7 @@ class CommonWorkSetting extends Component{
             </div>
             
             <div className={"mb30 ml60"}>
-              <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
+              <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
               <RadioGroup onChange={this.ta_mode_change} value={ta_mode}>
                 <Radio style={radioStyle} value={1} disabled={noAuth}>
                   普通模式<span className={"font-14 color-grey-9 ml10"}>（选中，则取各助教最终评分的平均分）</span>
diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
index 89c9df772..82f1f8d2e 100644
--- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
+++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
@@ -147,7 +147,7 @@ class WorkDetailPageHeader extends Component{
 
                   <Link
                         className={`${childModuleName == '设置' ? 'active' : '' } `}
-                        style={{paddingLeft:'38px'}}
+                        style={{paddingLeft:this.props.isAdmin()?'38px':'20px'}}
                         to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
                   
 
diff --git a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js
index 120e57b2b..a943e9655 100644
--- a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js
@@ -153,7 +153,7 @@ class AppraiseModal extends Component{
 						</style>
 						<div className="clearfix">
 							<p className={"font mt10 mb10 ml10"}>
-								可见:(学生可查看老师的评阅内容）
+								可见(学生可查看老师的评阅内容）
 							</p>
 							{/*<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>*/}
 								{/*<Radio value={0} style={radioStyle} className={"newfont"}>可见  (学生查看老师的评阅内容）</Radio>*/}
@@ -167,7 +167,7 @@ class AppraiseModal extends Component{
 							/>
 
 							<p className={"font mt10 mb10 ml10"}>
-								不可见:(仅对课堂老师可见）
+								不可见(仅对课堂老师可见）
 							</p>
 							<WordNumberTextarea
 								placeholder={"请填写评阅内容"}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js b/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
index b672d1b81..b3fd37878 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
@@ -395,7 +395,7 @@ class GraduationAcross extends Component{
 						`
 					}
 				</style>:""}
-				<div id="closeIcon" onClick={()=>this.props.modalCloss()}>
+				<div id="closeIcon" onClick={this.props.modalCloss}>
 					<i className="iconfont icon-shanchudiao"></i>
 				</div>
         <style>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
index a219fe409..b9830d1fc 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
@@ -93,6 +93,7 @@ class GraduationTaskDetail extends Component{
     this.setState({
       acrossVisible:false
     })
+		this.getdatas()
   }
 
 
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForth.js b/public/react/src/modules/courses/poll/PollDetailTabForth.js
index e06e30223..98598a445 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForth.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForth.js
@@ -550,7 +550,7 @@ class PollDetailTabForth extends Component{
 											<div className="clearfix mb5">
 												<span className="font-16 mr15 fl mt6">发布时间：</span>
 													<div className="fl">
-														<Tooltip placement="bottom" title={un_change_unified ? "发布时间已过，不能再修改":""}>
+														<Tooltip placement="bottom" title={un_change_unified ?this.props.isAdmin()? "发布时间已过，不能再修改":"":""}>
 															<span>
 																<DatePicker
 																	showToday={false}
@@ -579,7 +579,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 ? "截止时间已过，不能再修改":""}>
+													<Tooltip placement="bottom" title={un_change_end ? this.props.isAdmin()?"截止时间已过，不能再修改":"":""}>
 														<span>
 															<DatePicker
 																showToday={false}
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index 81fa3dc47..200d479ea 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -413,7 +413,7 @@ class PollDetailTabForthRules extends Component{
                 </div>
               </div>
               <div className="fl pr20 with25 yskspickersy">
-                <Tooltip placement="bottom" title={rule.e_timeflag ? "发布时间已过，不能再修改":""}>
+                <Tooltip placement="bottom" title={rule.e_timeflag ? this.props.isAdmin()?"发布时间已过，不能再修改":"":""}>
                   <span>
                     <DatePicker
                       showToday={false}
@@ -439,7 +439,7 @@ class PollDetailTabForthRules extends Component{
                 </p>
               </div>
               <div className="fl mr20 yskspickersy">
-                <Tooltip placement="bottom" title={rule.e_timeflag ? "截止时间已过，不能再修改":""}>
+                <Tooltip placement="bottom" title={rule.e_timeflag ? this.props.isAdmin()?"截止时间已过，不能再修改":"":""}>
                   <span>
                     <DatePicker
                       showToday={false}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 3c4449b9f..9b0353b9e 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -236,7 +236,7 @@ class ShixunHomeworkPage extends Component {
 											onClick={(e) => this.ChangeTab(2)}>
 											代码查重</a> : ""}
 								{parseInt(tab) === 3?
-									<style>{
+									<style>{this.props.isAdmin()?
 										`
                                     .poll_list a.active:after {
                                         content: '';
@@ -247,7 +247,7 @@ class ShixunHomeworkPage extends Component {
                                         background-color: #4CACFF;
                                         position: absolute;
                                         }
-                                    `
+                                    `:""
 									}</style>
 									:""}
 
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index d5481a391..142d1e074 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -2078,7 +2078,7 @@ class Trainingjobsetting extends Component {
         // console.log(this.props.isAdmin())
         // console.log(this.state.code_review===false)
         // console.log("引入的分值");
-        // console.log(this.state.work_efficiencys);
+         console.log(this.state.work_efficiencys);
 
 
 
@@ -2186,7 +2186,7 @@ class Trainingjobsetting extends Component {
                                         <div>
                                             <div className="clearfix mb5 ml15">
                                                 <span className="font-16  fl mt3" style={{color:"#999999"}}>发布时间：</span>
-                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true && publish_timebool === true?"发布时间已过，则不能修改": ""}>
+                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true && publish_timebool === true?this.props.isAdmin()?"发布时间已过，则不能修改":"": ""}>
                                                 <div className="fl yskspickers">
                                                     <DatePicker
                                                         showToday={false}
@@ -2219,7 +2219,7 @@ class Trainingjobsetting extends Component {
                                             </p>
                                             <div className="clearfix ml15 mb5">
                                                 <span className=" fl mt3 font-16" style={{color:"#999999"}}>截止时间：</span>
-                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true&&end_timebool===true?"截止时间已过，则不能修改": ""}>
+                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true&&end_timebool===true?this.props.isAdmin()?"截止时间已过，则不能修改":"": ""}>
                                                 <div className="fl yskspickers">
                                                     <DatePicker
                                                         showToday={false}