From 46ace81d9d4695415280a33bd94c7e950c41e555 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 15 Jul 2025 19:52:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4UE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/neData/amf.ts                         |  8 ++--
 src/api/neData/mme.ts                         |  8 ++--
 src/views/dashboard/amfUE/index.vue           | 14 +++---
 src/views/dashboard/mmeUE/index.vue           | 16 +++----
 .../components/UserActivity/index.vue         | 48 ++++++++-----------
 5 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/src/api/neData/amf.ts b/src/api/neData/amf.ts
index 77895799..824c2bb4 100644
--- a/src/api/neData/amf.ts
+++ b/src/api/neData/amf.ts
@@ -29,14 +29,14 @@ export function delAMFDataUE(ueIds: string | number) {
 
 /**
  * AMF-UE会话列表导出
- * @param data 查询列表条件
+ * @param query 查询列表条件
  * @returns object
  */
-export function exportAMFDataUE(data: Record<string, any>) {
+export function exportAMFDataUE(query: Record<string, any>) {
   return request({
     url: '/neData/amf/ue/export',
-    method: 'POST',
-    data,
+    method: 'GET',
+    params: query,
     responseType: 'blob',
     timeout: 60_000,
   });
diff --git a/src/api/neData/mme.ts b/src/api/neData/mme.ts
index 6b1bbe3b..de5f63f9 100644
--- a/src/api/neData/mme.ts
+++ b/src/api/neData/mme.ts
@@ -29,14 +29,14 @@ export function delMMEDataUE(ueIds: string | number) {
 
 /**
  * MME-UE会话列表导出
- * @param data 查询列表条件
+ * @param query 查询列表条件
  * @returns object
  */
-export function exportMMEDataUE(data: Record<string, any>) {
+export function exportMMEDataUE(query: Record<string, any>) {
   return request({
     url: '/neData/mme/ue/export',
-    method: 'POST',
-    data,
+    method: 'GET',
+    params: query,
     responseType: 'blob',
     timeout: 60_000,
   });
diff --git a/src/views/dashboard/amfUE/index.vue b/src/views/dashboard/amfUE/index.vue
index 27a5c1b9..5d6a5cba 100644
--- a/src/views/dashboard/amfUE/index.vue
+++ b/src/views/dashboard/amfUE/index.vue
@@ -174,7 +174,7 @@ let tableColumns: ColumnsType = [
       if (record?.time) {
         return record.time;
       }
-      return parseDateToStr(+record.timestamp * 1000);
+      return parseDateToStr(record.timestamp);
     },
   },
   {
@@ -685,16 +685,16 @@ onBeforeUnmount(() => {
             <DictTag :options="dict.ueEventType" :value="record.eventType" />
           </template>
           <template v-if="column.key === 'result'">
-            <span v-if="record.eventType === 'auth-result'">
+            <span v-if="record.eventType === 'Auth'">
               <DictTag
                 :options="dict.ueAauthCode"
                 :value="record.eventJSON.result"
               />
             </span>
-            <span v-if="record.eventType === 'detach'">
+            <span v-if="record.eventType === 'Detach'">
               <span>{{ t('views.dashboard.ue.resultOk') }}</span>
             </span>
-            <span v-if="record.eventType === 'cm-state'">
+            <span v-if="record.eventType === 'CM'">
               <DictTag
                 :options="dict.ueEventCmState"
                 :value="record.eventJSON.result"
@@ -766,16 +766,16 @@ onBeforeUnmount(() => {
               </div>
               <div>
                 <span>{{ t('views.dashboard.ue.result') }}: </span>
-                <span v-if="record.eventType === 'auth-result'">
+                <span v-if="record.eventType === 'Auth'">
                   <DictTag
                     :options="dict.ueAauthCode"
                     :value="record.eventJSON.result"
                   />
                 </span>
-                <span v-if="record.eventType === 'detach'">
+                <span v-if="record.eventType === 'Detach'">
                   {{ t('views.dashboard.ue.resultOk') }}
                 </span>
-                <span v-if="record.eventType === 'cm-state'">
+                <span v-if="record.eventType === 'CM'">
                   <DictTag
                     :options="dict.ueEventCmState"
                     :value="record.eventJSON.result"
diff --git a/src/views/dashboard/mmeUE/index.vue b/src/views/dashboard/mmeUE/index.vue
index 0a5c4aac..d98431df 100644
--- a/src/views/dashboard/mmeUE/index.vue
+++ b/src/views/dashboard/mmeUE/index.vue
@@ -175,7 +175,7 @@ let tableColumns: ColumnsType = [
       if (record?.time) {
         return record.time;
       }
-      return parseDateToStr(+record.timestamp * 1000);
+      return parseDateToStr(record.timestamp);
     },
   },
   {
@@ -460,7 +460,7 @@ onMounted(() => {
     if (resArr[1].status === 'fulfilled') {
       const ueEventType: any[] = JSON.parse(JSON.stringify(resArr[1].value));
       dict.ueEventType = ueEventType.map(item => {
-        if (item.value === 'cm-state') {
+        if (item.value === 'CM') {
           item.label = item.label.replace('CM', 'ECM');
         }
         return item;
@@ -693,16 +693,16 @@ onBeforeUnmount(() => {
             <DictTag :options="dict.ueEventType" :value="record.eventType" />
           </template>
           <template v-if="column.key === 'result'">
-            <span v-if="record.eventType === 'auth-result'">
+            <span v-if="record.eventType === 'Auth'">
               <DictTag
                 :options="dict.ueAauthCode"
                 :value="record.eventJSON.result"
               />
             </span>
-            <span v-if="record.eventType === 'detach'">
+            <span v-if="record.eventType === 'Detach'">
               <span>{{ t('views.dashboard.ue.resultOk') }}</span>
             </span>
-            <span v-if="record.eventType === 'cm-state'">
+            <span v-if="record.eventType === 'CM'">
               <DictTag
                 :options="dict.ueEventCmState"
                 :value="record.eventJSON.result"
@@ -774,16 +774,16 @@ onBeforeUnmount(() => {
               </div>
               <div>
                 <span>{{ t('views.dashboard.ue.result') }}: </span>
-                <span v-if="record.eventType === 'auth-result'">
+                <span v-if="record.eventType === 'Auth'">
                   <DictTag
                     :options="dict.ueAauthCode"
                     :value="record.eventJSON.result"
                   />
                 </span>
-                <span v-if="record.eventType === 'detach'">
+                <span v-if="record.eventType === 'Detach'">
                   {{ t('views.dashboard.ue.resultOk') }}
                 </span>
-                <span v-if="record.eventType === 'cm-state'">
+                <span v-if="record.eventType === 'CM'">
                   <DictTag
                     :options="dict.ueEventCmState"
                     :value="record.eventJSON.result"
diff --git a/src/views/dashboard/overview/components/UserActivity/index.vue b/src/views/dashboard/overview/components/UserActivity/index.vue
index 23ec0c35..2521c6a3 100644
--- a/src/views/dashboard/overview/components/UserActivity/index.vue
+++ b/src/views/dashboard/overview/components/UserActivity/index.vue
@@ -152,38 +152,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" />
@@ -199,7 +196,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)
@@ -216,42 +213,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" />