fix bug

张红振
1 parent 5878530d
Showing 10 changed files with 51 additions and 31 deletions
src/components/Pagination/index.vue
src/views/community/housekeeper/changeAdmin.vue
src/views/community/housekeeper/index.vue
src/views/community/houses/buildOwner.vue
src/views/community/houses/index.vue
src/views/community/houses/relieve.vue
src/views/community/residence/index.vue
src/views/housekeeper/buildinMganager/index.vue
src/views/ownerManagement/owner/index.vue
src/views/property/index.vue
@@ -3,7 +3,7 @@
  * 分页
  * @module Pagination
  */
-
+import { computed } from "vue";
 import { scrollTo } from "@/utils/scroll";
  
 // TIP 每个属性都必传，不带默认值
@@ -37,6 +37,27 @@ const props = withDefaults(defineProps&lt;Props&gt;(), {
   currentPage: 1,
 });
  
+const emit = defineEmits<{
+  (e: "pageChange", curPage: number, curSize: number, tagName: string): void;
+  (e: "update:currentPage", val);
+  (e: "update:pageSize", val);
+}>();
+
+/**
+ * 监听当前分页改变
+ */
+const updateCurrentPage = (val) => {
+  console.log(val);
+  emit("update:currentPage", val);
+};
+/**
+ * 监听个数改变
+ */
+const updatePageSize = (val) => {
+  console.log(val);
+  emit("update:pageSize", val);
+};
+
 /**
  * @method handleSizeChange
  * @description 每页内容条数变化响应
@@ -53,20 +74,19 @@ const handleCurrentChange = (val) =&gt; {
   scrollTo(0, 800);
   emit("pageChange", val, props.pageSize, props.tagName);
 };
-const emit = defineEmits<{
-  (e: "pageChange", curPage: number, curSize: number, tagName: string): void;
-}>();
 </script>
  
 <template>
   <div class="pagination-container">
     <el-pagination
-      v-model:current-page="currentPage"
+      v-model:currentPage="currentPage"
       :page-sizes="pageSizes"
-      :page-size="pageSize"
+      v-model:pageSize="pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       :total="total"
-      background 
+      background
+      :onUpdate:currentPage="updateCurrentPage"
+      :onUpdate:pageSize="updatePageSize"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     >
@@ -155,8 +155,8 @@ watchEffect(() =&gt; {
     <Pagination
       v-if="data.total > 0"
       :total="data.total"
-      :currentPage="searchData.page"
-      :pageSize="searchData.pageSize"
+      v-model:currentPage="searchData.page"
+      v-model:pageSize="searchData.pageSize"
       @pageChange="search"
     ></Pagination>
   </div>
@@ -112,10 +112,10 @@ const changeSuccess: void = () =&gt; {
   changeObj.changeVisible = false;
   search();
 };
-const changeClose=()=>{
-  changeObj.currBuildingId =null;
-  changeObj.originalId =null;
-}
+const changeClose = () => {
+  changeObj.currBuildingId = null;
+  changeObj.originalId = null;
+};
 /**
  * 监听路由参数变换
  */
@@ -203,8 +203,8 @@ watchEffect(() =&gt; {
     <Pagination
       v-if="data.total > 0"
       :total="data.total"
-      :currentPage="searchData.page"
-      :pageSize="searchData.pageSize"
+      v-model:currentPage="searchData.page"
+      v-model:pageSize="searchData.pageSize"
       @pageChange="search"
     ></Pagination>
  
@@ -228,10 +228,10 @@ watchEffect(() =&gt; {
       v-model="changeObj.changeVisible"
       title="更换楼管"
       width="60%"
-       @close="changeClose"
+      @close="changeClose"
     >
       <ChangeAdmin
-         @success="changeSuccess"
+        @success="changeSuccess"
         :buildingId="changeObj.currBuildingId"
         :originalIds="changeObj.originalId"
       ></ChangeAdmin>
@@ -207,8 +207,8 @@ watchEffect(() =&gt; {
     <Pagination
       v-if="data.total > 0"
       :total="data.total"
-      :currentPage="searchData.page"
-      :pageSize="searchData.pageSize"
+      v-model:currentPage="searchData.page"
+      v-model:pageSize="searchData.pageSize"
       @pageChange="search"
     ></Pagination>
   </div>
@@ -196,8 +196,8 @@ watchEffect(() =&gt; {
     <Pagination
       v-if="data.total > 0"
       :total="data.total"
-      :currentPage="searchData.page"
-      :pageSize="searchData.pageSize"
+      v-model:currentPage="searchData.page"
+       v-model:pageSize="searchData.pageSize"
       @pageChange="search"
     ></Pagination>
  
@@ -137,8 +137,8 @@ watchEffect(() =&gt; {
     <Pagination
       v-if="data.total > 0"
       :total="data.total"
-      :currentPage="searchData.page"
-      :pageSize="searchData.pageSize"
+      v-model:currentPage="searchData.page"
+      v-model:pageSize="searchData.pageSize"
       @pageChange="search"
     ></Pagination>
   </div>
@@ -144,8 +144,8 @@ onMounted(() =&gt; {
     <Pagination
       v-if="data.total > 0"
       :total="data.total"
-      :currentPage="searchData.page"
-      :pageSize="searchData.pageSize"
+      v-model:currentPage="searchData.page"
+      v-model:pageSize="searchData.pageSize"
       @pageChange="search"
     ></Pagination>
  
@@ -156,8 +156,8 @@ onMounted(() =&gt; {
     <Pagination
       v-if="data.total > 0"
       :total="data.total"
-      :currentPage="searchData.page"
-      :pageSize="searchData.pageSize"
+      v-model:currentPage="searchData.page"
+      v-model:pageSize="searchData.pageSize"
       @pageChange="search"
     ></Pagination>
  
@@ -242,8 +242,8 @@ watchEffect(() =&gt; {
     <Pagination
       v-if="data.total > 0"
       :total="data.total"
-      :currentPage="searchData.page"
-      :pageSize="searchData.pageSize"
+      v-model:currentPage="searchData.page"
+      v-model:pageSize="searchData.pageSize"
       @pageChange="search"
     ></Pagination>
  
@@ -213,8 +213,8 @@ onMounted(() =&gt; {
     </el-table>
     <Pagination
       :total="data.params.total"
-      :currentPage="data.params.query.page"
-      :pageSize="data.params.query.pageSize"
+      v-model:currentPage="data.params.query.page"
+      v-model:pageSize="data.params.query.pageSize"
       @pageChange="handlePageChange"
     ></Pagination>
   </div>