Showing
4 changed files
with
37 additions
and
3 deletions
1 | import { BasicColumn, FormSchema } from '/@/components/Table'; | 1 | import { BasicColumn, FormSchema } from '/@/components/Table'; |
2 | import moment from 'moment'; | 2 | import moment from 'moment'; |
3 | import { findDictItemByCode } from '/@/api/system/dict'; | 3 | import { findDictItemByCode } from '/@/api/system/dict'; |
4 | +import { format } from '../util'; | ||
4 | 5 | ||
5 | //格式化资源类型和操作类型 | 6 | //格式化资源类型和操作类型 |
6 | let formatText; | 7 | let formatText; |
@@ -71,7 +72,7 @@ export const columns: BasicColumn[] = [ | @@ -71,7 +72,7 @@ export const columns: BasicColumn[] = [ | ||
71 | dataIndex: 'createdTime', | 72 | dataIndex: 'createdTime', |
72 | width: 180, | 73 | width: 180, |
73 | format: (_, record) => { | 74 | format: (_, record) => { |
74 | - return moment(record.createdTime).format('YYYY-MM-DD HH:MM:ss'); | 75 | + return format(record.createdTime, 'yyyy-MM-dd HH:mm:ss'); |
75 | }, | 76 | }, |
76 | }, | 77 | }, |
77 | ]; | 78 | ]; |
1 | import { BasicColumn, FormSchema } from '/@/components/Table'; | 1 | import { BasicColumn, FormSchema } from '/@/components/Table'; |
2 | import moment from 'moment'; | 2 | import moment from 'moment'; |
3 | import { findDictItemByCode } from '/@/api/system/dict'; | 3 | import { findDictItemByCode } from '/@/api/system/dict'; |
4 | +import { format } from '../util'; | ||
4 | 5 | ||
5 | //格式化资源类型和操作类型 | 6 | //格式化资源类型和操作类型 |
6 | let formatText; | 7 | let formatText; |
@@ -72,7 +73,7 @@ export const columns: BasicColumn[] = [ | @@ -72,7 +73,7 @@ export const columns: BasicColumn[] = [ | ||
72 | dataIndex: 'createdTime', | 73 | dataIndex: 'createdTime', |
73 | width: 180, | 74 | width: 180, |
74 | format: (_, record) => { | 75 | format: (_, record) => { |
75 | - return moment(record.createdTime).format('YYYY-MM-DD HH:MM:ss'); | 76 | + return format(record.createdTime, 'yyyy-MM-dd HH:mm:ss'); |
76 | }, | 77 | }, |
77 | }, | 78 | }, |
78 | ]; | 79 | ]; |
1 | import { BasicColumn, FormSchema } from '/@/components/Table'; | 1 | import { BasicColumn, FormSchema } from '/@/components/Table'; |
2 | import moment from 'moment'; | 2 | import moment from 'moment'; |
3 | import { findDictItemByCode } from '/@/api/system/dict'; | 3 | import { findDictItemByCode } from '/@/api/system/dict'; |
4 | +import { format } from '../util'; | ||
4 | 5 | ||
5 | // 表格数据 | 6 | // 表格数据 |
6 | export const columns: BasicColumn[] = [ | 7 | export const columns: BasicColumn[] = [ |
@@ -40,7 +41,7 @@ export const columns: BasicColumn[] = [ | @@ -40,7 +41,7 @@ export const columns: BasicColumn[] = [ | ||
40 | dataIndex: 'createdTime', | 41 | dataIndex: 'createdTime', |
41 | width: 180, | 42 | width: 180, |
42 | format: (_, record) => { | 43 | format: (_, record) => { |
43 | - return moment(record.createdTime).format('YYYY-MM-DD HH:MM:ss'); | 44 | + return format(record.createdTime, 'yyyy-MM-dd HH:mm:ss'); |
44 | }, | 45 | }, |
45 | }, | 46 | }, |
46 | ]; | 47 | ]; |
src/views/system/log/util.ts
0 → 100644
1 | +/** | ||
2 | + * 毫秒时间戳格式化时间 | ||
3 | + */ | ||
4 | +export function format(time, format) { | ||
5 | + const t = new Date(time); | ||
6 | + const tf = function (i) { | ||
7 | + return (i < 10 ? '0' : '') + i; | ||
8 | + }; | ||
9 | + return format.replace(/yyyy|MM|dd|HH|mm|ss/g, function (a) { | ||
10 | + switch (a) { | ||
11 | + case 'yyyy': | ||
12 | + return tf(t.getFullYear()); | ||
13 | + break; | ||
14 | + case 'MM': | ||
15 | + return tf(t.getMonth() + 1); | ||
16 | + break; | ||
17 | + case 'mm': | ||
18 | + return tf(t.getMinutes()); | ||
19 | + break; | ||
20 | + case 'dd': | ||
21 | + return tf(t.getDate()); | ||
22 | + break; | ||
23 | + case 'HH': | ||
24 | + return tf(t.getHours()); | ||
25 | + break; | ||
26 | + case 'ss': | ||
27 | + return tf(t.getSeconds()); | ||
28 | + break; | ||
29 | + } | ||
30 | + }); | ||
31 | +} |