From 942e784e3127a2234a3a66c761d9876a01dd7dcc Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 16 Apr 2025 20:23:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/Home/HomeLeft/OverviewNext.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/views/Home/HomeLeft/OverviewNext.vue b/src/views/Home/HomeLeft/OverviewNext.vue
index 4d1116a..a1e4e07 100644
--- a/src/views/Home/HomeLeft/OverviewNext.vue
+++ b/src/views/Home/HomeLeft/OverviewNext.vue
@@ -8,14 +8,17 @@
<div class="name">机巢名称</div>
<div class="status">机巢状态</div>
</div>
- <div
+ <!-- <div
class="table-body"
v-if="tableList.length > 0"
infinite-scroll-distance="6"
v-infinite-scroll="loadMore"
:infinite-scroll-disabled="busy"
infinite-scroll-immediate="true"
- >
+ > -->
+ <div
+ class="table-body"
+ v-if="tableList.length > 0">
<div
class="table-item"
:class="[index % 2 === 1 ? '' : 'table-item-odd']"
@@ -66,7 +69,7 @@
// 分页参数
const pageParams = ref({
current: 1,
- size: 5,
+ size: 99,
total: 0,
})
// 机巢列表
@@ -82,24 +85,24 @@
if (res.data.code !== 0) return
if (res.data.data.records.length === 0) return (isMore.value = false)
// pageParams.value.current += 1
- pageParams.value.size += 5;
+ // pageParams.value.size += 5;
tableList.value = res.data.data.records;// [...tableList.value, ...res.data.data.records]
busy.value = false
})
}
// 加载更多数据
-const loadMore = async () => {
- busy.value = true
- if (!isMore.value) return
- getTableList()
-}
+// const loadMore = async () => {
+ // busy.value = true
+ // if (!isMore.value) return
+ // getTableList()
+// }
// 搜索数据
const handleSearch = name => {
searchText.value = name
pageParams.value.current = 1
- pageParams.value.size = 5;
+ // pageParams.value.size = 5;
tableList.value = []
isMore.value = true
getTableList()
--
Gitblit v1.9.3