30天 及一年
This commit is contained in:
parent
a4b6edf23f
commit
6457df4fc2
@ -77,6 +77,45 @@ export function extend(obj1, obj2) {
|
||||
for (let p in obj2) obj1[p] = obj2[p];
|
||||
}
|
||||
|
||||
export function getPreviousMonthDates() {
|
||||
let today = new Date(); // 获取当前日期
|
||||
let datesArray = []; // 创建一个数组来存储日期
|
||||
|
||||
// 遍历从今天开始往前30天的每一天
|
||||
for (let i = 0; i < 30; i++) {
|
||||
// 创建一个新的日期对象,表示从今天往前i天的日期
|
||||
let date = new Date(today);
|
||||
date.setDate(today.getDate() - i);
|
||||
|
||||
// 将日期对象添加到数组中
|
||||
datesArray.unshift(new Date(date));
|
||||
}
|
||||
|
||||
return datesArray;
|
||||
}
|
||||
//获取最近12个月
|
||||
export function getNearMonth(type) {
|
||||
let dateArr = []
|
||||
let date = new Date()
|
||||
// let year = date.getFullYear()
|
||||
date.setMonth(date.getMonth() + 1, 1) // 设置到下个月
|
||||
for (let i = 0; i < 12; i++) {
|
||||
date.setMonth(date.getMonth() - 1)//每次循环一次 月份值减1
|
||||
let m = date.getMonth() + 1
|
||||
// m = m < 10 ? "0" + m : m
|
||||
if(type == 'year'){
|
||||
dateArr.push(date.getFullYear() + "年" + m+'月')
|
||||
}else if(type=='/'){
|
||||
dateArr.push(date.getFullYear() + "/" + m)
|
||||
}else{
|
||||
|
||||
dateArr.push(date.getFullYear() + "-" + m)
|
||||
}
|
||||
|
||||
}
|
||||
return dateArr
|
||||
}
|
||||
|
||||
//wyw 添加 子表过滤条件
|
||||
export function extendFilterGroupGroupRules(obj, filed, op, value, isSysParam) { //查询条件
|
||||
let data = {};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user