From ba2f8eae0dfd804ca422915981874c0d91965b42 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 14 Apr 2025 19:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/Home/HomeLeft/OverviewNext.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/Home/HomeLeft/OverviewNext.vue b/src/views/Home/HomeLeft/OverviewNext.vue
index da35cf6..4d1116a 100644
--- a/src/views/Home/HomeLeft/OverviewNext.vue
+++ b/src/views/Home/HomeLeft/OverviewNext.vue
@@ -81,8 +81,9 @@
selectDevicePage(params).then(res => {
if (res.data.code !== 0) return
if (res.data.data.records.length === 0) return (isMore.value = false)
- pageParams.value.current += 1
- tableList.value = [...tableList.value, ...res.data.data.records]
+ // pageParams.value.current += 1
+ pageParams.value.size += 5;
+ tableList.value = res.data.data.records;// [...tableList.value, ...res.data.data.records]
busy.value = false
})
}
@@ -98,6 +99,7 @@
const handleSearch = name => {
searchText.value = name
pageParams.value.current = 1
+ pageParams.value.size = 5;
tableList.value = []
isMore.value = true
getTableList()
@@ -205,12 +207,12 @@
cursor: pointer;
}
.active {
- color: #8effac;
+ color: #ffa768;
background: linear-gradient(90deg, rgba(12, 45, 92, 1) 0%, #154671 50%, rgba(12, 45, 92, 1) 100%),
linear-gradient(90deg, rgba(12, 45, 92, 1) 0%, rgba(12, 45, 92, 1) 50%, rgba(12, 45, 92, 1) 100%);
}
.idle-active {
- color: #ffa768;
+ color: #8effac;
}
.imageicon {
object-fit: cover;
--
Gitblit v1.9.3