diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 2d5dddcc..322fd6ed 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -27,7 +27,7 @@ import useAlarmStore from '@/store/modules/alarm'; import { getServerTime } from '@/api'; import { MENU_PATH_INLINE } from '@/constants/menu-constants'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; -import { parseDateToStr } from '@/utils/date-utils'; +import { parseDateToStr, YYYY_MM_DD_HH_MM_SSZ } from '@/utils/date-utils'; import { parseUrlPath } from '@/plugins/file-static-url'; const { proConfig, waterMarkContent } = useLayoutStore(); const { t, currentLocale } = useI18n(); @@ -214,7 +214,7 @@ function fnGetServerTime() { // serverTimeStr.value = parseDateToStr(serverTime.timestamp); // 用DOM直接修改 if (serverTimeDom) { - serverTimeDom.innerText = parseDateToStr(serverTime.timestamp); + serverTimeDom.innerText = parseDateToStr(serverTime.timestamp, YYYY_MM_DD_HH_MM_SSZ); } }, 1000); } diff --git a/src/views/dashboard/amfUE/index.vue b/src/views/dashboard/amfUE/index.vue index bdd9f270..12cae41c 100644 --- a/src/views/dashboard/amfUE/index.vue +++ b/src/views/dashboard/amfUE/index.vue @@ -162,13 +162,17 @@ let tableColumns: ColumnsType = [ title: t('views.dashboard.ue.time'), dataIndex: 'eventJSON', align: 'left', - width: 150, + width: 250, customRender(opt) { const record = opt.value; + console.log(record); if (record?.time) { - return record.time; + return parseDateToStr(record.time); } - return parseDateToStr(+record.timestamp * 1000); + if (record?.timestamp) { + return parseDateToStr(+record.timestamp * 1000); + } + return ''; }, }, { diff --git a/src/views/dashboard/mmeUE/index.vue b/src/views/dashboard/mmeUE/index.vue index 5b07654e..7c6fdf91 100644 --- a/src/views/dashboard/mmeUE/index.vue +++ b/src/views/dashboard/mmeUE/index.vue @@ -157,13 +157,16 @@ let tableColumns: ColumnsType = [ title: t('views.dashboard.ue.time'), dataIndex: 'eventJSON', align: 'left', - width: 150, + width: 250, customRender(opt) { const record = opt.value; if (record?.time) { - return record.time; + return parseDateToStr(record.time); } - return parseDateToStr(+record.timestamp * 1000); + if (record?.timestamp) { + return parseDateToStr(+record.timestamp * 1000); + } + return ''; }, }, { diff --git a/src/views/dashboard/smfCDR/index.vue b/src/views/dashboard/smfCDR/index.vue index ebd40147..0f41f2ab 100644 --- a/src/views/dashboard/smfCDR/index.vue +++ b/src/views/dashboard/smfCDR/index.vue @@ -23,6 +23,7 @@ import { listTenant } from '@/api/system/tenant'; import dayjs, { Dayjs } from 'dayjs'; import { useClipboard } from '@vueuse/core'; import { parseSizeFromByte } from '@/utils/parse-utils'; +import { parseDateToStr } from '@/utils/date-utils'; const { copy } = useClipboard({ legacy: true }); const { t } = useI18n(); const ws = new WS(); @@ -240,10 +241,10 @@ let tableColumns = ref([ title: t('views.dashboard.cdr.invocationTime'), // 调用时间 dataIndex: 'cdrJSON', align: 'left', - width: 200, + width: 250, customRender(opt) { const cdrJSON = opt.value; - return cdrJSON.invocationTimestamp; + return parseDateToStr(cdrJSON.invocationTimestamp); }, }, { @@ -801,7 +802,7 @@ onBeforeUnmount(() => {
{{ t('views.dashboard.cdr.time') }}: - {{ record.cdrJSON.invocationTimestamp }} + {{ parseDateToStr(record.cdrJSON.invocationTimestamp) }}
{{ t('views.dashboard.cdr.rowInfo') }} diff --git a/src/views/dashboard/smfCDRByIMSI/index.vue b/src/views/dashboard/smfCDRByIMSI/index.vue index d6dba40b..1b597470 100644 --- a/src/views/dashboard/smfCDRByIMSI/index.vue +++ b/src/views/dashboard/smfCDRByIMSI/index.vue @@ -37,6 +37,7 @@ import { parseSizeFromByte } from '@/utils/parse-utils'; import { message } from 'ant-design-vue'; import useNeInfoStore from '@/store/modules/neinfo'; import dayjs, { Dayjs } from 'dayjs'; +import { parseDateToStr } from '@/utils/date-utils'; const { t, currentLocale } = useI18n(); const ws = new WS(); @@ -379,7 +380,10 @@ function fnRanderChartDataLoad() { break; } // 时间 - const dataTime = item.cdrJSON.invocationTimestamp; + const dataTime = parseDateToStr( + item.cdrJSON.invocationTimestamp, + 'HH:mm:ss' + ); const listOfMultipleUnitUsage = item.cdrJSON.listOfMultipleUnitUsage; if ( !Array.isArray(listOfMultipleUnitUsage) || @@ -684,7 +688,12 @@ onBeforeUnmount(() => {
- + {{ state.dataUsage[0] }} diff --git a/src/views/dashboard/smscCDR/index.vue b/src/views/dashboard/smscCDR/index.vue index a5176e33..fc8219a2 100644 --- a/src/views/dashboard/smscCDR/index.vue +++ b/src/views/dashboard/smscCDR/index.vue @@ -201,13 +201,13 @@ let tableColumns: ColumnsType = [ title: t('views.dashboard.cdr.time'), dataIndex: 'cdrJSON', align: 'left', - width: 200, + width: 250, customRender(opt) { const cdrJSON = opt.value; if (typeof cdrJSON.updateTime === 'number') { return parseDateToStr(+cdrJSON.updateTime * 1000); } - return cdrJSON.updateTime; + return parseDateToStr(cdrJSON.updateTime); }, }, { @@ -814,7 +814,7 @@ onBeforeUnmount(() => { {{ typeof record.cdrJSON.updateTime === 'number' ? parseDateToStr(+record.cdrJSON.updateTime * 1000) - : record.cdrJSON.updateTime + : parseDateToStr(record.cdrJSON.updateTime) }} diff --git a/src/views/logManage/exportFile/index.vue b/src/views/logManage/exportFile/index.vue index 5f00c5f4..b1965ebb 100644 --- a/src/views/logManage/exportFile/index.vue +++ b/src/views/logManage/exportFile/index.vue @@ -90,7 +90,7 @@ let tableColumns: ColumnsType = [ if (!opt.value) return ''; return parseDateToStr(opt.value * 1000); }, - width: 150, + width: 250, }, { title: t('views.logManage.neFile.fileName'), diff --git a/src/views/logManage/neFile/index.vue b/src/views/logManage/neFile/index.vue index a65223d5..becbff2e 100644 --- a/src/views/logManage/neFile/index.vue +++ b/src/views/logManage/neFile/index.vue @@ -88,7 +88,7 @@ let tableColumns: ColumnsType = [ if (!opt.value) return ''; return parseDateToStr(opt.value * 1000); }, - width: 150, + width: 250, }, { title: t('views.logManage.neFile.fileName'), diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue index 30089bc6..991cba3f 100644 --- a/src/views/monitor/job/log.vue +++ b/src/views/monitor/job/log.vue @@ -152,7 +152,7 @@ let tableColumns: ColumnsType = [ title: t('views.monitor.jobLog.createTime'), dataIndex: 'createTime', align: 'center', - width: 150, + width: 250, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/ne/neConfigBackup/index.vue b/src/views/ne/neConfigBackup/index.vue index e45e50c0..68013c2a 100644 --- a/src/views/ne/neConfigBackup/index.vue +++ b/src/views/ne/neConfigBackup/index.vue @@ -103,7 +103,7 @@ let tableColumns = ref([ if (!opt.value) return ''; return parseDateToStr(opt.value); }, - width: 150, + width: 250, }, { title: t('views.ne.neConfigBackup.name'), diff --git a/src/views/ne/neHost/index.vue b/src/views/ne/neHost/index.vue index 98fbff28..afd3d25a 100644 --- a/src/views/ne/neHost/index.vue +++ b/src/views/ne/neHost/index.vue @@ -134,7 +134,7 @@ let tableColumns: ColumnsType = [ title: t('common.createTime'), dataIndex: 'createTime', align: 'left', - width: 150, + width: 250, customRender(opt) { if (!opt.value) return ''; return parseDateToStr(opt.value); diff --git a/src/views/ne/neHostCommand/index.vue b/src/views/ne/neHostCommand/index.vue index 954f0124..d4db7454 100644 --- a/src/views/ne/neHostCommand/index.vue +++ b/src/views/ne/neHostCommand/index.vue @@ -107,7 +107,7 @@ let tableColumns: ColumnsType = [ title: t('common.createTime'), dataIndex: 'createTime', align: 'left', - width: 150, + width: 250, customRender(opt) { if (!opt.value) return ''; return parseDateToStr(opt.value); diff --git a/src/views/ne/neLicense/index.vue b/src/views/ne/neLicense/index.vue index ff673808..5383798d 100644 --- a/src/views/ne/neLicense/index.vue +++ b/src/views/ne/neLicense/index.vue @@ -131,7 +131,7 @@ let tableColumns = ref([ if (!opt.value) return ''; return parseDateToStr(opt.value); }, - width: 200, + width: 250, }, { title: t('common.operate'), diff --git a/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue b/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue index 6cea5580..c8b2a00a 100644 --- a/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue +++ b/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue @@ -54,7 +54,7 @@ let tableColumns: ColumnsType = [ title: t('common.createTime'), dataIndex: 'createTime', align: 'left', - width: 150, + width: 250, customRender(opt) { if (!opt.value) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/ne/neSoftware/index.vue b/src/views/ne/neSoftware/index.vue index f919222e..a8b0dbc7 100644 --- a/src/views/ne/neSoftware/index.vue +++ b/src/views/ne/neSoftware/index.vue @@ -127,7 +127,7 @@ let tableColumns = ref([ if (!opt.value) return ''; return parseDateToStr(opt.value); }, - width: 150, + width: 250, }, { title: t('common.operate'), diff --git a/src/views/ne/neVersion/index.vue b/src/views/ne/neVersion/index.vue index cf7ad770..5d122745 100644 --- a/src/views/ne/neVersion/index.vue +++ b/src/views/ne/neVersion/index.vue @@ -151,7 +151,7 @@ let tableColumns = ref([ if (!opt.value) return ''; return parseDateToStr(opt.value); }, - width: 150, + width: 250, }, { title: t('common.operate'), diff --git a/src/views/neUser/exportFile/index.vue b/src/views/neUser/exportFile/index.vue index 8ddca198..fdf5149a 100644 --- a/src/views/neUser/exportFile/index.vue +++ b/src/views/neUser/exportFile/index.vue @@ -85,7 +85,7 @@ let tableColumns: ColumnsType = [ if (!opt.value) return ''; return parseDateToStr(opt.value * 1000); }, - width: 150, + width: 250, }, { title: t('views.logManage.neFile.fileName'), diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index 96f3159b..9fde1495 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -130,7 +130,7 @@ let tableColumns = ref([ title: t('views.system.config.createTime'), dataIndex: 'createTime', align: 'center', - width: 150, + width: 250, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index b51faeb4..279f7bc9 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -108,7 +108,7 @@ let tableColumns: ColumnsType = [ title: t('views.system.dept.createTime'), dataIndex: 'createTime', align: 'center', - width: 150, + width: 250, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index 9a5a17c3..381f4a1c 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -180,7 +180,7 @@ let tableColumns: ColumnsType = [ title: t('views.system.dictData.createTime'), dataIndex: 'createTime', align: 'left', - width: 150, + width: 250, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 2e97d0d7..f094781a 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -128,7 +128,7 @@ let tableColumns: ColumnsType = [ title: t('views.system.dict.createTime'), dataIndex: 'createTime', align: 'center', - width: 150, + width: 250, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/system/log/login/index.vue b/src/views/system/log/login/index.vue index ee1e0ee7..38dc1468 100644 --- a/src/views/system/log/login/index.vue +++ b/src/views/system/log/login/index.vue @@ -140,8 +140,8 @@ let tableColumns: ColumnsType = [ { title: t('views.system.log.login.loginTime'), dataIndex: 'loginTime', - align: 'center', - width: 200, + align: 'left', + width: 250, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/system/log/operate/index.vue b/src/views/system/log/operate/index.vue index d488a017..bdf8221e 100644 --- a/src/views/system/log/operate/index.vue +++ b/src/views/system/log/operate/index.vue @@ -162,8 +162,8 @@ let tableColumns: ColumnsType = [ { title: t('views.system.log.operate.operDate'), dataIndex: 'operTime', - align: 'center', - width: 150, + align: 'left', + width: 250, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 989ddd02..f3bea8cb 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -158,8 +158,8 @@ let tableColumns: ColumnsType = [ { title: t('views.system.menu.createTime'), dataIndex: 'createTime', - align: 'center', - width: 150, + align: 'left', + width: 250, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index baf5ce60..6b211d16 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -117,8 +117,8 @@ let tableColumns: ColumnsType = [ { title: t('views.system.post.createTime'), dataIndex: 'createTime', - align: 'center', - width: 150, + align: 'left', + width: 250, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/tenant/imsCDR/index.vue b/src/views/tenant/imsCDR/index.vue index 505ad7e5..183faaa7 100644 --- a/src/views/tenant/imsCDR/index.vue +++ b/src/views/tenant/imsCDR/index.vue @@ -203,7 +203,7 @@ let tableColumns: ColumnsType = [ if (typeof cdrJSON.releaseTime === 'number') { return parseDateToStr(+cdrJSON.releaseTime * 1000); } - return cdrJSON.releaseTime; + return parseDateToStr(cdrJSON.releaseTime); }, }, ]; @@ -735,7 +735,7 @@ onBeforeUnmount(() => {
{{ t('views.dashboard.cdr.releaseTime') }}: - {{ record.cdrJSON.releaseTime }} + {{ parseDateToStr(record.cdrJSON.releaseTime) }}
diff --git a/src/views/tenant/operate/index.vue b/src/views/tenant/operate/index.vue index ef450ad3..8c1eb3bd 100644 --- a/src/views/tenant/operate/index.vue +++ b/src/views/tenant/operate/index.vue @@ -155,7 +155,7 @@ let tableColumns: ColumnsType = [ title: t('views.system.log.operate.operDate'), dataIndex: 'operTime', align: 'center', - width: 150, + width: 250, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); diff --git a/src/views/tenant/smfCDR/index.vue b/src/views/tenant/smfCDR/index.vue index 2f38362b..081b0948 100644 --- a/src/views/tenant/smfCDR/index.vue +++ b/src/views/tenant/smfCDR/index.vue @@ -18,6 +18,7 @@ import { import { OptionsType, WS } from '@/plugins/ws-websocket'; import PQueue from 'p-queue'; import saveAs from 'file-saver'; +import { parseDateToStr } from '@/utils/date-utils'; const { t } = useI18n(); const ws = new WS(); const queue = new PQueue({ concurrency: 1, autoStart: true }); @@ -199,7 +200,7 @@ let tableColumns: ColumnsType = [ width: 200, customRender(opt) { const cdrJSON = opt.value; - return cdrJSON.invocationTimestamp; + return parseDateToStr(cdrJSON.invocationTimestamp); }, }, ]; @@ -593,7 +594,7 @@ onBeforeUnmount(() => {
{{ t('views.dashboard.cdr.time') }}: - {{ record.cdrJSON.invocationTimestamp }} + {{ parseDateToStr(record.cdrJSON.invocationTimestamp) }}
{{ t('views.dashboard.cdr.rowInfo') }} diff --git a/src/views/tenant/smscCDR/index.vue b/src/views/tenant/smscCDR/index.vue index 8ec78d5c..9eb1fe54 100644 --- a/src/views/tenant/smscCDR/index.vue +++ b/src/views/tenant/smscCDR/index.vue @@ -171,7 +171,7 @@ let tableColumns: ColumnsType = [ if (typeof cdrJSON.updateTime === 'number') { return parseDateToStr(+cdrJSON.updateTime * 1000); } - return cdrJSON.updateTime; + return parseDateToStr(cdrJSON.updateTime); }, }, ]; @@ -580,7 +580,7 @@ onBeforeUnmount(() => { {{ typeof record.cdrJSON.updateTime === 'number' ? parseDateToStr(+record.cdrJSON.updateTime * 1000) - : record.cdrJSON.updateTime + : parseDateToStr(record.cdrJSON.updateTime) }} diff --git a/src/views/traceManage/pcap/file.vue b/src/views/traceManage/pcap/file.vue index 45ad526e..f5ae6271 100644 --- a/src/views/traceManage/pcap/file.vue +++ b/src/views/traceManage/pcap/file.vue @@ -79,7 +79,7 @@ let tableColumns: ColumnsType = reactive([ if (!opt.value) return ''; return parseDateToStr(opt.value * 1000); }, - width: 200, + width: 250, }, { title: t('views.logManage.neFile.fileName'),