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/MachineNestList.vue | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/src/views/Home/HomeLeft/MachineNestList.vue b/src/views/Home/HomeLeft/MachineNestList.vue
index 5b12d6e..016fb64 100644
--- a/src/views/Home/HomeLeft/MachineNestList.vue
+++ b/src/views/Home/HomeLeft/MachineNestList.vue
@@ -83,14 +83,15 @@
const getTableList = () => {
const params = {
nickname: searchText.value,
- current: pageParams.value.current,
+ current: 1,
size: pageParams.value.size,
}
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 += 8
+ tableList.value = res.data.data.records;// [...tableList.value, ...res.data.data.records]
busy.value = false
})
}
@@ -105,18 +106,6 @@
searchText.value = name
pageParams.value.current = 1
tableList.value = []
- getTableList()
-}
-
-// 分页方法
-const handleSizeChange = val => {
- pageParams.value.size = val
- pageParams.value.current = 1
- getTableList()
-}
-
-const handleCurrentChange = val => {
- pageParams.value.current = val
getTableList()
}
@@ -220,11 +209,11 @@
}
// 空闲中
.freetime {
- color: #ffa768;
+ color: #04f020;
}
// 作业中
.atcive {
- color: #04f020;
+ 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%);
}
--
Gitblit v1.9.3