Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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

@@ -1482,6 +1482,7 @@ class Listofworksstudentone extends Component {
 	}
 	//计算成绩
 	setComputeTime=()=>{
+		let matchurl = this.props.match.url;
 		let {teacherdata}=this.state;
 		this.setState({
 			computeTimetype:false
@@ -1494,6 +1495,7 @@ class Listofworksstudentone extends Component {
 			this.props.showNotification(`${response.data.message}`);
 			// var homeworkid = this.props.match.params.homeworkid;
 			this.Getalistofworks(homeworkid);
+			this.props.history.replace( matchurl );
 			// this.Getalistofworkstwo("", "", "", "", 1, 20);
 		}).catch((error) => {
 			console.log(error)
@@ -2147,6 +2149,9 @@ class Listofworksstudentone extends Component {
 	}
 
 	setComputeTimet=()=>{
+
+		let matchurl = this.props.match.url;
+
 		this.setState({
 			computeTimetype:false
 		})
@@ -2163,6 +2168,7 @@ class Listofworksstudentone extends Component {
 			})
 			this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 			this.props.showNotification(`${response.data.message}`);
+		  this.props.history.replace( matchurl );
 			 }
 		}).catch((error) => {
 			console.log(error)

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

@@ -123,9 +123,9 @@ class ShixunHomeworkPage extends Component {
 		let {tab, teacherdatapage,  jobsettingsdatapage} = this.state;
 
 		const isAdmin = this.props.isAdmin();
-		console.log(119)
+		// console.log(119)
-		console.log(jobsettingsdatapage);
+		// console.log(jobsettingsdatapage);
-		console.log(teacherdatapage);
+		// console.log(teacherdatapage);
 		return (
 			<div className="newMain clearfix ">
 				<div className={"educontent mb20"} style={{width: "1200px"}}>

public/react/src/modules/paths/PathDetail/DetailCardsTemp.js

@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import {getImageUrl} from 'educoder';
+import { Tooltip } from 'antd';
 import '../../paths/ShixunPaths.css';
 import DetailCardsEditAndAdd from './DetailCardsEditAndAdd';
 import axios from 'axios';
@@ -85,16 +86,26 @@ class DetailCards extends Component{
                     <a className="fl ring-blue mr10 mt2">
                       <img src={getImageUrl("images/educoder/icon/charpter-white.svg")} className="fl ml3 mt3"/>
                     </a>
+
                     <span className="font-18 font-bd">{item.stage_name}</span>
+
+										<Tooltip placement="bottom" title={"编辑"}>
 												<a className="fr mtf3">
-                      <i className="iconfont icon-bianjidaibeijing font-22 color-green" data-tip-down="编辑"></i>
+													<i className="iconfont icon-bianjidaibeijing font-22 color-green"></i>
 												</a>
+										</Tooltip>
+
+										<Tooltip placement="bottom" title={"向下移动"}>
                     <a href="" className="fr ring-op-green mr20">
-                      <img src={getImageUrl("images/educoder/icon/movedown.svg")} data-tip-down="向下移动" className="fl mt2 ml4"/>
+                      <img src={getImageUrl("images/educoder/icon/movedown.svg")} className="fl mt2 ml4"/>
                     </a>
+										</Tooltip>
+
+										<Tooltip placement="bottom" title={"向上移动"}>
 											<a href="" className="fr ring-op-green mr20">
-                      <img src={getImageUrl("images/educoder/icon/moveup.svg")} data-tip-down="向上移动" className="fl mt2 ml4"/>
+												<img src={getImageUrl("images/educoder/icon/moveup.svg")} className="fl mt2 ml4"/>
 											</a>
+										</Tooltip>
                   </p>
                   <div className="detail_for_paragraph clearfix" id={"detail_for_paragraph_"+key}>
                     <p className="color-dark-grey mt20 mb25 ml20 mr20 pl28 justify font-15">{item.stage_description}</p>

public/react/src/modules/paths/PathDetail/DetailTop.js

@@ -170,9 +170,12 @@ class DetailTop extends Component{
 
               </span>
               {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
-                <Link to={"/paths/"+this.props.match.params.pathId+"/edit"} className="ml10 ring-green fl mt10" data-tip-down="编辑">
+								<Tooltip placement="bottom" title={"编辑"}>
+										<Link to={"/paths/"+this.props.match.params.pathId+"/edit"} className="ml10 ring-green fl mt10" >
 											<img src={getImageUrl("images/educoder/icon/edit.svg")} className="fl mt3 ml2" />
-                </Link>:""
+										</Link>
+								</Tooltip>
+									:""
               }
 
               {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?

public/react/src/modules/paths/PathDetail/PathDetailIndex.js

@@ -369,9 +369,11 @@ class PathDetailIndex extends Component{
                   <p className="clearfix mb30">
                     <span className="font-16">课程须知</span>
                     {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
+											<Tooltip placement="bottom" title={"编辑"}>
                       <Link to={"/paths/"+this.props.match.params.pathId+"/edit"} className="fr mtf5">
-                        <i className="iconfont icon-bianjidaibeijing font-20 color-green" data-tip-down="编辑"></i>
+                        <i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>
                       </Link>
+											</Tooltip>
                       :""
                     }
                   </p>
@@ -397,16 +399,18 @@ class PathDetailIndex extends Component{
                           </div>
                       </div>
 
+										<Tooltip placement="bottom" title={"显示全部"}>
                     <div className={detailInfoList.tags.length>15&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"}
-                         data-tip-down="显示全部"
                          onClick={()=>this.clickNewsubscript(0)}
                     ><span className="mr8">...</span><Icon type="caret-down" />
                     </div>
+										</Tooltip>
 
+										<Tooltip placement="bottom" title={"收起"}>
                     <div className={clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 none":"newsubscript mb9 color-grey-9 fr"}
-                         data-tip-down="收起"
                          onClick={()=>this.clickNewsubscript(1)}><Icon type="caret-up" />
                     </div>
+										</Tooltip>
 
                   </div>
                 }

public/react/src/modules/tpm/TPMsettings/TPMsettings.js

@@ -31,6 +31,30 @@ const Option = Select.Option;
 
 const RadioGroup = Radio.Group;
 
+// 处理整点 半点
+// 取传入时间往后的第一个半点
+export function handleDateStrings(dateString) {
+	if (!dateString) return dateString;
+	const ar = dateString.split(':')
+	if (ar[1] == '00' || ar[1] == '30') {
+		return dateString
+	}
+	const miniute = parseInt(ar[1]);
+	if (miniute < 30 || miniute == 60) {
+		return [ar[0], '30'].join(':')
+	}
+	if (miniute < 60) {
+		// 加一个小时
+		const tempStr = [ar[0], '00'].join(':');
+		const format = "YYYY-MM-DD HH:mm";
+		const _moment = moment(tempStr, format)
+		_moment.add(1, 'hours')
+		return _moment.format(format)
+	}
+
+	return dateString
+}
+
 // 恢复数据
 function md_rec_data(k,mdu,id, editor){
   if(window.sessionStorage.getItem(k+mdu) !== null){
@@ -1120,7 +1144,7 @@ export default class TPMsettings extends Component {
   }
   onChangeTimePicker =(value, dateString)=> {
     this.setState({
-      opening_time:dateString
+      opening_time:moment(handleDateStrings(dateString))
     })
   }
 

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 
 import {TPMIndexHOC} from '../TPMIndexHOC';
 
-import {SnackbarHOC,handleDateString} from 'educoder';
+import {SnackbarHOC} from 'educoder';
 
 import {Input, Select, Radio, Checkbox, Modal, Icon, DatePicker,Upload,Button,message,Form,notification} from 'antd';
 
@@ -16,6 +16,7 @@ import './css/Newshixuns.css';
 
 import {getUrl} from 'educoder'
 
+
 let path = getUrl("/editormd/lib/")
 
 const $ = window.$;
@@ -28,6 +29,34 @@ const Option = Select.Option;
 
 const RadioGroup = Radio.Group;
 const confirm = Modal.confirm;
+
+
+// 处理整点 半点
+// 取传入时间往后的第一个半点
+export function handleDateStrings(dateString) {
+	if (!dateString) return dateString;
+	const ar = dateString.split(':')
+	if (ar[1] == '00' || ar[1] == '30') {
+		return dateString
+	}
+	const miniute = parseInt(ar[1]);
+	if (miniute < 30 || miniute == 60) {
+		return [ar[0], '30'].join(':')
+	}
+	if (miniute < 60) {
+		// 加一个小时
+		const tempStr = [ar[0], '00'].join(':');
+		const format = "YYYY-MM-DD HH:mm";
+		const _moment = moment(tempStr, format)
+		_moment.add(1, 'hours')
+		return _moment.format(format)
+	}
+
+	return dateString
+}
+
+
+
 // 恢复数据
 function md_rec_data(k, mdu, id, editor) {
     if (window.sessionStorage.getItem(k + mdu) !== null) {
@@ -713,7 +742,7 @@ class Newshixuns extends Component {
 
     onChangeTimePicker = (value, dateString) => {
         this.setState({
-            TimePickervalue: handleDateString(dateString)
+            TimePickervalue: handleDateStrings(dateString)
         })
     }
     // 附件相关 START

public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js

@@ -293,11 +293,12 @@ class Challenges extends Component {
 
             <p className="clearfix mb30">
               <span className="font-16 fl">简介</span>
+							<Tooltip placement="bottom" title={"编辑"}>
               <a style={{ display: this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status < 3 ? "block" : 'none' }}
-                 href={"/shixuns/" + id + "/settings?edit=1"} className="ring-green fr"
+                 href={"/shixuns/" + id + "/settings?edit=1"} className="ring-green fr">
-                 data-tip-down="编辑">
                 <img src={getImageUrl("images/educoder/icon/edit.svg")} className="fl mt3 ml2" />
               </a>
+							</Tooltip>
             </p>
 
             <div className="justify break_full_word new_li markdown-body"
@@ -378,11 +379,13 @@ class Challenges extends Component {
                         <div className="clearfix mb20">
                             <span className="fl ring-blue mr10 mt8">
                               {item.st === 0 ?
-                                <img src={getImageUrl("images/educoder/icon/code.svg")} data-tip-down="实训任务"
+																<Tooltip placement="bottom" title={"实训任务"}>
-                                     className="fl mt2 ml2" />
+                                <img src={getImageUrl("images/educoder/icon/code.svg")} className="fl mt2 ml2" />
+																</Tooltip>
                                 :
-                                <img src={getImageUrl("images/educoder/icon/choose.svg")} data-tip-down="选择题任务"
+																<Tooltip placement="bottom" title={"选择题任务"}>
-                                     className="fl mt2 ml3" />
+                                <img src={getImageUrl("images/educoder/icon/choose.svg")} className="fl mt2 ml3" />
+																</Tooltip>
                               }
                             </span>
                           <span className="mr15 font-16 fl">第{key+1}关</span>

public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js

@@ -10,6 +10,8 @@ import classNames from 'classnames';
 
 import { getImageUrl, toPath } from 'educoder';
 
+import { Tooltip } from 'antd';
+
 import axios from 'axios';
 
 import { CircularProgress } from 'material-ui/Progress';
@@ -76,8 +78,10 @@ class Propaedeutics extends Component {
     return (
       <React.Fragment>
         <p className="clearfix mb10 pl20 pr20" style={{display:this.props.identity<5&&this.props.status<3?"block":'none'}} >
-          <a href={"/shixuns/"+shixunId +"/update_propaedeutics"}className="ring-green fr mt8" id="edit_propaedeutics"
+					<Tooltip placement="bottom" title={"编辑"}>
-             data-tip-down="编辑"><img src={getImageUrl("images/educoder/icon/edit.svg")} className="fl mt3 ml2" /></a>
+					<a href={"/shixuns/"+shixunId +"/update_propaedeutics"}className="ring-green fr mt8" id="edit_propaedeutics">
+						<img src={getImageUrl("images/educoder/icon/edit.svg")} className="fl mt3 ml2" /></a>
+					</Tooltip>
         </p>
         {
           loadingContent ?