From f66454256b0ed4407744ed155de13b3e42ec2718 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 5 Dec 2024 14:50:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20CDR=E6=97=B6=E9=97=B4=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/imsCDR/index.vue  | 29 ++++++++++++++++++++-------
 src/views/dashboard/smfCDR/index.vue  | 12 ++++++-----
 src/views/dashboard/smscCDR/index.vue | 13 ++++++++++--
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/views/dashboard/imsCDR/index.vue b/src/views/dashboard/imsCDR/index.vue
index 2e308c3a..9af65e99 100644
--- a/src/views/dashboard/imsCDR/index.vue
+++ b/src/views/dashboard/imsCDR/index.vue
@@ -589,15 +589,12 @@ onBeforeUnmount(() => {
               <a-select
                 v-model:value="recordTypes"
                 mode="multiple"
-                :options="
-                  ['MOC', 'MTC', 'MOSM', 'MTSM'].map(v => ({ value: v }))
-                "
+                :options="['MOC', 'MTC'].map(v => ({ value: v }))"
                 :placeholder="t('common.selectPlease')"
                 @change="fnQueryRecordTypeChange"
               ></a-select>
             </a-form-item>
           </a-col>
-
           <a-col :lg="8" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.time')"
@@ -805,7 +802,13 @@ onBeforeUnmount(() => {
               </div>
               <div>
                 <span>{{ t('views.dashboard.cdr.time') }}: </span>
-                <span>{{ parseDateToStr(+record.timestamp * 1000) }}</span>
+                <span>
+                  {{
+                    typeof record.cdrJSON.releaseTime === 'number'
+                      ? parseDateToStr(+record.cdrJSON.releaseTime * 1000)
+                      : record.cdrJSON.releaseTime
+                  }}
+                </span>
               </div>
             </a-col>
             <a-col :lg="6" :md="12" :xs="24">
@@ -849,11 +852,23 @@ onBeforeUnmount(() => {
               </div>
               <div>
                 <span>{{ t('views.dashboard.cdr.seizureTime') }}: </span>
-                <span>{{ record.cdrJSON.seizureTime }}</span>
+                <span>
+                  {{
+                    typeof record.cdrJSON.seizureTime === 'number'
+                      ? parseDateToStr(+record.cdrJSON.seizureTime * 1000)
+                      : record.cdrJSON.seizureTime
+                  }}
+                </span>
               </div>
               <div>
                 <span>{{ t('views.dashboard.cdr.releaseTime') }}: </span>
-                <span>{{ record.cdrJSON.releaseTime }}</span>
+                <span>
+                  {{
+                    typeof record.cdrJSON.releaseTime === 'number'
+                      ? parseDateToStr(+record.cdrJSON.releaseTime * 1000)
+                      : record.cdrJSON.releaseTime
+                  }}
+                </span>
               </div>
             </a-col>
           </a-row>
diff --git a/src/views/dashboard/smfCDR/index.vue b/src/views/dashboard/smfCDR/index.vue
index 2217e68b..652cae9c 100644
--- a/src/views/dashboard/smfCDR/index.vue
+++ b/src/views/dashboard/smfCDR/index.vue
@@ -739,7 +739,7 @@ onBeforeUnmount(() => {
               </div>
               <div>
                 <span>{{ t('views.dashboard.cdr.time') }}: </span>
-                <span>{{ parseDateToStr(+record.timestamp * 1000) }}</span>
+                <span>{{ record.cdrJSON.invocationTimestamp }}</span>
               </div>
               <a-divider orientation="left">
                 {{ t('views.dashboard.cdr.rowInfo') }}
@@ -854,10 +854,12 @@ onBeforeUnmount(() => {
               </div>
               <div>
                 <span>Network Function IPv4: </span>
-                <span>{{
-                  record.cdrJSON.nFunctionConsumerInformation
-                    .networkFunctionIPv4Address
-                }}</span>
+                <span>
+                  {{
+                    record.cdrJSON.nFunctionConsumerInformation
+                      ?.networkFunctionIPv4Address
+                  }}
+                </span>
               </div>
             </a-col>
           </a-row>
diff --git a/src/views/dashboard/smscCDR/index.vue b/src/views/dashboard/smscCDR/index.vue
index 80635720..23a522b4 100644
--- a/src/views/dashboard/smscCDR/index.vue
+++ b/src/views/dashboard/smscCDR/index.vue
@@ -183,7 +183,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;
     },
   },
   {
@@ -755,7 +758,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') }}