From 7e28df210db0729efe3084c1905983aa06936e6f Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 7 Mar 2024 16:58:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20UE-PCF=E9=A1=B5=E9=9D=A2=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/neUser/pcf.ts          | 36 ++++++++++++++--------
 src/views/neUser/pcf/index.vue | 55 +++++++++++++++++++++++-----------
 2 files changed, 61 insertions(+), 30 deletions(-)

diff --git a/src/api/neUser/pcf.ts b/src/api/neUser/pcf.ts
index bcd663d4..77109c77 100644
--- a/src/api/neUser/pcf.ts
+++ b/src/api/neUser/pcf.ts
@@ -138,12 +138,18 @@ export async function batchUpdateRule(data: Record<string, any>) {
     data: data,
   });
   // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS && result.data?.status) {
-    return {
-      code: RESULT_CODE_ERROR,
-      msg: result.data?.cause,
-      data: result.data,
-    };
+  if (result.code === RESULT_CODE_SUCCESS) {
+    if (result.data?.status) {
+      return {
+        code: RESULT_CODE_ERROR,
+        msg: result.data?.cause,
+        data: result.data,
+      };
+    }
+    if (result.data?.data) {
+      result.data = result.data.data;
+      return result;
+    }
   }
   return result;
 }
@@ -182,12 +188,18 @@ export async function batchAddRule(data: Record<string, any>) {
     data: data,
   });
   // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS && result.data?.status) {
-    return {
-      code: RESULT_CODE_ERROR,
-      msg: result.data?.cause,
-      data: result.data,
-    };
+  if (result.code === RESULT_CODE_SUCCESS) {
+    if (result.data?.status) {
+      return {
+        code: RESULT_CODE_ERROR,
+        msg: result.data?.cause,
+        data: result.data,
+      };
+    }
+    if (result.data?.data) {
+      result.data = result.data.data;
+      return result;
+    }
   }
   return result;
 }
diff --git a/src/views/neUser/pcf/index.vue b/src/views/neUser/pcf/index.vue
index d348179e..f4258d55 100644
--- a/src/views/neUser/pcf/index.vue
+++ b/src/views/neUser/pcf/index.vue
@@ -76,62 +76,62 @@ let tableColumns: ColumnsType = [
     title: 'IMSI',
     dataIndex: 'imsi',
     sorter: (a: any, b: any) => Number(a.imsi) - Number(b.imsi),
-    align: 'center',
+    align: 'left',
     width: 150,
   },
   {
     title: 'MSISDN',
     dataIndex: 'msisdn',
     sorter: (a: any, b: any) => Number(a.msisdn) - Number(b.msisdn),
-    align: 'center',
+    align: 'left',
     width: 150,
   },
   {
     title: 'SAR',
     dataIndex: 'sar',
-    align: 'center',
-    width: 80,
+    align: 'left',
+    width: 50,
   },
   {
     title: 'RFSP',
     dataIndex: 'rfsp',
-    align: 'center',
+    align: 'left',
     width: 50,
   },
   {
     title: 'QOS Video',
     dataIndex: 'qosVideo',
-    align: 'center',
+    align: 'left',
     width: 100,
   },
   {
     title: 'QOS Audio',
     dataIndex: 'qosAudio',
-    align: 'center',
+    align: 'left',
     width: 100,
   },
   {
     title: 'PCC Rules',
     dataIndex: 'pccRules',
-    align: 'center',
+    align: 'left',
     width: 120,
   },
   {
     title: 'SESS Rules',
     dataIndex: 'sessRules',
-    align: 'center',
+    align: 'left',
     width: 120,
   },
   {
     title: 'HDR Enrich',
     dataIndex: 'hdrEnrich',
-    align: 'center',
+    align: 'left',
     width: 100,
   },
   {
     title: 'UE Policy',
     dataIndex: 'uePolicy',
-    align: 'center',
+    align: 'left',
     width: 100,
   },
   {
@@ -288,10 +288,28 @@ function fnModalOk() {
       result
         .then((res: any) => {
           if (res.code === RESULT_CODE_SUCCESS) {
-            message.success({
-              content: t('common.msgSuccess', { msg: modalState.title }),
-              duration: 3,
-            });
+            if (modalState.isBatch) {
+              let okTip = '';
+              if (modalState.type === 'add') {
+                okTip = res.data;
+              }
+              if (modalState.type === 'update') {
+                okTip = res.data;
+              }
+              if (modalState.type === 'delete') {
+                okTip = t('common.msgSuccess', { msg: modalState.title });
+              }
+              message.success({
+                content: okTip,
+                duration: 5,
+              });
+            } else {
+              message.success({
+                content: t('common.msgSuccess', { msg: modalState.title }),
+                duration: 3,
+              });
+            }
+
             fnModalCancel();
             fnGetList();
           } else {
@@ -360,7 +378,7 @@ function fnRecordDelete(row: Record<string, any>) {
         if (res.code === RESULT_CODE_SUCCESS) {
           message.success({
             content: t('common.msgSuccess', {
-              msg: row.imsi + t('common.deleteText'),
+              msg: `${t('common.deleteText')} ${row.imsi}`,
             }),
             key,
             duration: 2,
@@ -472,8 +490,9 @@ function fnModalUploadImportUpload(file: File) {
       return res;
     })
     .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS && res.data?.filePath) {
-        uploadImportState.msg = t('views.neUser.pcf.uploadFileOk');
+      if (res.code === RESULT_CODE_SUCCESS && res.data?.data) {
+        uploadImportState.msg = res.data?.data;
+        // uploadImportState.msg = t('views.neUser.pcf.uploadFileOk');
       } else if (res.code === RESULT_CODE_SUCCESS && res.data?.detail) {
         uploadImportState.msg = res.data?.detail;
       } else {