|
@@ -60,8 +60,11 @@ class TimeInterval extends React.Component {
|
|
|
const { getStartTime, getEndTime } = this.props;
|
|
|
if (this.state.flg == 1) {
|
|
|
let time = getCalendarDate(date, true);
|
|
|
- let dateBegin = (new Date(time)).getTime()
|
|
|
- let dateEnd = (new Date(this.state.endTime)).getTime()
|
|
|
+ let dateBegin = (new Date(time)).getTime();
|
|
|
+ let arr = this.state.endTime.replace(/ |:/g, '-').split('-');
|
|
|
+ let date11 = new Date(Date.UTC(arr[0], arr[1], arr[2], arr[3],arr[4]));
|
|
|
+ // let dateEnd = (new Date(this.state.endTime)).getTime()
|
|
|
+ let dateEnd = date11.getTime()
|
|
|
let dateDes = (dateEnd - dateBegin)/(24 * 3600 * 1000)
|
|
|
if(dateEnd < dateBegin){
|
|
|
Notify.info("终止时间不能早于起始时间");
|
|
@@ -79,7 +82,10 @@ class TimeInterval extends React.Component {
|
|
|
|
|
|
} else if (this.state.flg == 2) {
|
|
|
let time = getCalendarDate(date, true);
|
|
|
- let dateBegin = (new Date(this.state.startTime)).getTime()
|
|
|
+ // let dateBegin = (new Date(this.state.startTime)).getTime()
|
|
|
+ let arr = this.state.endTime.replace(/ |:/g, '-').split('-');
|
|
|
+ let date11 = new Date(Date.UTC(arr[0], arr[1], arr[2], arr[3],arr[4]));
|
|
|
+ let dateBegin = date11.getTime()
|
|
|
let dateEnd = (new Date(time)).getTime()
|
|
|
let dateDes = (dateEnd - dateBegin)/(24 * 3600 * 1000)
|
|
|
if(dateEnd < dateBegin){
|