From 249c9a5a6e21ff7555d658c4c028c0eb6fd6e751 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Thu, 17 Oct 2024 11:03:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/imsCDR/index.vue  | 16 +++++++---------
 src/views/dashboard/smfCDR/index.vue  |  2 +-
 src/views/dashboard/smscCDR/index.vue |  2 +-
 src/views/neUser/ims/index.vue        | 16 +++++++---------
 src/views/neUser/sub/index.vue        |  2 +-
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/views/dashboard/imsCDR/index.vue b/src/views/dashboard/imsCDR/index.vue
index 0cc24ba0..a93a455e 100644
--- a/src/views/dashboard/imsCDR/index.vue
+++ b/src/views/dashboard/imsCDR/index.vue
@@ -187,13 +187,6 @@ let tableColumns: ColumnsType = [
     align: 'left',
     width: 150,
   },
-  {
-    title: t('views.dashboard.cdr.tenantName'),
-    dataIndex: 'tenantName',
-    align: 'center',
-    key: 'tenantName',
-    width: 150,
-  },
   {
     title: t('views.dashboard.cdr.time'),
     dataIndex: 'cdrJSON',
@@ -204,6 +197,13 @@ let tableColumns: ColumnsType = [
       return parseDateToStr(+cdrJSON.releaseTime * 1000);
     },
   },
+  {
+    title: t('views.dashboard.cdr.tenantName'),
+    dataIndex: 'tenantName',
+    align: 'center',
+    key: 'tenantName',
+    width: 150,
+  },
   {
     title: t('common.operate'),
     key: 'id',
@@ -458,8 +458,6 @@ function wsMessage(res: Record<string, any>) {
   }
 }
 
-
-
 onMounted(() => {
   // 初始字典数据
   Promise.allSettled([getDict('cdr_sip_code'), getDict('cdr_call_type')]).then(
diff --git a/src/views/dashboard/smfCDR/index.vue b/src/views/dashboard/smfCDR/index.vue
index fdc36601..a26cc3f0 100644
--- a/src/views/dashboard/smfCDR/index.vue
+++ b/src/views/dashboard/smfCDR/index.vue
@@ -215,7 +215,7 @@ let tableColumns: ColumnsType = [
     },
   },
   {
-    title: 'Tenant Name',
+    title: t('views.dashboard.cdr.tenantName'),
     dataIndex: 'tenantName',
     align: 'center',
     key: 'tenantName',
diff --git a/src/views/dashboard/smscCDR/index.vue b/src/views/dashboard/smscCDR/index.vue
index 69aa41e2..80635720 100644
--- a/src/views/dashboard/smscCDR/index.vue
+++ b/src/views/dashboard/smscCDR/index.vue
@@ -187,7 +187,7 @@ let tableColumns: ColumnsType = [
     },
   },
   {
-    title: 'Tenant Name',
+    title: t('views.dashboard.cdr.tenantName'),
     dataIndex: 'tenantName',
     align: 'center',
     key: 'tenantName',
diff --git a/src/views/neUser/ims/index.vue b/src/views/neUser/ims/index.vue
index 0fe30bc2..5800a374 100644
--- a/src/views/neUser/ims/index.vue
+++ b/src/views/neUser/ims/index.vue
@@ -86,13 +86,6 @@ let tableColumns: ColumnsType = [
     align: 'center',
     width: 150,
   },
-  {
-    title: 'Tenant Name',
-    dataIndex: 'tenantName',
-    align: 'center',
-    key: 'tenantName',
-    width: 150,
-  },
   {
     title: 'Barring',
     dataIndex: 'barring',
@@ -111,6 +104,13 @@ let tableColumns: ColumnsType = [
     align: 'center',
     width: 150,
   },
+  {
+    title: 'Tenant Name',
+    dataIndex: 'tenantName',
+    align: 'center',
+    key: 'tenantName',
+    width: 150,
+  },
   {
     title: 'IMPU',
     dataIndex: 'impu',
@@ -182,8 +182,6 @@ function fnGetList(pageNum?: number) {
   });
 }
 
-
-
 onMounted(() => {
   // 获取网元网元列表
   useNeInfoStore()
diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index 08f2086a..346557c4 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -867,7 +867,7 @@ function fnRecordExport(type: string = 'txt') {
         row.apnContext,
         row.staticIp,
       ].join(',');
-      content += `${row.imsi},${row.msisdn},${row.ambr},${row.nssai},${row.arfb},${row.sar},${row.rat},${row.cn},${row.smfSel},${row.smData},${row.tenantName},${epsDat}\r\n`;
+      content += `${row.imsi},${row.msisdn},${row.ambr},${row.nssai},${row.arfb},${row.sar},${row.rat},${row.cn},${row.smfSel},${row.smData},${epsDat},${row.tenantName}\r\n`;
     }
   }
   if (type == 'csv') {