From 6ab4cd89e7ac1f233a02c1f023c9cec40cabdafd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 11 Dec 2019 16:26:34 +0800
Subject: [PATCH 1/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

---
 .../modules/tpm/TPMsettings/Configuration.js  | 34 +++++++++++++++++--
 .../tpm/TPMsettings/Shixuninformation.js      |  1 +
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMsettings/Configuration.js b/public/react/src/modules/tpm/TPMsettings/Configuration.js
index a0ac8146e..187955c22 100644
--- a/public/react/src/modules/tpm/TPMsettings/Configuration.js
+++ b/public/react/src/modules/tpm/TPMsettings/Configuration.js
@@ -16,6 +16,7 @@ import axios from 'axios';
 import './css/TPMsettings.css';
 
 import { getImageUrl, toPath, getUrl ,appendFileSizeToUploadFileAll, getUploadActionUrl} from 'educoder';
+import {handleDateStrings} from "./oldTPMsettings";
 
 let origin = getUrl();
 
@@ -43,6 +44,11 @@ export default class Shixuninformation extends Component {
     }
   }
 
+  onChangeTimePicker =(value, dateString)=> {
+    this.setState({
+      opening_time: dateString=== ""?"":moment(handleDateStrings(dateString))
+    })
+  }
 
 
   render() {
@@ -116,10 +122,34 @@ export default class Shixuninformation extends Component {
                 </div>
 
               </div>
+
               <span className={this.props.scope_partmenttype===true?"color-orange ml20 fl":"color-orange ml20 fl none"} id="public_unit_notice">
-																			<i className="fa fa-exclamation-circle mr3"></i>
-																	请选择需要公开的单位
+                        <i className="fa fa-exclamation-circle mr3"></i>
+                    请选择需要公开的单位
 						 </span>
+
+
+              <div className="clearfix mt20 ml30">
+                <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>开启时间:</span>
+                <span className="fl mt5">
+														<DatePicker
+                              showToday={false}
+                              showTime={{ format: 'HH:mm' }}
+                              format="YYYY-MM-DD HH:mm"
+                              width={178}
+                              locale={locale}
+                              disabledTime={disabledDateTime}
+                              disabledDate={disabledDate}
+                              placeholder="请选择开启时间"
+                              value={this.props.shixun.opening_time===null||this.props.shixun.opening_time===""?"":moment(this.props.shixun.opening_time, dateFormat)}
+                              onChange={this.onChangeTimePicker}
+                              dropdownClassName="hideDisable"
+                            />
+															<label style={{top:'6px'}} className="color-grey-9 ml10" >（为空，则学员在实训发布后，能随时开启实训挑战；否则，学员在开启时间后，才能开启实训挑战）</label>
+													</span>
+              </div>
+
+
             </div>
           </div>
         </div>
diff --git a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
index eb7dba596..aa874d8fe 100644
--- a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
+++ b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
@@ -33,6 +33,7 @@ import './css/TPMsettings.css';
 
 import '../newshixuns/css/Newshixuns.css';
 
+const Option = Select.Option;
 
 class Shixuninformation extends Component {
   constructor(props) {

From 59a49a5662ecf866c035f7b7036e92500ef5a2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 11 Dec 2019 16:26:59 +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/modules/tpm/TPMIndex.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/tpm/TPMIndex.js b/public/react/src/modules/tpm/TPMIndex.js
index 9c82e987d..f80691d56 100644
--- a/public/react/src/modules/tpm/TPMIndex.js
+++ b/public/react/src/modules/tpm/TPMIndex.js
@@ -20,7 +20,7 @@ import TPMRepositoryComponent from './TPMRepositoryComponent';
 
 import TPMRepositoryCommits from './shixunchild/Repository/TPMRepositoryCommits';
 
-import TPMsettings from './TPMsettings/TPMsettings';
+import TPMsettings from './TPMsettings/oldTPMsettings';
 
 import TPMChallengeComponent from './TPMChallengeContainer';
 import TPMPropaedeuticsComponent from './TPMPropaedeuticsComponent';