From 26da73654f2a7df2e102668f9692be2fdfed9d9a Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 22 Jul 2025 18:51:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E7=9B=982=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BA=8B=E4=BB=B6=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/IMSActivity/index.vue          | 34 +++++++++----
 .../components/UserActivity/index.vue         | 48 ++++++++-----------
 2 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/views/dashboard/overview2/components/IMSActivity/index.vue b/src/views/dashboard/overview2/components/IMSActivity/index.vue
index ca2aa043..fe680a24 100644
--- a/src/views/dashboard/overview2/components/IMSActivity/index.vue
+++ b/src/views/dashboard/overview2/components/IMSActivity/index.vue
@@ -66,12 +66,19 @@ onMounted(() => {
   <div class="activty">
     <template v-for="item in eventData" :key="item.eId">
       <!-- CDR事件IMS -->
-      <div class="card-cdr" :class="{ active: item.eId === eventId }" v-if="item.eType === 'ims_cdr'">
+      <div
+        class="card-cdr"
+        :class="{ active: item.eId === eventId }"
+        v-if="item.eType === 'ims_cdr'"
+      >
         <div class="card-cdr-item">
           <div>
             {{ t('views.dashboard.overview.userActivity.type') }}:&nbsp;
             <span>
-              <DictTag :options="dict.cdrCallType" :value="item.data.callType" />
+              <DictTag
+                :options="dict.cdrCallType"
+                :value="item.data.callType"
+              />
             </span>
           </div>
           <div></div>
@@ -109,8 +116,17 @@ onMounted(() => {
         <div>
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span v-if="item.data.callType !== 'sms'">
-            <DictTag :options="dict.cdrSipCode" :value="item.data.cause" value-default="0" />&nbsp;&nbsp;
-            <DictTag :options="dict.cdrSipCodeCause" :value="item.data.cause" value-default="0" />
+            <DictTag
+              :options="dict.cdrSipCode"
+              :value="item.data.cause"
+              value-default="0"
+            />
+            &nbsp;-&nbsp;
+            <DictTag
+              :options="dict.cdrSipCodeCause"
+              :value="item.data.cause"
+              value-default="0"
+            />
           </span>
           <span v-else>
             {{ t('views.dashboard.overview.userActivity.resultOK') }}
@@ -145,7 +161,7 @@ onMounted(() => {
       flex-direction: row;
       justify-content: flex-start;
 
-      &>div {
+      & > div {
         width: 50%;
         white-space: nowrap;
         text-align: start;
@@ -159,7 +175,7 @@ onMounted(() => {
       flex-direction: row;
       justify-content: flex-start;
 
-      &>div {
+      & > div {
         width: 33%;
       }
     }
@@ -181,7 +197,7 @@ onMounted(() => {
       flex-direction: row;
       justify-content: flex-start;
 
-      &>div {
+      & > div {
         flex: 1;
         white-space: nowrap;
         text-align: start;
@@ -207,7 +223,7 @@ onMounted(() => {
       &-item {
         display: block;
 
-        &>div {
+        & > div {
           width: 100%;
         }
       }
@@ -217,7 +233,7 @@ onMounted(() => {
       &-item {
         display: block;
 
-        &>div {
+        & > div {
           width: 100%;
         }
       }
diff --git a/src/views/dashboard/overview2/components/UserActivity/index.vue b/src/views/dashboard/overview2/components/UserActivity/index.vue
index 614b19a2..ed46022f 100644
--- a/src/views/dashboard/overview2/components/UserActivity/index.vue
+++ b/src/views/dashboard/overview2/components/UserActivity/index.vue
@@ -84,38 +84,35 @@ onMounted(() => {
           <div></div>
         </div>
 
-        <div class="card-ue-w33" v-if="item.type === 'auth-result'">
+        <div class="card-ue-w33" v-if="item.type === 'Auth'">
           <div>
-            GNB ID: <span>{{ item.data.gNBID }}</span>
+            GNB ID: <span>{{ item.data.nbId }}</span>
           </div>
           <div>
-            Cell ID: <span>{{ item.data.cellID }}</span>
+            Cell ID: <span>{{ item.data.cellId }}</span>
           </div>
           <div>
-            TAC ID: <span>{{ item.data.tacID }}</span>
+            TAC ID: <span>{{ item.data.tac }}</span>
           </div>
         </div>
         <div>
           {{ t('views.dashboard.overview.userActivity.time') }}:
-          <template v-if="item.data?.time">
-            {{ parseDateToStr(item.data.time) }}
-          </template>
-          <template v-else-if="item.data?.timestamp">
-            {{ parseDateToStr(+item.data.timestamp * 1000) }}
+          <template v-if="item.data?.recordTime">
+            {{ parseDateToStr(item.data.recordTime) }}
           </template>
           <template v-else> - </template>
         </div>
-        <div v-if="item.type === 'auth-result'">
+        <div v-if="item.type === 'Auth'">
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span>
             <DictTag :options="dict.ueAauthCode" :value="item.data.result" />
           </span>
         </div>
-        <div v-if="item.type === 'detach'">
+        <div v-if="item.type === 'Detach'">
           {{ t('views.dashboard.overview.userActivity.result') }}:
           <span>{{ t('views.dashboard.overview.userActivity.resultOK') }}</span>
         </div>
-        <div class="card-ue-w33" v-if="item.type === 'cm-state'">
+        <div class="card-ue-w33" v-if="item.type === 'CM'">
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span>
             <DictTag :options="dict.ueEventCmState" :value="item.data.result" />
@@ -131,7 +128,7 @@ onMounted(() => {
         <div class="card-ue-item">
           <div>
             {{ t('views.dashboard.overview.userActivity.type') }}:&nbsp;
-            <span v-if="item.type === 'cm-state'">
+            <span v-if="item.type === 'CM'">
               {{
                 dict.ueEventType
                   .find(s => s.value === item.type)
@@ -148,42 +145,35 @@ onMounted(() => {
           <div></div>
         </div>
 
-        <div class="card-ue-w33" v-if="item.type === 'auth-result'">
+        <div class="card-ue-w33" v-if="item.type === 'Auth'">
           <div>
-            ENB ID: <span>{{ item.data.eNBID }}</span>
+            ENB ID: <span>{{ item.data.nbId }}</span>
           </div>
           <div>
-            Cell ID: <span>{{ item.data.cellID }}</span>
+            Cell ID: <span>{{ item.data.cellId }}</span>
           </div>
           <div>
-            TAC ID: <span>{{ item.data.tacID }}</span>
+            TAC ID: <span>{{ item.data.tac }}</span>
           </div>
         </div>
         <div>
           {{ t('views.dashboard.overview.userActivity.time') }}:
-          <template v-if="item.data?.time">
-            {{ parseDateToStr(item.data.time) }}
-          </template>
-          <template v-else-if="item.data?.timestamp">
-            {{
-              typeof item.data?.timestamp === 'number'
-                ? parseDateToStr(+item.data?.timestamp * 1000)
-                : parseDateToStr(item.data?.timestamp)
-            }}
+          <template v-if="item.data?.recordTime">
+            {{ parseDateToStr(item.data.recordTime) }}
           </template>
           <template v-else> - </template>
         </div>
-        <div v-if="item.type === 'auth-result'">
+        <div v-if="item.type === 'Auth'">
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span>
             <DictTag :options="dict.ueAauthCode" :value="item.data.result" />
           </span>
         </div>
-        <div v-if="item.type === 'detach'">
+        <div v-if="item.type === 'Detach'">
           {{ t('views.dashboard.overview.userActivity.result') }}:
           <span>{{ t('views.dashboard.overview.userActivity.resultOK') }}</span>
         </div>
-        <div class="card-ue-w33" v-if="item.type === 'cm-state'">
+        <div class="card-ue-w33" v-if="item.type === 'CM'">
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span>
             <DictTag :options="dict.ueEventCmState" :value="item.data.result" />