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/components/RightContainer.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/RightContainer.vue b/applications/drone-command/src/views/dataCockpit/components/RightContainer.vue
index 5cd84d9..af0b83f 100644
--- a/applications/drone-command/src/views/dataCockpit/components/RightContainer.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/RightContainer.vue
@@ -2,7 +2,7 @@
* @Author : yuan
* @Date : 2026-01-07 15:17:54
* @LastEditors : yuan
- * @LastEditTime : 2026-01-20 09:19:16
+ * @LastEditTime : 2026-01-31 15:47:40
* @FilePath : \applications\drone-command\src\views\dataCockpit\components\RightContainer.vue
* @Description :
* Copyright 2026 OBKoro1, All Rights Reserved.
@@ -68,7 +68,7 @@
}
})
-const emit = defineEmits(['update:collapsed', 'update:onlineDevices'])
+const emit = defineEmits(['update:collapsed', 'update:allDevices'])
const collapsedModel = computed({
get: () => props.collapsed,
@@ -145,11 +145,12 @@
const startAt = Date.now()
loading.value = true
try {
- const params = { current: 1, size: 20, deviceStatusList: '0' }
+ const params = { current: 1, size: 9999, deviceStatusList: '0,1,2' }
const res = await deviceSearchApi(params)
const records = res?.data?.data?.records ?? []
- counterDeviceStatusList.value = records.map(formatDeviceItem)
- emit('update:onlineDevices', records)
+ let onlineData = records.filter(item => String(item.status) === '0')
+ counterDeviceStatusList.value = onlineData.map(formatDeviceItem)
+ emit('update:allDevices', records)
} finally {
const elapsed = Date.now() - startAt
if (elapsed < minLoadingMs) {
--
Gitblit v1.9.3