wenyongda/ZRAdmin-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日期格式化改用dayjs

Browse Source
This commit is contained in:
不做码农 2022-05-21 11:07:41 +08:00
parent 60cd687575
commit a2178731e2
2 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/utils/ruoyi.js
View File

@ -1,49 +1,57 @@
const baseURL =
import.meta.env.VITE_APP_BASE_API
import dayjs from 'dayjs'
/**
* 通用js方法封装处理
* 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) {
return null
}
const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
let date
if (typeof time === 'object') {
date = time
} else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
} else if (typeof time === 'string') {
time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
}
date = new Date(time)
}
const formatObj = {
y: date.getFullYear(),
m: date.getMonth() + 1,
d: date.getDate(),
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
a: date.getDay()
}
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key]
// Note: getDay() returns 0 on Sunday
if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
if (result.length > 0 && value < 10) {
value = '0' + value
}
return value || 0
})
return time_str
return dayjs(time).format(pattern)
// const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
// let date
// if (typeof time === 'object') {
// date = time
// } else {
// if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
// time = parseInt(time)
// } else if (typeof time === 'string') {
// time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
// }
// if ((typeof time === 'number') && (time.toString().length === 10)) {
// time = time * 1000
// }
// date = new Date(time)
// }
// const formatObj = {
// y: date.getFullYear(),
// m: date.getMonth() + 1,
// d: date.getDate(),
// h: date.getHours(),
// i: date.getMinutes(),
// s: date.getSeconds(),
// a: date.getDay()
// }
// const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
// let value = formatObj[key]
// // Note: getDay() returns 0 on Sunday
// if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
// if (result.length > 0 && value < 10) {
// value = '0' + value
// }
// return value || 0
// })
// return time_str
}
// 表单重置

2
src/views/system/notice/index.vue
View File

@ -53,7 +53,7 @@
<el-table-column label="创建者" align="center" prop="createBy" width="100" />
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, 'YYYY-MM-DD') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">