fix: 修复 租户页面合并问题

This commit is contained in:
TsMask
2024-12-09 17:03:29 +08:00
parent a95a96dfc0
commit e11cb11ec9
12 changed files with 54 additions and 1228 deletions

View File

@@ -12,7 +12,7 @@ import {
} from '@/constants/result-constants';
import useNeInfoStore from '@/store/modules/neinfo';
import { exportSMSCDataCDR, listSMSCDataCDR } from '@/api/neData/smsc';
import { parseDateToStr, parseDuration } from '@/utils/date-utils';
import { parseDateToStr } from '@/utils/date-utils';
import { OptionsType, WS } from '@/plugins/ws-websocket';
import saveAs from 'file-saver';
import PQueue from 'p-queue';
@@ -168,7 +168,10 @@ let tableColumns: ColumnsType = [
width: 150,
customRender(opt) {
const cdrJSON = opt.value;
return parseDateToStr(+cdrJSON.updateTime * 1000);
if (typeof cdrJSON.updateTime === 'number') {
return parseDateToStr(+cdrJSON.updateTime * 1000);
}
return cdrJSON.updateTime;
},
},
];
@@ -573,7 +576,13 @@ onBeforeUnmount(() => {
</div>
<div>
<span>{{ t('views.dashboard.cdr.time') }}: </span>
<span>{{ parseDateToStr(+record.timestamp * 1000) }}</span>
<span>
{{
typeof record.cdrJSON.updateTime === 'number'
? parseDateToStr(+record.cdrJSON.updateTime * 1000)
: record.cdrJSON.updateTime
}}
</span>
</div>
<a-divider orientation="left">
{{ t('views.dashboard.cdr.rowInfo') }}