From f11355b8fc2eeb13247b72891a24a07b26c4561e Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 31 Jan 2026 16:09:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/index.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/index.vue b/applications/drone-command/src/views/dataCockpit/index.vue
index aafe0df..1224bd5 100644
--- a/applications/drone-command/src/views/dataCockpit/index.vue
+++ b/applications/drone-command/src/views/dataCockpit/index.vue
@@ -2,7 +2,7 @@
* @Author : yuan
* @Date : 2026-01-06 16:35:50
* @LastEditors : yuan
- * @LastEditTime : 2026-01-16 17:17:24
+ * @LastEditTime : 2026-01-31 15:40:15
* @FilePath : \applications\drone-command\src\views\dataCockpit\index.vue
* @Description :
* Copyright 2026 OBKoro1, All Rights Reserved.
@@ -11,7 +11,7 @@
<template>
<div class="page-container">
<DeviceMapContainer
- :online-devices="onlineDevices"
+ :all-devices="allDevices"
:alarm-drones="realWarningData"
:left-collapsed="leftCollapsed"
container-id="data-cockpit-map"
@@ -29,7 +29,8 @@
@real-warning-counter="handleAlarmAction('counter', $event)"
@real-warning-favorite="handleAlarmFavorite"
/>
- <RightContainer class="right-container" v-model:collapsed="rightCollapsed" v-model:onlineDevices="onlineDevices" />
+ <RightContainer class="right-container" v-model:collapsed="rightCollapsed"
+ v-model:allDevices="allDevices" />
<CenterContainer @select-warning="onSelectWarning" @select-equipment="onSelectEquipment" />
<LegendBar class="legend-container" />
</div>
@@ -54,7 +55,7 @@
const leftCollapsed = ref(false);
const rightCollapsed = ref(false);
- const onlineDevices = ref([]);
+ const allDevices = ref([]);
const realWarningData = ref([]);
const realWarningLoading = ref(true);
const minLoadingMs = 400;
@@ -133,7 +134,7 @@
const startAt = Date.now();
realWarningLoading.value = true;
try {
- const params = { current: 1, size: 20, alarmType: '1' };
+ const params = { current: 1, size: 9999, alarmType: '1' };
const res = await alarmLogApi(params);
const records = res?.data?.data?.records ?? [];
realWarningData.value = records.map((record) => ({
--
Gitblit v1.9.3