ims在线用户信息

src/views/dashboard/imsCDR/index.vue

@@ -462,16 +462,6 @@ onMounted(() => {
     })
     .finally(() => {
       // 获取列表数据
-      if (useUserStore().roles.includes('tenant')) {
-        const operateColumnIndex = tableColumns.findIndex(
-          column => column.key === 'tenantName'
-        );
-
-        if (operateColumnIndex !== -1) {
-          tableColumns.splice(operateColumnIndex, 1);
-        }
-      }
-
       fnGetList();
     });
 });

src/views/neUser/ims/index.vue

@@ -22,6 +22,8 @@ let queryParams = reactive({
   imsi: '',
   /**msisdn */
   msisdn: '',
+  /** 租户名称*/
+  tenantName: '',
   /**当前页数 */
   pageNum: 1,
   /**每页条数 */
@@ -33,6 +35,7 @@ function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
     imsi: '',
     msisdn: '',
+    tenantName: '',
     pageNum: 1,
     pageSize: 20,
   });
@@ -80,7 +83,13 @@ let tableColumns: ColumnsType = [
     align: 'center',
     width: 150,
   },
-
+  {
+    title: 'Tenant Name',
+    dataIndex: 'tenantName',
+    align: 'center',
+    key: 'tenantName',
+    width: 150,
+  },
   {
     title: 'Barring',
     dataIndex: 'barring',
@@ -212,7 +221,7 @@ onMounted(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item :label="t('views.neUser.ims.neType')" name="neId ">
               <a-select
                 v-model:value="queryParams.neId"
@@ -221,17 +230,29 @@ onMounted(() => {
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="8" :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="6" :md="12" :xs="24">
+          <a-col :lg="8" :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="6" :md="12" :xs="24">
+
+          <a-col :lg="8" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.neUser.sub.tenantName')"
+              name="tenantName "
+            >
+              <a-input
+                v-model:value="queryParams.tenantName"
+                allow-clear
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
                 <a-button type="primary" @click.prevent="fnGetList(1)">

src/views/neUser/ue/index.vue

@@ -286,14 +286,6 @@ onMounted(() => {
       }
     })
     .finally(() => {
-      if (useUserStore().roles.includes('tenant')) {
-        const operateColumnIndex = tableColumns.findIndex(
-          column => column.key === 'tenantName'
-        );
-        if (operateColumnIndex !== -1) {
-          tableColumns.splice(operateColumnIndex, 1);
-        }
-      }
       // 获取列表数据
       fnGetList();
     });
@@ -330,7 +322,7 @@ onMounted(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="8" :md="12" :xs="24" :gutter="16" v-roles:has="['administrator']">
+          <a-col :lg="8" :md="12" :xs="24" :gutter="16">
             <a-form-item
               :label="t('views.neUser.sub.tenantName')"
               name="tenantName "

src/views/tenant/ims/index.vue

@@ -0,0 +1,351 @@
+<script setup lang="ts">
+import { reactive, ref, onMounted, toRaw } from 'vue';
+import { PageContainer } from 'antdv-pro-layout';
+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 { listUEInfoByIMS } from '@/api/neUser/ims';
+import useNeInfoStore from '@/store/modules/neinfo';
+import useI18n from '@/hooks/useI18n';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+const { t } = useI18n();
+
+/**网元参数 */
+let neOtions = ref<Record<string, any>[]>([]);
+
+/**查询参数 */
+let queryParams = reactive({
+  /**所有IMS */
+  totalType: <Record<string, any>[]>[],
+  /**网元ID */
+  neId: undefined,
+  /**IMSI */
+  imsi: '',
+  /**msisdn */
+  msisdn: '',
+  /**当前页数 */
+  pageNum: 1,
+  /**每页条数 */
+  pageSize: 20,
+});
+
+/**查询参数重置 */
+function fnQueryReset() {
+  queryParams = Object.assign(queryParams, {
+    totalType: [],
+    imsi: '',
+    msisdn: '',
+    pageNum: 1,
+    pageSize: 20,
+  });
+  tablePagination.current = 1;
+  tablePagination.pageSize = 20;
+  fnGetAllList();
+}
+
+/**表格状态类型 */
+type TabeStateType = {
+  /**加载等待 */
+  loading: boolean;
+  /**紧凑型 */
+  size: SizeType;
+  /**搜索栏 */
+  seached: boolean;
+  /**记录数据 */
+  data: object[];
+  /**勾选记录 */
+  selectedRowKeys: (string | number)[];
+};
+
+/**表格状态 */
+let tableState: TabeStateType = reactive({
+  loading: false,
+  size: 'middle',
+  seached: true,
+  data: [],
+  selectedRowKeys: [],
+});
+
+/**表格字段列 */
+let tableColumns: ColumnsType = [
+  {
+    title: 'IMSI',
+    dataIndex: 'imsi',
+    sorter: (a: any, b: any) => Number(a.imsi) - Number(b.imsi),
+    align: 'center',
+    width: 150,
+  },
+  {
+    title: 'MSISDN',
+    dataIndex: 'msisdn',
+    sorter: (a: any, b: any) => Number(a.msisdn) - Number(b.msisdn),
+    align: 'center',
+    width: 150,
+  },
+
+  {
+    title: 'Barring',
+    dataIndex: 'barring',
+    align: 'center',
+    width: 80,
+  },
+  {
+    title: 'Registration State',
+    dataIndex: 'regState',
+    align: 'center',
+    width: 150,
+  },
+  {
+    title: 'Active Time',
+    dataIndex: 'activeTime',
+    align: 'center',
+    width: 150,
+  },
+  {
+    title: 'IMPU',
+    dataIndex: 'impu',
+    align: 'left',
+  },
+];
+
+/**表格分页器参数 */
+let tablePagination = reactive({
+  /**当前页数 */
+  current: 1,
+  /**每页条数 */
+  pageSize: 20,
+  /**默认的每页条数 */
+  defaultPageSize: 20,
+  /**指定每页可以显示多少条 */
+  pageSizeOptions: ['10', '20', '50', '100'],
+  /**只有一页时是否隐藏分页器 */
+  hideOnSinglePage: false,
+  /**是否可以快速跳转至某页 */
+  showQuickJumper: true,
+  /**是否可以改变 pageSize */
+  showSizeChanger: true,
+  /**数据总数 */
+  total: 0,
+  showTotal: (total: number) => t('common.tablePaginationTotal', { total }),
+  onChange: (page: number, pageSize: number) => {
+    tablePagination.current = page;
+    tablePagination.pageSize = pageSize;
+    queryParams.pageNum = page;
+    queryParams.pageSize = pageSize;
+    fnGetAllList();
+  },
+});
+
+/**表格紧凑型变更操作 */
+function fnTableSize({ key }: MenuInfo) {
+  tableState.size = key as SizeType;
+}
+
+//接收响应信息
+let promises = ref<any[]>([]);
+
+/**查询列表, pageNum初始页数 */
+function fnGetAllList(pageNum?: number) {
+  if (tableState.loading) return;
+  tableState.loading = true;
+  if (pageNum) {
+    queryParams.pageNum = pageNum;
+  }
+
+  tableState.data = [];
+  promises.value = [];
+
+  //同时获取IMS在线用户信息
+  queryParams.totalType.map((item: any) => {
+    promises.value.push(
+      listUEInfoByIMS({
+        neId: item.neId,
+        imsi: queryParams.imsi,
+        msisdn: queryParams.msisdn,
+        pageNum: queryParams.pageNum,
+        pageSize: 10000,
+      })
+    );
+  });
+
+  Promise.allSettled(promises.value).then(results => {
+    results.forEach(result => {
+      if (result.status === 'fulfilled') {
+        const allIMSData = result.value;
+        if (
+          allIMSData.code === RESULT_CODE_SUCCESS &&
+          Array.isArray(allIMSData.rows)
+        ) {
+          // 处理成功结果
+          tablePagination.total += allIMSData.total;
+          tableState.data = [...tableState.data, ...allIMSData.rows];
+          if (
+            tablePagination.total <=
+              (queryParams.pageNum - 1) * tablePagination.pageSize &&
+            queryParams.pageNum !== 1
+          ) {
+            tableState.loading = false;
+            fnGetAllList(queryParams.pageNum - 1);
+          }
+        } else {
+          tablePagination.total = 0;
+          tableState.data = [];
+        }
+        tableState.loading = false;
+      }
+    });
+  });
+}
+
+onMounted(() => {
+  // 获取网元网元列表
+  useNeInfoStore()
+    .fnNelist()
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+        if (res.data.length > 0) {
+          let arr: Record<string, any>[] = [];
+          res.data.forEach(i => {
+            if (i.neType === 'IMS') {
+              arr.push({ value: i.neId, label: i.neName });
+              queryParams.totalType.push(i);
+            }
+          });
+
+          neOtions.value = arr;
+          if (arr.length > 0) {
+            queryParams.neId = arr[0].value;
+          }
+        }
+      } else {
+        message.warning({
+          content: t('common.noData'),
+          duration: 2,
+        });
+      }
+    })
+    .finally(() => {
+      // 获取列表数据
+      fnGetAllList();
+    });
+});
+</script>
+
+<template>
+  <PageContainer>
+    <a-card
+      v-show="tableState.seached"
+      :bordered="false"
+      :body-style="{ marginBottom: '24px', paddingBottom: 0 }"
+    >
+      <!-- 表格搜索栏 -->
+      <a-form :model="queryParams" name="queryParams" layout="horizontal">
+        <a-row :gutter="16">
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item :label="t('views.neUser.ims.neType')" name="neId ">
+              <a-select
+                v-model:value="queryParams.neId"
+                :options="neOtions"
+                :placeholder="t('common.selectPlease')"
+              />
+            </a-form-item>
+          </a-col>
+          <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="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="6" :md="12" :xs="24">
+            <a-form-item>
+              <a-space :size="8">
+                <a-button type="primary" @click.prevent="fnGetAllList(1)">
+                  <template #icon><SearchOutlined /></template>
+                  {{ t('common.search') }}
+                </a-button>
+                <a-button type="default" @click.prevent="fnQueryReset">
+                  <template #icon><ClearOutlined /></template>
+                  {{ t('common.reset') }}
+                </a-button>
+              </a-space>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-card>
+
+    <a-card :bordered="false" :body-style="{ padding: '0px' }">
+      <!-- 插槽-卡片左侧侧 -->
+      <template #title> </template>
+
+      <!-- 插槽-卡片右侧 -->
+      <template #extra>
+        <a-space :size="8" align="center">
+          <a-tooltip>
+            <template #title>{{ t('common.searchBarText') }}</template>
+            <a-switch
+              v-model:checked="tableState.seached"
+              :checked-children="t('common.switch.show')"
+              :un-checked-children="t('common.switch.hide')"
+              size="small"
+            />
+          </a-tooltip>
+          <a-tooltip>
+            <template #title>{{ t('common.reloadText') }}</template>
+            <a-button type="text" @click.prevent="fnGetAllList()">
+              <template #icon><ReloadOutlined /></template>
+            </a-button>
+          </a-tooltip>
+          <a-tooltip placement="topRight">
+            <template #title>{{ t('common.sizeText') }}</template>
+            <a-dropdown placement="bottomRight" trigger="click">
+              <a-button type="text">
+                <template #icon><ColumnHeightOutlined /></template>
+              </a-button>
+              <template #overlay>
+                <a-menu
+                  :selected-keys="[tableState.size as string]"
+                  @click="fnTableSize"
+                >
+                  <a-menu-item key="default">
+                    {{ t('common.size.default') }}
+                  </a-menu-item>
+                  <a-menu-item key="middle">
+                    {{ t('common.size.middle') }}
+                  </a-menu-item>
+                  <a-menu-item key="small">
+                    {{ t('common.size.small') }}
+                  </a-menu-item>
+                </a-menu>
+              </template>
+            </a-dropdown>
+          </a-tooltip>
+        </a-space>
+      </template>
+
+      <!-- 表格列表 -->
+      <a-table
+        class="table"
+        row-key="imsi"
+        :columns="tableColumns"
+        :loading="tableState.loading"
+        :data-source="tableState.data"
+        :size="tableState.size"
+        :pagination="tablePagination"
+        :scroll="{ x: 1200, y: 400 }"
+      >
+      </a-table>
+    </a-card>
+  </PageContainer>
+</template>
+
+<style lang="less" scoped>
+.table :deep(.ant-pagination) {
+  padding: 0 24px;
+}
+</style>

src/views/tenant/ue/index.vue

@@ -292,7 +292,6 @@ onMounted(() => {
         if (res.data.length > 0) {
           let arr: Record<string, any>[] = [];
           res.data.forEach(i => {
-            console.log(i);
             if (i.neType === 'SMF') {
               arr.push({ value: i.neId, label: i.neName });
               queryParams.totalType.push(i);