Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -184,7 +184,7 @@ function buildColumns(that, student_works, studentData) {
   }
   columns = columns.concat([{
     width: 88,
-    title: '提交状态',
+    title: '作品状态',
     dataIndex: 'work_status',
     key: 'work_status',
 
@@ -320,7 +320,7 @@ function buildColumns(that, student_works, studentData) {
   if (!niPingAndIsStudent) {
     columns.push({
 			width: '113px',
-      title: '最终成绩',
+      title: '当前成绩',
       key: 'work_score',
       dataIndex: 'work_score',
 			sorter: true,
@@ -362,7 +362,7 @@ function buildColumns(that, student_works, studentData) {
           {/* 0 未提交 */}
           {/*<React.Fragment>*/}
           {/*</React.Fragment>*/}
-          { isAdmin && <Tooltip placement="bottom" title={<pre>调整学生最终成绩<br/>其它历史评分将全部失效</pre>}>
+          { isAdmin && <Tooltip placement="bottom" title={<pre>调整学生当前成绩<br/>其它历史评分将全部失效</pre>}>
 						<a style={{color: "#4CACFF"}}
 							 onClick={() => that.showModulationModal(record)}
               >调分</a>

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

@@ -589,7 +589,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}
@@ -605,7 +605,8 @@ class PollDetailTabForth extends Component{
 																disabledDate={disabledDate}
 																onChange={this.onChangeTimeEnd}
 																value={ end_time && moment(end_time,dataformat) }
-																disabled={un_change_end == true ?true : !flagPageEdit }
+																// disabled={un_change_end == true ?true : !flagPageEdit }
+																disabled={un_change_end == true ? this.props.isAdmin()?!flagPageEdit:true : !flagPageEdit }
 															>
 															</DatePicker>
 														</span>

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

@@ -462,7 +462,7 @@ class PollDetailTabForthRules extends Component{
 											disabledTime={disabledDateTime}
 											disabledDate={disabledDate}
 											disabled={
-										    this.props.type==="Exercise"?
+										    this.props.type==="Exercise"||this.props.type==="polls"?
 											  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
                       }