From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu

---
 src/views/device/fly.vue |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/device/fly.vue b/src/views/device/fly.vue
index 62f527d..2ea78f2 100644
--- a/src/views/device/fly.vue
+++ b/src/views/device/fly.vue
@@ -4,7 +4,8 @@
       :option="option"
       :table-loading="loading"
       :data="data"
-      v-model:page="page"
+      :page="page"
+      @update:page="handlePageChange"
       ref="crud"
       @row-del="rowDel"
       v-model="form"
@@ -18,7 +19,6 @@
       @current-change="currentChange"
       @size-change="sizeChange"
       @refresh-change="refreshChange"
-      @on-load="onLoad"
     >
       <template #menu-left>
         <el-button
@@ -377,6 +377,11 @@
       })
     },
     init() {
+      this.page= {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
       this.onLoad(this.page);
     },
     rowSave(row, done, loading) {
@@ -475,11 +480,18 @@
       }
       done();
     },
+    handlePageChange(val) {
+      this.page = val;
+      this.onLoad(this.page);
+    },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
     },
     refreshChange() {
       this.onLoad(this.page, this.query);

--
Gitblit v1.9.3