|
|
@@ -163,15 +163,43 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
startDateChanged(time) {
|
|
|
- if (dayjs(this.formData.beginTime).isAfter(dayjs(this.formData.endTime))) {
|
|
|
+ console.info(this.formData.beginTime+"--start--"+this.formData.endTime);
|
|
|
+ if (this.isTimeBefore(this.formData.endTime,this.formData.beginTime)) {
|
|
|
this.formData.endTime = this.formData.beginTime;
|
|
|
+ console.info(this.formData.beginTime+"==start=="+this.formData.endTime);
|
|
|
}
|
|
|
},
|
|
|
endDateChanged(time) {
|
|
|
- if (dayjs(this.formData.beginTime).isAfter(dayjs(this.formData.endTime))) {
|
|
|
+ console.info(this.formData.beginTime+"--end--"+this.formData.endTime);
|
|
|
+ if (this.isTimeBefore(this.formData.endTime,this.formData.beginTime)) {
|
|
|
this.formData.beginTime = this.formData.endTime;
|
|
|
+ console.info(this.formData.beginTime+"==end=="+this.formData.endTime);
|
|
|
}
|
|
|
},
|
|
|
+ isTimeBefore(endTime,beginTime){
|
|
|
+ const partEnd = endTime.split(':');
|
|
|
+ const partBegin = beginTime.split(':');
|
|
|
+
|
|
|
+ const hoursEnd = parseInt(partEnd[0],10);
|
|
|
+ const hoursBegin = parseInt(partBegin[0],10);
|
|
|
+ const minutesEnd = parseInt(partEnd[1],10);
|
|
|
+ const minutesBegin = parseInt(partBegin[1],10);
|
|
|
+ const secondsEnd = parseInt(partEnd[2],10);
|
|
|
+ const secondsBegin = parseInt(partBegin[2],10);
|
|
|
+
|
|
|
+ if(hoursEnd < hoursBegin){
|
|
|
+ return true;
|
|
|
+ }else if(hoursEnd === hoursBegin){
|
|
|
+ if(minutesEnd < minutesBegin){
|
|
|
+ return true;
|
|
|
+ }else if(minutesEnd === minutesBegin){
|
|
|
+ if(secondsEnd < secondsBegin){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ },
|
|
|
|
|
|
validatePort(rule, value, callback) {
|
|
|
if (!value) {
|