读取excel 时间,调整
This commit is contained in:
parent
55f081042f
commit
87e54adf0c
@ -15,7 +15,7 @@ export function parseExcelTime(dateString, isDateTime){
|
|||||||
const formatDateTime = date => {
|
const formatDateTime = date => {
|
||||||
return dayjs(date).format("YYYY-MM-DD HH:mm:ss");
|
return dayjs(date).format("YYYY-MM-DD HH:mm:ss");
|
||||||
};
|
};
|
||||||
|
|
||||||
// 帮助函数:将 Date 对象格式化为 yyyy-MM-dd
|
// 帮助函数:将 Date 对象格式化为 yyyy-MM-dd
|
||||||
const formatDate = date => {
|
const formatDate = date => {
|
||||||
return dayjs(date).format("YYYY-MM-DD");
|
return dayjs(date).format("YYYY-MM-DD");
|
||||||
@ -27,7 +27,8 @@ export function parseExcelTime(dateString, isDateTime){
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 处理包含 "23:59:17" 的日期字符串
|
// 处理包含 "23:59:17" 的日期字符串
|
||||||
if (dateString.includes("23:59:17")) {
|
// if (dateString.includes("23:59:17")) {
|
||||||
|
if (dateString.includes("23:59")) {
|
||||||
dateString = dayjs(dateString)
|
dateString = dayjs(dateString)
|
||||||
.add(isDateTime ? 43 : 1, isDateTime ? "second" : "day")
|
.add(isDateTime ? 43 : 1, isDateTime ? "second" : "day")
|
||||||
.format(isDateTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
|
.format(isDateTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
|
||||||
@ -88,7 +89,7 @@ export function parseExcelTime(dateString, isDateTime){
|
|||||||
return isDateTime ? formatDateTime(date) : formatDate(date);
|
return isDateTime ? formatDateTime(date) : formatDate(date);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 日期格式化
|
// 日期格式化
|
||||||
export function parseTime(time, pattern) {
|
export function parseTime(time, pattern) {
|
||||||
if (arguments.length === 0 || !time) {
|
if (arguments.length === 0 || !time) {
|
||||||
@ -769,5 +770,4 @@ export function addExportAuditRecord(data) {
|
|||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user