From e1699c4851f6ca397cd0ad1ff63f32c737654836 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 02 Apr 2025 19:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/utils/date.js | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/utils/date.js b/src/utils/date.js
index 35d9eb7..0c54b10 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -1,58 +1,58 @@
export const calcDate = (date1, date2) => {
- let date3 = date2 - date1;
+ let date3 = date2 - date1
- let days = Math.floor(date3 / (24 * 3600 * 1000));
+ let days = Math.floor(date3 / (24 * 3600 * 1000))
- let leave1 = date3 % (24 * 3600 * 1000); //计算天数后剩余的毫秒数
- let hours = Math.floor(leave1 / (3600 * 1000));
+ let leave1 = date3 % (24 * 3600 * 1000) //计算天数后剩余的毫秒数
+ let hours = Math.floor(leave1 / (3600 * 1000))
- let leave2 = leave1 % (3600 * 1000); //计算小时数后剩余的毫秒数
- let minutes = Math.floor(leave2 / (60 * 1000));
+ let leave2 = leave1 % (3600 * 1000) //计算小时数后剩余的毫秒数
+ let minutes = Math.floor(leave2 / (60 * 1000))
- let leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
- let seconds = Math.round(date3 / 1000);
- return {
- leave1,
- leave2,
- leave3,
- days: days,
- hours: hours,
- minutes: minutes,
- seconds: seconds,
- };
-};
+ let leave3 = leave2 % (60 * 1000) //计算分钟数后剩余的毫秒数
+ let seconds = Math.round(date3 / 1000)
+ return {
+ leave1,
+ leave2,
+ leave3,
+ days: days,
+ hours: hours,
+ minutes: minutes,
+ seconds: seconds,
+ }
+}
/**
* 日期格式化
*/
export function dateFormat(date, format) {
- format = format || 'yyyy-MM-dd hh:mm:ss';
- if (date !== 'Invalid Date') {
- let o = {
- 'M+': date.getMonth() + 1, //month
- 'd+': date.getDate(), //day
- 'h+': date.getHours(), //hour
- 'm+': date.getMinutes(), //minute
- 's+': date.getSeconds(), //second
- 'q+': Math.floor((date.getMonth() + 3) / 3), //quarter
- S: date.getMilliseconds(), //millisecond
- };
- if (/(y+)/.test(format))
- format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
- for (let k in o)
- if (new RegExp('(' + k + ')').test(format))
- format = format.replace(
- RegExp.$1,
- RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
- );
- return format;
- }
- return '';
+ format = format || 'yyyy-MM-dd hh:mm:ss'
+ if (date !== 'Invalid Date') {
+ let o = {
+ 'M+': date.getMonth() + 1, //month
+ 'd+': date.getDate(), //day
+ 'h+': date.getHours(), //hour
+ 'm+': date.getMinutes(), //minute
+ 's+': date.getSeconds(), //second
+ 'q+': Math.floor((date.getMonth() + 3) / 3), //quarter
+ S: date.getMilliseconds(), //millisecond
+ }
+ if (/(y+)/.test(format))
+ format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+ for (let k in o)
+ if (new RegExp('(' + k + ')').test(format))
+ format = format.replace(
+ RegExp.$1,
+ RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
+ )
+ return format
+ }
+ return ''
}
/**
* 当前时间戳
*/
export function dateNow() {
- return dateFormat(new Date(), 'yyyyMMddhhmmss');
+ return dateFormat(new Date(), 'yyyyMMddhhmmss')
}
--
Gitblit v1.9.3