fix: 列表查询pageNum设为1

src/api/configManage/configParam.ts

@@ -37,49 +37,19 @@ export async function getParamConfigTopTab(neType: string) {
   return result;
 }
 
-/**
- * 查询配置参数标签栏对应JSON信息
- * @param neType 网元类型
- * @returns object
- */
-export async function getParamConfigTopTabJson(neType: string, topTag: string) {
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/elementType/omc_db/objectType/param_config`,
-    method: 'get',
-    params: {
-      SQL: `SELECT param_json FROM param_config WHERE ne_type = '${neType}' AND top_tag='${topTag}'`,
-    },
-  });
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) {
-    let data = result.data.data[0];
-    data = data['param_config'];
-    if (Array.isArray(data)) {
-      const v = data[0]['param_json'];
-      try {
-        result.data = JSON.parse(v);
-      } catch (error) {
-        console.error(error);
-        result.data = {};
-      }
-    }
-    return result;
-  }
-  return result;
-}
-
 /**
  * 查询配置参数标签栏对应信息
  * @param neType 网元类型
- * @returns object
+ * @param topTag
+ * @param neId
+ * @returns object { wrRule, dataArr }
  */
-export async function getParamConfigInfo(
+async function getParamConfigInfo(
   neType: string,
   topTag: string,
   neId: string
 ) {
-  const { wrRule, dataArr } = await Promise.allSettled([
+  return await Promise.allSettled([
     // 获取参数规则
     request({
       url: `/api/rest/databaseManagement/v1/elementType/omc_db/objectType/param_config`,
@@ -134,6 +104,21 @@ export async function getParamConfigInfo(
     }
     return { wrRule, dataArr };
   });
+}
+
+/**
+ * 查询配置参数标签栏对应信息-表格处理
+ * @param neType 网元类型
+ * @param topTag
+ * @param neId
+ * @returns object
+ */
+export async function getParamConfigInfoTable(
+  neType: string,
+  topTag: string,
+  neId: string
+) {
+  const { wrRule, dataArr } = await getParamConfigInfo(neType, topTag, neId);
 
   // UPF参数不统一
   // if (neType === 'UPF') {
@@ -226,6 +211,7 @@ export async function getParamConfigInfo(
       },
     ];
   }
+
   // 多列表
   if (Reflect.has(wrRule, 'array')) {
     result.data.type = 'array';
@@ -273,6 +259,95 @@ export async function getParamConfigInfo(
   return result;
 }
 
+/**
+ * 查询配置参数标签栏对应信息-树结构处理
+ * @param neType 网元类型
+ * @param topTag
+ * @param neId
+ * @returns object
+ */
+export async function getParamConfigInfoTree(
+  neType: string,
+  topTag: string,
+  neId: string
+) {
+  const { wrRule, dataArr } = await getParamConfigInfo(neType, topTag, neId);
+
+  type TreeNodeType = {
+    title: string;
+    key: string;
+    record: Record<string, any>[];
+  };
+
+  // 拼装数据
+  const result = {
+    code: RESULT_CODE_SUCCESS,
+    msg: RESULT_MSG_SUCCESS,
+    data: {
+      type: 'list' as 'list' | 'array',
+      data: [] as TreeNodeType[],
+      recordRule: {},
+    },
+  };
+
+  // kv单列表
+  if (Reflect.has(wrRule, 'list')) {
+    result.data.type = 'list';
+    const ruleArr = Object.freeze(wrRule['list']);
+
+    // 列表项数据
+    const dataList = [];
+    for (const item of dataArr) {
+      for (const key of Object.keys(item)) {
+        // 规则为准
+        for (const rule of ruleArr) {
+          if (rule['name'] === key) {
+            const ruleItem = Object.assign({ optional: 'true' }, rule, {
+              value: item[key],
+            });
+            dataList.push(ruleItem);
+            break;
+          }
+        }
+      }
+    }
+    result.data.data = dataList;
+  }
+  // 多列表
+  if (Reflect.has(wrRule, 'array')) {
+    result.data.type = 'array';
+    const ruleArr = Object.freeze(wrRule['array']);
+    // 列表项数据
+    const dataArray = [];
+    for (const item of dataArr) {
+      const index = item['index'];
+      let record: Record<string, any>[] = [];
+      for (const key of Object.keys(item)) {
+        // 规则为准
+        for (const rule of ruleArr) {
+          if (rule['name'] === key) {
+            const ruleItem = Object.assign({ optional: 'true' }, rule, {
+              value: item[key],
+            });
+            record.push(ruleItem);
+            break;
+          }
+        }
+      }
+      dataArray.push({ title: `Index-${index}`, key: index, record });
+    }
+    result.data.data = dataArray;
+
+    // 无数据时，用于新增
+    let dataRule: Record<string, any> = {};
+    for (const rule of ruleArr) {
+      dataRule[rule.name] = rule;
+    }
+    result.data.recordRule = dataRule;
+  }
+  return result;
+}
+
 /**
  * 查询配置参数标签栏对应信息子节点
  * @param neType 网元类型

src/views/configManage/backupManage/index.vue

@@ -200,10 +200,13 @@ function fnRecordDelete(row: Record<string, any>) {
   });
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listNeBackup(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -347,7 +350,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -387,7 +390,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList(1)">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/configManage/configParam/index.vue

@@ -6,7 +6,7 @@ import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import {
   getParamConfigTopTab,
-  getParamConfigInfo,
+  getParamConfigInfoTable,
   updateParamConfigInfo,
   updateNeConfigReload,
   delParamConfigInfo,
@@ -53,7 +53,7 @@ function fnTabActiveTopTag(key: string | number) {
   const neType = neTypeSelect.value[0];
   const neId = neTypeSelect.value[1];
   const topTag = tabState.tabActiveTopTag;
-  getParamConfigInfo(neType, topTag, neId)
+  getParamConfigInfoTable(neType, topTag, neId)
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS && res.data.type) {
         tableState.type = res.data.type;

src/views/configManage/configParamTree/components/array-children.vue

@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { reactive, toRaw, watch, ref } from 'vue';
+import { SizeType } from 'ant-design-vue/lib/config-provider';
+import { ColumnsType } from 'ant-design-vue/lib/table';
+import { listNeVersion } from '@/api/configManage/softwareManage';
+import { parseDateToStr } from '@/utils/date-utils';
+import useNeInfoStore from '@/store/modules/neinfo';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import useI18n from '@/hooks/useI18n';
+const { t } = useI18n();
+const emit = defineEmits(['ok', 'cancel', 'update:visible']);
+const props = defineProps({
+  title: {
+    type: String,
+    default: '标题',
+  },
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  data: {
+    type: Object,
+    required: true,
+  },
+});
+
+/**弹框取消按钮事件 */
+function fnModalCancel() {
+  emit('cancel');
+}
+
+/**显示弹框时初始数据 */
+function init() {
+  console.log(props.data);
+}
+
+/**监听是否显示，初始数据 */
+watch(
+  () => props.visible,
+  val => {
+    if (val) init();
+  }
+);
+</script>
+
+<template>
+  <a-modal
+    width="800px"
+    :title="props.title"
+    :visible="props.visible"
+    :keyboard="false"
+    :mask-closable="false"
+    @cancel="fnModalCancel"
+    :footer="null"
+  >
+    {{ props }}
+  </a-modal>
+</template>
+
+<style lang="less" scoped>
+.table :deep(.ant-pagination) {
+  padding: 0 24px;
+}
+</style>

src/views/configManage/license/index.vue

@@ -125,10 +125,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询信息列表 */
+/**查询信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listLicense(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -325,7 +328,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -365,7 +368,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/configManage/neManage/index.vue

@@ -329,7 +329,7 @@ function fnModalOk() {
             });
             modalState.visibleByEdit = false;
             modalStateFrom.resetFields();
-            fnGetList();
+            fnGetList(1);
           } else {
             message.error({
               content: `${res.msg}`,
@@ -387,7 +387,7 @@ function fnImportModalOk() {
           hide();
           modalState.confirmLoading = false;
           // 获取列表数据
-          fnGetList();
+          fnGetList(1);
         });
     })
     .catch(e => {
@@ -600,10 +600,13 @@ function fnRecordMore(type: string | number, row: Record<string, any>) {
   }
 }
 
-/**查询网元列表 */
+/**查询网元列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listNeInfo(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -682,7 +685,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -722,7 +725,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/configManage/softwareManage/components/software-history.vue

@@ -154,10 +154,13 @@ let tablePagination = reactive({
   },
 });
 
-/**查询角色未授权用户列表 */
+/**查询角色未授权用户列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -238,7 +241,7 @@ watch(
         <a-col :lg="12" :md="12" :xs="24">
           <a-form-item>
             <a-space :size="8">
-              <a-button type="primary" @click.prevent="fnGetList">
+              <a-button type="primary" @click.prevent="fnGetList(1)">
                 <template #icon><SearchOutlined /></template>
                 {{ t('common.search') }}
               </a-button>

src/views/configManage/softwareManage/index.vue

@@ -370,10 +370,13 @@ function fnRecordDelete(row: Record<string, any>) {
   });
 }
 
-/**查询信息列表 */
+/**查询信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listNeSoftware(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -614,7 +617,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -658,7 +661,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/faultManage/active-alarm/index.vue

@@ -721,10 +721,13 @@ function fnModalCancel() {
   modalState.visibleByShowSet = false;
 }
 
-/**查询列表 */
+/**查询列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -817,7 +820,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -965,7 +968,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/faultManage/history-alarm/index.vue

@@ -528,10 +528,13 @@ function fnModalCancel() {
   modalState.visibleByShowSet = false;
 }
 
-/**查询列表 */
+/**查询列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -616,7 +619,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -739,7 +742,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/logManage/alarm/index.vue

@@ -166,10 +166,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -247,7 +250,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -280,7 +283,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/logManage/forwarding/index.vue

@@ -177,10 +177,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -247,7 +250,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -280,7 +283,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/logManage/mml/index.vue

@@ -138,10 +138,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -199,7 +202,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -232,7 +235,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/logManage/operation/index.vue

@@ -176,10 +176,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listOperationLog(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
@@ -259,7 +262,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -292,7 +295,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/logManage/security/index.vue

@@ -160,10 +160,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -238,7 +241,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -271,7 +274,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/monitor/job/index.vue

@@ -528,9 +528,13 @@ function fnJobLogView(jobId: string | number = '0') {
   router.push(`${routePath}${MENU_PATH_INLINE}/log/${jobId}`);
 }
 
-/**查询定时任务列表 */
+/**查询定时任务列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
+  if (tableState.loading) return;
   tableState.loading = true;
+  if (pageNum) {
+    queryParams.pageNum = pageNum;
+  }
   listJob(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       // 取消勾选
@@ -610,7 +614,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   搜索</a-button
                 >
@@ -698,7 +702,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>刷新</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/monitor/job/log.vue

@@ -297,7 +297,7 @@ function fnCleanList() {
             key,
             duration: 2,
           });
-          fnGetList();
+          fnGetList(1);
         } else {
           message.error({
             content: `${res.msg}`,
@@ -348,9 +348,13 @@ function fnClose() {
   }
 }
 
-/**查询调度日志列表 */
+/**查询调度日志列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
+  if (tableState.loading) return;
   tableState.loading = true;
+  if (pageNum) {
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -455,7 +459,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   搜索
                 </a-button>
@@ -531,7 +535,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>刷新</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/monitor/session/index.vue

@@ -178,10 +178,13 @@ function fnForceLogout(row: Record<string, string>) {
     },
   });
 }
-/**查询网元列表 */
+/**查询网元列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listSession(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
@@ -231,7 +234,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon>
                     <SearchOutlined />
                   </template>
@@ -268,7 +271,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon>
                 <ReloadOutlined />
               </template>

src/views/neUser/auth/index.vue

@@ -85,6 +85,7 @@ let tableColumns: ColumnsType = [
     align: 'center',
     fixed: 'left',
     width: 5,
+    sorter: true,
   },
   {
     title: 'AMF',
@@ -158,6 +159,18 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
+/**表格分页、排序、筛选变化时触发操作, 排序方式，取值为 ascend descend */
+function fnTableChange(pagination: any, filters: any, sorter: any, extra: any) {
+  const { field, order } = sorter;
+  if (order) {
+    queryParams.sortField = field;
+    queryParams.sortOrder = order.replace('end', '');
+  } else {
+    queryParams.sortOrder = 'asc';
+  }
+  fnGetList(1);
+}
+
 /**对话框对象信息状态类型 */
 type ModalStateType = {
   /**详情框是否显示 */
@@ -557,10 +570,13 @@ function fnLoadData() {
   });
 }
 
-/**查询网元列表 */
+/**查询列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if (pageNum) {
+    queryParams.pageNum = pageNum;
+  }
   listAuth(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
@@ -690,7 +706,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon>
                     <SearchOutlined />
                   </template>
@@ -790,7 +806,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon>
                 <ReloadOutlined />
               </template>
@@ -835,6 +851,7 @@ onMounted(() => {
         :size="tableState.size"
         :pagination="tablePagination"
         :scroll="{ x: 1000, y: 400 }"
+        @change="fnTableChange"
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'imsi'">

src/views/neUser/base5G/index.vue

@@ -118,10 +118,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询列表 */
+/**查询列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listBase5G(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -198,7 +201,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -231,7 +234,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/neUser/ims/index.vue

@@ -136,10 +136,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询列表 */
+/**查询列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listIMS(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -228,7 +231,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -261,7 +264,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/neUser/sub/index.vue

@@ -88,6 +88,7 @@ let tableColumns: ColumnsType = [
     align: 'center',
     fixed: 'left',
     width: 5,
+    sorter: true,
   },
   {
     title: 'MSISDN',
@@ -95,6 +96,7 @@ let tableColumns: ColumnsType = [
     align: 'center',
     fixed: 'left',
     width: 5,
+    sorter: true,
   },
   {
     title: 'Subscribed AMBR Temp',
@@ -186,6 +188,18 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
+/**表格分页、排序、筛选变化时触发操作, 排序方式，取值为 ascend descend */
+function fnTableChange(pagination: any, filters: any, sorter: any, extra: any) {
+  const { field, order } = sorter;
+  if (order) {
+    queryParams.sortField = field;
+    queryParams.sortOrder = order.replace('end', '');
+  } else {
+    queryParams.sortOrder = 'asc';
+  }
+  fnGetList(1);
+}
+
 /**对话框对象信息状态类型 */
 type ModalStateType = {
   /**详情框是否显示 */
@@ -719,10 +733,13 @@ function fnLoadData() {
   });
 }
 
-/**查询网元列表 */
+/**查询网元列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listSub(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
@@ -861,7 +878,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon>
                     <SearchOutlined />
                   </template>
@@ -967,7 +984,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon>
                 <ReloadOutlined />
               </template>
@@ -1012,6 +1029,7 @@ onMounted(() => {
         :size="tableState.size"
         :pagination="tablePagination"
         :scroll="{ x: 2500, y: 400 }"
+        @change="fnTableChange"
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'imsi'">

src/views/neUser/ue/index.vue

@@ -211,10 +211,13 @@ function fnModalCancel() {
   modalState.visibleByView = false;
 }
 
-/**查询列表 */
+/**查询列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listUE(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -303,7 +306,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -336,7 +339,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/perfManage/customTarget/index.vue

@@ -147,10 +147,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listTraceData(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
@@ -372,7 +375,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -405,7 +408,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/perfManage/goldTarget/index.vue

@@ -149,10 +149,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询黄金指标列表 */
+/**查询黄金指标列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -213,7 +216,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -246,7 +249,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/perfManage/perfData/index.vue

@@ -172,10 +172,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -242,7 +245,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -275,7 +278,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/perfManage/perfReport/index.vue

@@ -147,10 +147,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listTraceData(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
@@ -372,7 +375,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -405,7 +408,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/perfManage/perfSet/index.vue

@@ -147,10 +147,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if (pageNum) {
+    queryParams.pageNum = pageNum;
+  }
   listTraceData(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
@@ -372,7 +375,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -405,7 +408,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/perfManage/perfThreshold/index.vue

@@ -184,10 +184,13 @@ function fnRecordDelete(row: Record<string, any>) {
   });
 }
 
-/**查询信息列表 */
+/**查询信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listPerfThreshold(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -500,7 +503,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -538,7 +541,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip placement="topRight">
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/perfManage/taskManage/index.vue

@@ -212,10 +212,13 @@ function fnRecordDelete(row: Record<string, any>) {
   });
 }
 
-/**查询信息列表 */
+/**查询信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listPerfTask(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -719,7 +722,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -757,7 +760,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip placement="topRight">
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/system/dict/data.vue

@@ -421,10 +421,13 @@ function fnClose() {
   }
 }
 
-/**查询字典数据列表 */
+/**查询字典数据列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listData(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -516,7 +519,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   搜索</a-button
                 >
@@ -591,7 +594,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>刷新</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/system/dict/index.vue

@@ -296,7 +296,7 @@ function fnModalOk() {
             });
             modalState.visibleByEdit = false;
             modalStateFrom.resetFields();
-            fnGetList();
+            fnGetList(1);
           } else {
             message.error({
               content: `${res.msg}`,
@@ -420,10 +420,13 @@ function fnDataView(dictId: string | number = '0') {
   router.push(`${routePath}${MENU_PATH_INLINE}/data/${dictId}`);
 }
 
-/**查询参数配置列表 */
+/**查询参数配置列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -508,7 +511,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   搜索</a-button
                 >
@@ -596,7 +599,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>刷新</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/system/log/login/index.vue

@@ -310,10 +310,13 @@ function fnExportList() {
   });
 }
 
-/**查询登录日志列表 */
+/**查询登录日志列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -400,7 +403,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   搜索</a-button
                 >
@@ -481,7 +484,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>刷新</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/system/log/operate/index.vue

@@ -296,7 +296,7 @@ function fnCleanList() {
             key,
             duration: 2,
           });
-          fnGetList();
+          fnQueryReset();
         } else {
           message.error({
             content: `${res.msg}`,
@@ -337,10 +337,13 @@ function fnExportList() {
   });
 }
 
-/**查询登录日志列表 */
+/**查询登录日志列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -442,7 +445,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   搜索</a-button
                 >
@@ -514,7 +517,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>刷新</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/system/post/index.vue

@@ -287,7 +287,7 @@ function fnModalOk() {
             });
             modalState.visibleByEdit = false;
             modalStateFrom.resetFields();
-            fnGetList();
+            fnGetList(1);
           } else {
             message.error({
               content: `${res.msg}`,
@@ -377,10 +377,13 @@ function fnExportList() {
   });
 }
 
-/**查询岗位列表 */
+/**查询岗位列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listPost(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -448,7 +451,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   搜索</a-button
                 >
@@ -519,7 +522,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>刷新</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/system/role/auth-user.vue

@@ -223,7 +223,7 @@ function fnModalOk(userIds: string[] | number[]) {
         key,
         duration: 3,
       });
-      fnGetList();
+      fnGetList(1);
     } else {
       message.error({
         content: `${res.msg}`,
@@ -280,10 +280,13 @@ function fnClose() {
   }
 }
 
-/**查询角色已授权用户列表 */
+/**查询角色已授权用户列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   authUserAllocatedList(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -362,7 +365,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   搜索</a-button
                 >
@@ -429,7 +432,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>刷新</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/system/role/components/auth-user-select.vue

@@ -156,10 +156,13 @@ function fnTableSelectedRowKeys(keys: (string | number)[]) {
   tableState.selectedRowKeys = keys;
 }
 
-/**查询角色未授权用户列表 */
+/**查询角色未授权用户列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if (pageNum) {
+    queryParams.pageNum = pageNum;
+  }
   authUserAllocatedList(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -258,7 +261,7 @@ watch(
         <a-col :lg="12" :md="12" :xs="24">
           <a-form-item>
             <a-space :size="8">
-              <a-button type="primary" @click.prevent="fnGetList">
+              <a-button type="primary" @click.prevent="fnGetList(1)">
                 <template #icon><SearchOutlined /></template>
                 搜索</a-button
               >

src/views/system/role/index.vue

@@ -403,7 +403,7 @@ function fnModalOk() {
             });
             modalState.visibleByEdit = false;
             modalStateFrom.resetFields();
-            fnGetList();
+            fnGetList(1);
           } else {
             message.error({
               content: `${res.msg}`,
@@ -672,10 +672,13 @@ function fnExportList() {
   });
 }
 
-/**查询角色列表 */
+/**查询角色列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -760,7 +763,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   搜索
                 </a-button>
@@ -831,7 +834,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>刷新</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/system/user/index.vue

@@ -448,7 +448,7 @@ function fnModalOk() {
             });
             modalState.visibleByEdit = false;
             modalStateFrom.resetFields();
-            fnGetList();
+            fnGetList(1);
           } else {
             message.error({
               content: `${res.msg}`,
@@ -710,10 +710,13 @@ function fnModalUploadImportExportTemplate() {
     });
 }
 
-/**查询用户列表 */
+/**查询用户列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
@@ -799,7 +802,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   搜索
                 </a-button>
@@ -923,7 +926,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>刷新</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList(1)">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/traceManage/analysis/index.vue

@@ -147,10 +147,13 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询备份信息列表 */
+/**查询备份信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listTraceData(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
@@ -372,7 +375,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -405,7 +408,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

src/views/traceManage/task/index.vue

@@ -186,8 +186,7 @@ function fnTableChange(pagination: any, filters: any, sorter: any, extra: any) {
   } else {
     queryParams.sortOrder = 'asc';
   }
-  fnGetList();
+  fnGetList(1);
-  console.log(sorter);
 }
 
 /**
@@ -221,10 +220,13 @@ function fnRecordDelete(id: string) {
   });
 }
 
-/**查询信息列表 */
+/**查询信息列表, pageNum初始页数 */
-function fnGetList() {
+function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
+  if(pageNum){
+    queryParams.pageNum = pageNum;
+  }
   listTraceTask(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
@@ -502,7 +504,7 @@ function fnModalOk() {
         .finally(() => {
           hide();
           modalState.confirmLoading = false;
-          fnGetList();
+          fnGetList(1);
         });
     })
     .catch(e => {
@@ -594,7 +596,7 @@ onMounted(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
@@ -632,7 +634,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip placement="topRight">
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>