From af1ce320637919c96a8db11b0184c2e30bb050cc Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 19 Sep 2024 11:49:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4SMF=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E6=98=BE=E7=A4=BAimsi=E5=A4=87=E6=B3=A8=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/neData/smf.ts         | 13 +++++++++++++
 src/views/neUser/ue/index.vue | 36 +++++++++++++++++------------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/api/neData/smf.ts b/src/api/neData/smf.ts
index 4139c3ed..02b20e2f 100644
--- a/src/api/neData/smf.ts
+++ b/src/api/neData/smf.ts
@@ -40,3 +40,16 @@ export function exportSMFDataCDR(data: Record<string, any>) {
     timeout: 60_000,
   });
 }
+
+/**
+ * SMF-在线订阅用户列表信息
+ * @param query 查询参数
+ * @returns object
+ */
+export function listSMFSubscribers(query: Record<string, any>) {
+  return request({
+    url: '/neData/smf/subscribers',
+    method: 'get',
+    params: query,
+  });
+}
diff --git a/src/views/neUser/ue/index.vue b/src/views/neUser/ue/index.vue
index 50d622aa..08dc9729 100644
--- a/src/views/neUser/ue/index.vue
+++ b/src/views/neUser/ue/index.vue
@@ -5,7 +5,7 @@ import { message } from 'ant-design-vue/lib';
 import { SizeType } from 'ant-design-vue/lib/config-provider';
 import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/lib/table';
-import { listUEInfoBySMF } from '@/api/neUser/smf';
+import { listSMFSubscribers } from '@/api/neData/smf';
 import useNeInfoStore from '@/store/modules/neinfo';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
@@ -51,8 +51,6 @@ type TabeStateType = {
   seached: boolean;
   /**记录数据 */
   data: object[];
-  /**勾选记录 */
-  selectedRowKeys: (string | number)[];
 };
 
 /**表格状态 */
@@ -61,7 +59,6 @@ let tableState: TabeStateType = reactive({
   size: 'middle',
   seached: true,
   data: [],
-  selectedRowKeys: [],
 });
 
 /**表格字段列 */
@@ -69,7 +66,7 @@ let tableColumns: ColumnsType = [
   {
     title: 'IMSI',
     dataIndex: 'imsi',
-    align: 'center',
+    align: 'left',
     sorter: (a: any, b: any) => Number(a.imsi) - Number(b.imsi),
     customRender(opt) {
       const idx = opt.value.lastIndexOf('-');
@@ -83,7 +80,7 @@ let tableColumns: ColumnsType = [
   {
     title: 'MSISDN',
     dataIndex: 'msisdn',
-    align: 'center',
+    align: 'left',
     sorter: (a: any, b: any) => Number(a.msisdn) - Number(b.msisdn),
     customRender(opt) {
       const idx = opt.value.lastIndexOf('-');
@@ -97,7 +94,7 @@ let tableColumns: ColumnsType = [
   {
     title: 'RAT Type',
     dataIndex: 'ratType',
-    align: 'center',
+    align: 'left',
     width: 100,
   },
   {
@@ -116,12 +113,18 @@ let tableColumns: ColumnsType = [
       }
       return '';
     },
-    width: 150,
+    width: 200,
   },
   {
     title: t('common.operate'),
     key: 'imsi',
     align: 'left',
+    width: 100,
+  },
+  {
+    title: 'Remark',
+    dataIndex: 'remark',
+    align: 'left',
   },
 ];
 
@@ -220,12 +223,8 @@ function fnGetList(pageNum?: number) {
   if (pageNum) {
     queryParams.pageNum = pageNum;
   }
-  listUEInfoBySMF(toRaw(queryParams)).then(res => {
+  listSMFSubscribers(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
-      // 取消勾选
-      if (tableState.selectedRowKeys.length > 0) {
-        tableState.selectedRowKeys = [];
-      }
       tablePagination.total = res.total;
       tableState.data = res.rows;
       if (
@@ -286,7 +285,7 @@ onMounted(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="8" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24">
             <a-form-item :label="t('views.neUser.ue.neType')" name="neId ">
               <a-select
                 v-model:value="queryParams.neId"
@@ -295,18 +294,17 @@ onMounted(() => {
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="8" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24">
             <a-form-item label="IMSI" name="imsi">
               <a-input v-model:value="queryParams.imsi" allow-clear></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="8" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24">
             <a-form-item label="MSISDN" name="msisdn">
               <a-input v-model:value="queryParams.msisdn" allow-clear></a-input>
             </a-form-item>
           </a-col>
-
-          <a-col :lg="8" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
                 <a-button type="primary" @click.prevent="fnGetList(1)">
@@ -382,7 +380,7 @@ onMounted(() => {
         :data-source="tableState.data"
         :size="tableState.size"
         :pagination="tablePagination"
-        :scroll="{ x: 1000, y: 400 }"
+        :scroll="{ x: true, y: 400 }"
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'imsi'">