From 4afaeb7b9b7df28a328f13c20568433a2815af0f Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Mon, 15 Jan 2024 16:06:01 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=A8=A1=E5=BC=8F=E6=90=9C=E7=B4=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E9=AB=98=E7=BA=A7=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=88=86=E9=A1=B5=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=B8=A6?=
 =?UTF-8?q?=E4=B8=8A=E9=AB=98=E7=BA=A7=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/asset/asset-manage.vue | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/pages/cmdb/asset/asset-manage.vue b/src/views/pages/cmdb/asset/asset-manage.vue
index 278a759b..4e592272 100644
--- a/src/views/pages/cmdb/asset/asset-manage.vue
+++ b/src/views/pages/cmdb/asset/asset-manage.vue
@@ -703,12 +703,20 @@ export default {
     },
     changeCurrent(currentPage = 1) {
       this.tableConfig.currentPage = currentPage;
-      this.searchAssetData();
+      if (this.isSimpleMode) {
+        this.searchAssetData();
+      } else {
+        this.advancedModeSearch(this.searchVal);
+      }
     },
     changePageSize(pageSize) {
       this.tableConfig.currentPage = 1;
       this.tableConfig.pageSize = pageSize;
-      this.searchAssetData();
+      if (this.isSimpleMode) {
+        this.searchAssetData();
+      } else {
+        this.advancedModeSearch(this.searchVal);
+      }
     },
     formatTime(time) {
       let data = '-';
@@ -1047,12 +1055,14 @@ export default {
       this.$nextTick(() => {
         this.$refs.combineSearcher && this.$refs.combineSearcher.handleToggleOpen(); // 打开简单模式面板
       });
+      this.tableConfig.currentPage = 1; // 切换不同搜索模式时，页码设置为初始值
+      this.tableConfig.pageSize = 20;
     },
     advancedModeSearch(searchVal) {
       // 复杂模式搜索
       let params = {
-        currentPage: 1,
-        pageSize: 20,
+        currentPage: this.tableConfig.currentPage || 1,
+        pageSize: this.tableConfig.pageSize || 20,
         typeId: this.selectType.typeId,
         ...searchVal
       };
-- 
Gitee