diff --git a/src/utils/custom.js b/src/utils/custom.js index 3dad090a..c0507fa2 100644 --- a/src/utils/custom.js +++ b/src/utils/custom.js @@ -15,7 +15,7 @@ export function parseExcelTime(dateString, isDateTime){ const formatDateTime = date => { return dayjs(date).format("YYYY-MM-DD HH:mm:ss"); }; - + // 帮助函数:将 Date 对象格式化为 yyyy-MM-dd const formatDate = date => { return dayjs(date).format("YYYY-MM-DD"); @@ -27,7 +27,8 @@ export function parseExcelTime(dateString, isDateTime){ } // 处理包含 "23:59:17" 的日期字符串 - if (dateString.includes("23:59:17")) { + // if (dateString.includes("23:59:17")) { + if (dateString.includes("23:59")) { dateString = dayjs(dateString) .add(isDateTime ? 43 : 1, isDateTime ? "second" : "day") .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); } - + // 日期格式化 export function parseTime(time, pattern) { if (arguments.length === 0 || !time) { @@ -769,5 +770,4 @@ export function addExportAuditRecord(data) { method: 'post', data: data }) -} - +} \ No newline at end of file