日期格式化改用dayjs
This commit is contained in:
parent
60cd687575
commit
a2178731e2
@ -1,49 +1,57 @@
|
|||||||
const baseURL =
|
const baseURL =
|
||||||
import.meta.env.VITE_APP_BASE_API
|
import.meta.env.VITE_APP_BASE_API
|
||||||
|
import dayjs from 'dayjs'
|
||||||
/**
|
/**
|
||||||
* 通用js方法封装处理
|
* 通用js方法封装处理
|
||||||
* Copyright (c) 2019 ruoyi
|
* Copyright (c) 2019 ruoyi
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// 日期格式化
|
/**
|
||||||
export function parseTime(time, pattern) {
|
* 日期格式化
|
||||||
|
* @param {*} time
|
||||||
|
* @param {* } pattern 'YYYY-MM-DD HH:mm:ss'
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
export function parseTime(time, pattern = 'YYYY-MM-DD HH:mm:ss') {
|
||||||
if (arguments.length === 0 || !time) {
|
if (arguments.length === 0 || !time) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
|
|
||||||
let date
|
return dayjs(time).format(pattern)
|
||||||
if (typeof time === 'object') {
|
// const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
|
||||||
date = time
|
// let date
|
||||||
} else {
|
// if (typeof time === 'object') {
|
||||||
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
|
// date = time
|
||||||
time = parseInt(time)
|
// } else {
|
||||||
} else if (typeof time === 'string') {
|
// if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
|
||||||
time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
|
// time = parseInt(time)
|
||||||
}
|
// } else if (typeof time === 'string') {
|
||||||
if ((typeof time === 'number') && (time.toString().length === 10)) {
|
// time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
|
||||||
time = time * 1000
|
// }
|
||||||
}
|
// if ((typeof time === 'number') && (time.toString().length === 10)) {
|
||||||
date = new Date(time)
|
// time = time * 1000
|
||||||
}
|
// }
|
||||||
const formatObj = {
|
// date = new Date(time)
|
||||||
y: date.getFullYear(),
|
// }
|
||||||
m: date.getMonth() + 1,
|
// const formatObj = {
|
||||||
d: date.getDate(),
|
// y: date.getFullYear(),
|
||||||
h: date.getHours(),
|
// m: date.getMonth() + 1,
|
||||||
i: date.getMinutes(),
|
// d: date.getDate(),
|
||||||
s: date.getSeconds(),
|
// h: date.getHours(),
|
||||||
a: date.getDay()
|
// i: date.getMinutes(),
|
||||||
}
|
// s: date.getSeconds(),
|
||||||
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
|
// a: date.getDay()
|
||||||
let value = formatObj[key]
|
// }
|
||||||
// Note: getDay() returns 0 on Sunday
|
// const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
|
||||||
if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
|
// let value = formatObj[key]
|
||||||
if (result.length > 0 && value < 10) {
|
// // Note: getDay() returns 0 on Sunday
|
||||||
value = '0' + value
|
// if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
|
||||||
}
|
// if (result.length > 0 && value < 10) {
|
||||||
return value || 0
|
// value = '0' + value
|
||||||
})
|
// }
|
||||||
return time_str
|
// return value || 0
|
||||||
|
// })
|
||||||
|
// return time_str
|
||||||
}
|
}
|
||||||
|
|
||||||
// 表单重置
|
// 表单重置
|
||||||
|
|||||||
@ -53,7 +53,7 @@
|
|||||||
<el-table-column label="创建者" align="center" prop="createBy" width="100" />
|
<el-table-column label="创建者" align="center" prop="createBy" width="100" />
|
||||||
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
|
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
|
<span>{{ parseTime(scope.row.createTime, 'YYYY-MM-DD') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user