From f2f983951dc16e8339576ef64696ef2231f4ac57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 24 Feb 2020 13:52:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E8=AE=AD=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=92=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=AD=A6=E4=B9=A0=E7=BB=9F=E8=AE=A1issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/poll/PollDetailTabForthRules.js     | 2 +-
 .../modules/courses/shixunHomework/Trainingjobsetting.js    | 3 ++-
 public/react/src/modules/paths/statics/DisplayTableData.js  | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index f8f7b2fe2..26c641248 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/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
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 227d3f63b..405291691 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/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}
diff --git a/public/react/src/modules/paths/statics/DisplayTableData.js b/public/react/src/modules/paths/statics/DisplayTableData.js
index f59dd719d..e25e401e1 100644
--- a/public/react/src/modules/paths/statics/DisplayTableData.js
+++ b/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) : ''}
     />