From 0ea1c78e2392a89c7621e2cea3d0ed7183c852e8 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 27 Jun 2019 09:58:45 +0800
Subject: [PATCH 1/2] tip

---
 .../react/src/modules/courses/busyWork/CommonWorkSetting.js  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index 177d3929d..3f7e5f3ad 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -1213,7 +1213,9 @@ class CommonWorkSetting extends Component{
             </div>
             <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?"发布时间已过，则不能修改":""}>
+              </Tooltip> */}
+
               <ConditionToolTip condition={moment(init_evaluation_end) < moment()} title={"时间已过，不能再修改"}>
               <span>
                   <DatePicker
@@ -1242,7 +1244,6 @@ class CommonWorkSetting extends Component{
               <span className={"font-14 color-grey-9 ml10"}>（学生匿评TA人作品的时间截点）</span>
 
 
-              </Tooltip>
               <span className={"font-14 color-grey-9 ml10"}></span>
 
             </div>

From 9c9896dd05a0091808233749a2e337459d0b1e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 27 Jun 2019 10:15:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                                   | 1 +
 .../courses/shixunHomework/TraineetraininginformationModal.js   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index bae157ef7..fee5e6df5 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -33,6 +33,7 @@ export function initAxiosInterceptors(props) {
         // proxy = "https://testeduplus2.educoder.net"
         proxy="http://47.96.87.25:48080"
 
+
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
     const requestMap = {};
diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
index a0486095e..ace1ebe7b 100644
--- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
+++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
@@ -82,7 +82,7 @@ class TraineetraininginformationModal extends Component {
       var columns;
       console.log(83);
       console.log(this.props.boolgalist);
-      if(this.props.boolgalist&&this.props.boolgalist === true) {
+      if(this.props.boolgalist&&this.props.boolgalist === false) {
         columns = [
           {
             title: '关卡',