From ee916ca1695e1cb8d5159946eaf0158f1c1331dd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 15 十月 2025 15:22:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hollowequipment.vue | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 3465d69..ac553f0 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -1047,12 +1047,10 @@
const intervalFrameWidthFour = ref('')
const sealInsert = ref('')
const totalPages = ref(0)
-
const pageList = ref([]);
const allData = ref({});
const currentData = ref([]);
const flowCardId = ref('')
-
const freeone = ref('#911005');
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
@@ -1095,12 +1093,14 @@
currentPage.value = newPage;
};
const handleMessage = (data) => {
+ if (data.queueInfo != null) {
const rawData = data.queueInfo[0]
const formattedData = Object.entries(rawData).map(([key, data]) => ({
title: key,
tableDataa: Array.isArray(data) ? data : [data]
}));
tabList.value = formattedData;
+}
if (tabList.value.length > 0) {
activeTab.value = tabList.value[0].title;
}
@@ -1967,23 +1967,15 @@
margin-top: 20px;
margin-bottom: 10px;
}
-
::v-deep(.row-red-background) {
background-color: rgb(224.6, 242.8, 215.6) !important;
}
.custom-page-buttons {
display: flex;
gap: 10px;
- margin-top: 20px;
-}
-
-.custom-page-buttons {
- display: flex;
- gap: 10px;
margin: 20px 0;
flex-wrap: wrap;
}
-
.page-btn {
padding: 8px 16px;
min-width: 40px;
@@ -1993,11 +1985,9 @@
cursor: pointer;
transition: all 0.3s;
}
-
.page-btn:hover {
background: #e6f1ff;
}
-
.page-btn.active-page {
background: #409eff;
color: white;
--
Gitblit v1.8.0