From e990fa51c5f8f914aa32716b8a66eee38c89da73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 19 Jul 2019 17:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesPublic/ShixunModal.js      |  2 +-
 public/react/src/modules/home/shixunsHome.js  |  2 +-
 .../modules/tpm/TPMsettings/TPMsettings.js    | 22 +++++++++---
 .../src/modules/tpm/newshixuns/Newshixuns.js  | 36 +++++++++++++------
 4 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js
index 4046a58a4..f0caef87b 100644
--- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js
@@ -378,7 +378,7 @@ class ShixunModal extends Component{
                 </div>
               </div>
           </Spin>
-            {this.state.shixunmodelchke===true?<span className={"color-red"}>{this.state.chekicmessage}</span>:""}
+            <span className={this.state.shixunmodelchke===true?"none":"color-red"}>{this.state.chekicmessage}</span>
             <div className="mt20 marginauto clearfix edu-txt-center">
               <a className="pop_close task-btn mr30 margin-tp26" onClick={this.hidecouseShixunModal}>取消</a>
               <a className="task-btn task-btn-orange margin-tp26" id="submit_send_shixun" onClick={this.savecouseShixunModal}>确定</a>
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 9093ec22d..780691e6c 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -232,7 +232,7 @@ class ShixunsHome extends Component {
                                                     <p className="clearfix mt8 font-12 color-grey-B4">
                                                       <Tooltip placement="bottom" title={"章节"}>
                                                           <span className="mr10 fl squareIconSpan">
-                                                            <i className="iconfont icon-zhangjie fl mr3 iconfontzhangjie"></i>{item.stages_count}
+                                                            <i className="iconfont icon-zhangjie1 fl mr3 iconfontzhangjie"></i>{item.stages_count}
                                                           </span>
                                                       </Tooltip>
 
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index abeb18c9f..72bbbe3d0 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -161,7 +161,20 @@ function updatamakedown(id){
   }, 200)
 }
 
