From 36c84173ee2638aff47a3ed42cd22db8092ea133 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 03 六月 2021 19:11:52 +0800
Subject: [PATCH] feat(设备定义):
---
src/utils/myUtil.js | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/src/utils/myUtil.js b/src/utils/myUtil.js
index 029e96f..92504fd 100644
--- a/src/utils/myUtil.js
+++ b/src/utils/myUtil.js
@@ -37,22 +37,48 @@
export function calculateSeniority(val) {
// eslint-disable-next-line eqeqeq
if (val.length === 0) {
- return 0
+ return '0年0月'
}
- var myDate = new Date()
- var month = myDate.getMonth() + 1
- var day = myDate.getDate()
- var entryDate = new Date(val)
- var age = myDate.getFullYear() - entryDate.getFullYear()
- if (entryDate.getMonth < month || entryDate.getMonth === month && entryDate.getDay <= day) {
- age++
+ var sDate = new Date(val)
+ var eDate = new Date()
+
+ // 获得各自的年、月、日
+ var sY = sDate.getFullYear()
+ var sM = sDate.getMonth() + 1
+ var sD = sDate.getDate()
+ var eY = eDate.getFullYear()
+ var eM = eDate.getMonth() + 1
+ var eD = eDate.getDate()
+
+ // var flagD = 0
+ var flagM = 0
+ var flagY = 0
+ // var months = 0
+ var d = eD - sD
+ if (d > 0 && d >= 15) {
+ flagM = 1
}
- if (age <= 0) {
- age = 0
+ if (d < 0 && 30 + d < 15) {
+ flagM = -1
}
- return age
+
+ var m = eM + flagM - sM
+ if (m < 0) {
+ flagY = -1
+ m = 12 + m
+ }
+
+ var y = eY + flagY - sY
+ return y + '年' + m + '月'
}
+/**
+ * 计算日期时间间隔
+ * @param begin 起始时间
+ * @param end 结束时间
+ * @param flag 间隔单位
+ * @returns {*}
+ */
export function dateDifference(begin, end, flag) {
let dateSpan
let iReturn
@@ -70,3 +96,11 @@
}
return iReturn
}
+
+export function dateToString(val) {
+ val = new Date(val)
+ const year = val.getFullYear()
+ const month = val.getMonth() + 1
+ const day = val.getDate()
+ return year + '-' + month + '-' + day
+}
--
Gitblit v1.8.0