调整实训作业截止时间和课程学习统计issue

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

@@ -463,7 +463,7 @@ class PollDetailTabForthRules extends Component{
 											disabledTime={disabledDateTime}
 											disabledDate={disabledDate}
 											disabled={
-                        this.props.isAdmin()===true?
+                        this.props.isAdmin()===true?this.props.type==="Shixun"?false:
 										    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:true

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -2065,7 +2065,7 @@ class Trainingjobsetting extends Component {
 				}
 				//截止时间
 				if (moment(datas.data.end_time, "YYYY-MM-DD HH:mm") <= moment()) {
-					deadline = false;
+					// deadline = false;
 				}
 				//结束时间
 				if (moment(datas.data.late_time, "YYYY-MM-DD HH:mm") <= moment()) {
@@ -2554,6 +2554,7 @@ class Trainingjobsetting extends Component {
 												}}
 												teacherdatapage={this.props.teacherdatapage}
 												rules={rules}
+												type={"Shixun"}
 												moduleName={"作业"}
 												course_group={rulest}
 												flagPageEdit={flagPageEdit}

public/react/src/modules/paths/statics/DisplayTableData.js

@@ -1,7 +1,7 @@
 /*
- * @Description: 
+ * @Description:
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2020-01-14 13:39:12
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-14 16:30:05
@@ -70,7 +70,7 @@ const DisplayTableData = (props) => {
       dataSource={datas}
       pagination={false}
       loading={loading}
-      scroll={{y: 500}}
+      // scroll={{y: 500}}
       ref={(ref)=>tableEl=ref}
       footer={total ? () => renderFooter(total) : ''}
     />