-
+function range(start, end) {
+	const result = [];
+	for (let i = start; i < end; i++) {
+		result.push(i);
+	}
+	return result;
+}
+function disabledDateTime() {
+	return {
+		// disabledHours: () => range(0, 24).splice(4, 20),
+		disabledMinutes: () => range(1, 30).concat(range(31, 60)),
+		// disabledSeconds: () => [0, 60],
+	};
+}
 export default class TPMsettings extends Component {
   constructor(props) {
     super(props)
@@ -1307,7 +1320,7 @@ export default class TPMsettings extends Component {
               <div className="width15 fl mr20"
 									 // onMouseLeave={operateauthority?this.bigopens:""}
 							>
-                <Select placeholder="请更新主类别" value={choice_main_type === "" ? undefined : choice_main_type}
+                <Select placeholder="请选择主类别" value={choice_main_type === "" ? undefined : choice_main_type}
                         style={{width: 180}}
                         onChange={operateauthority?this.bigClass:""}
                   // onMouseEnter={this.bigopen}
@@ -1822,10 +1835,11 @@ export default class TPMsettings extends Component {
             <span className="fl mt5">
                           <DatePicker
                             showToday={false}
-                            showTime
+														showTime={{ format: 'HH:mm' }}
+														format="YYYY-MM-DD HH:mm"
 														width={178}
                             locale={locale}
-                            format={dateFormat}
+														disabledTime={disabledDateTime}
                             placeholder="请选择开启时间"
                             value={opening_time===null||opening_time===""?"":moment(opening_time, dateFormat)}
                             onChange={this.onChangeTimePicker}
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index e424ad374..a7d48cb67 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 
 import {TPMIndexHOC} from '../TPMIndexHOC';
 
-import {SnackbarHOC} from 'educoder';
+import {SnackbarHOC,handleDateString} from 'educoder';
 
 import {Input, Select, Radio, Checkbox, Modal, Icon, DatePicker,Upload,Button,message,Form,notification} from 'antd';
 
@@ -146,7 +146,20 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
     return editorName;
 }
 
-
+function range(start, end) {
+	const result = [];
+	for (let i = start; i < end; i++) {
+		result.push(i);
+	}
+	return result;
+}
+function disabledDateTime() {
+	return {
+		// disabledHours: () => range(0, 24).splice(4, 20),
+		disabledMinutes: () => range(1, 30).concat(range(31, 60)),
+		// disabledSeconds: () => [0, 60],
+	};
+}
 class Newshixuns extends Component {
     constructor(props) {
         super(props)
@@ -669,7 +682,7 @@ class Newshixuns extends Component {
 
     onChangeTimePicker = (value, dateString) => {
         this.setState({
-            TimePickervalue: dateString
+            TimePickervalue: handleDateString(dateString)
         })
     }
     // 附件相关 START
@@ -892,7 +905,7 @@ class Newshixuns extends Component {
                                 <div className="width15 fl mr20"
 																		 // onMouseLeave={this.bigopens}
 																>
-                                    <Select placeholder="请更新主类别"
+                                    <Select placeholder="请选择主类别"
                                             style={{width: 180}}
                                             onChange={this.bigClass}
                                             // onMouseEnter={this.bigopen}
@@ -930,7 +943,7 @@ class Newshixuns extends Component {
                                                 <label className="fl mt10 "><span
                                                     className="color-red fl mt3">*</span>语言：&nbsp;&nbsp;</label>
                                                 <textarea className="fl task-form-80 task-height-150"
-																													style={{width:'89%'}}
+																													style={{width:'89%',height:'100px'}}
                                                           onInput={this.setlanguagewrite}
                                                           value={languagewrite}
                                                           placeholder="请填写该镜像是基于什么语言：示例：Python"
@@ -941,6 +954,7 @@ class Newshixuns extends Component {
                                                     className="color-red fl mt3">*</span>系统环境：&nbsp;&nbsp;</label>
                                                 <textarea className="fl task-form-80 task-height-150 "
                                                           onInput={this.setsystemenvironment}
+																													style={{height:'100px'}}
                                                           value={systemenvironment}
                                                           placeholder="请填写该镜像是基于什么linux系统环境,代码运行环境"
                                                           id="demand_info"></textarea>
@@ -953,6 +967,7 @@ class Newshixuns extends Component {
                                                 <textarea className="fl task-form-80 task-height-150 "
                                                           onInput={this.settestcoderunmode}
                                                           value={testcoderunmode}
+																													style={{height:'100px'}}
                                                           placeholder="请填写该镜像中测试代码运行方式"
                                                           id="demand_info"></textarea>
                                             </li>
@@ -993,14 +1008,11 @@ class Newshixuns extends Component {
 
                                             </li>
                                             <li className="edu-txt-center clearfix ">
-
-                                                <Form.Item>
-                                                <a className="pop_close task-btn  mr30 mb30 mt35"
+                                                <a className="pop_close task-btn  mr30"
                                                    onClick={() => this.sendhideModaly()}
                                                 >取消</a>
                                                 <Button type="primary"  onClick={()=>this.sendsure_apply()}
-                                                   className="task-btn task-btn-orange mb30 mt35">确定</Button>
-                                                </Form.Item>
+                                                   className="task-btn task-btn-orange">确定</Button>
                                             </li>
                                             <div className="cl"></div>
                                         </div>
@@ -1203,10 +1215,12 @@ class Newshixuns extends Component {
                                         showToday={false}
                                         showTime
                                         locale={locale}
+																				showTime={{ format: 'HH:mm' }}
 																				style={{"width": "184px"}}
-                                        format="YYYY-MM-DD HH:mm:ss"
+																				format="YYYY-MM-DD HH:mm"
                                         placeholder="请选择开启时间"
                                         onChange={this.onChangeTimePicker}
+																				disabledTime={disabledDateTime}
                                     />
                                     <label style={{top: '6px'}} className="color-grey-6 ml10">
                                         （为空，则学员在实训发布后，能随时开启实训挑战；否则，学员在开启时间后，才能开启实训挑战）