3.10 工程代码同步master

This commit is contained in:
jl-zhoujl2
2022-03-10 14:24:13 +08:00
parent 41ab55a4ac
commit 62f6b07ee2
914 changed files with 143121 additions and 29110 deletions

View File

@ -1,7 +1,7 @@
/*
* @Author: liqiang
* @Date: 2020-12-02 14:25:23
* @LastEditTime: 2021-01-14 14:28:00
* @LastEditTime: 2021-03-25 15:46:32
* @LastEditors: Please set LastEditors
* @Description: 日期工具类
* @FilePath: \ebtp-cloud-frontend\src\utils\DateUtils.ts
@ -73,7 +73,7 @@ export function datePickerDisabledTime(current: any) {
let minute = Number(moment().minutes());
return {
disabledHours: () => range(0, hour),
disabledMinutes: () => range(0, minute)
disabledMinutes: () => hour === current.hour() ? range(0, minute) : []
};
} else {
return {
@ -144,14 +144,17 @@ export function getMaxDate(arr: string[]) {
* @param date2
*/
export function judgmentIntervalDay(date1: any, date2: any) {
let dateSpan,
iDays;
date1 = Date.parse(date1);
date2 = Date.parse(date2);
dateSpan = date2 - date1;
dateSpan = Math.abs(dateSpan);
iDays = Math.floor(dateSpan / (24 * 3600 * 1000));
return iDays
// let dateSpan,
// iDays;
// date1 = Date.parse(date1);
// date2 = Date.parse(date2);
// dateSpan = date2 - date1;
// dateSpan = Math.abs(dateSpan);
// iDays = Math.floor(dateSpan / (24 * 3600 * 1000));
// return iDays
date1 = moment(date1).startOf('day')
date2 = moment(date2).startOf('day')
return date2?.diff(date1, "days")
};
/**
* 判断第一个时间是否大于第二个
@ -160,6 +163,19 @@ export function judgmentIntervalDay(date1: any, date2: any) {
*/
export function judgmentOfTwoTimePeriods(date1: string, date2: string) {
let d1 = new Date(date1),
d2 = new Date(date2);
d2 = new Date(date2);
return d1.getTime() > d2.getTime();
}
}
/**
* 给日期加n天或者减n天
* @param date
* @param day
*/
export function addOrSubtractADayFromTheDate(date: string, day: number) {
if(isEmpty(date)){
return null;
}
let d1 = new Date(date);
let d2 = d1.setDate(d1.getDate() + day);
return moment(d2).format(dateTimeFormatter);
}