From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/EquipmentWarning.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/EquipmentWarning.vue b/applications/drone-command/src/views/dataCockpit/components/EquipmentWarning.vue
index 4f2c8a0..142396e 100644
--- a/applications/drone-command/src/views/dataCockpit/components/EquipmentWarning.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/EquipmentWarning.vue
@@ -15,14 +15,16 @@
element-loading-background="rgba(5, 5, 15, 0.6)"
element-loading-text="加载中..."
>
- <EmptyState v-if="!equipmentWarningData.length" />
- <EquipmentTemplate
- v-else
- v-for="(item, ind) in equipmentWarningData"
- :key="ind"
- :data="item"
- @click="onCardClick"
- />
+ <div class="list-content">
+ <EmptyState v-if="!equipmentWarningData.length" />
+ <EquipmentTemplate
+ v-else
+ v-for="(item, ind) in equipmentWarningData"
+ :key="ind"
+ :data="item"
+ @click="onCardClick"
+ />
+ </div>
</div>
</template>
@@ -33,7 +35,7 @@
import EmptyState from './EmptyState.vue'
const equipmentWarningData = ref([])
-const loading = ref(false)
+const loading = ref(true)
const minLoadingMs = 400
const statusMap = {
@@ -94,8 +96,17 @@
<style lang="scss" scoped>
.equipment-warning {
+ display: flex;
+ flex-direction: column;
width: 100%;
height: 100%;
+ overflow: hidden;
+}
+
+.list-content {
+ height: 0;
+ flex: 1;
+ overflow-y: auto;
}
</style>
--
Gitblit v1.9.3