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/index.vue | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/index.vue b/applications/drone-command/src/views/dataCockpit/index.vue
index 5226ea0..7f44448 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-09 16:34:39
+ * @LastEditTime : 2026-01-16 17:17:24
* @FilePath : \applications\drone-command\src\views\dataCockpit\index.vue
* @Description :
* Copyright 2026 OBKoro1, All Rights Reserved.
@@ -10,18 +10,24 @@
-->
<template>
<div class="page-container">
- <MapContainer :online-devices="onlineDevices" :left-collapsed="leftCollapsed" />
+ <DeviceMapContainer
+ :online-devices="onlineDevices"
+ :left-collapsed="leftCollapsed"
+ container-id="data-cockpit-map"
+ />
<LeftContainer class="left-container" v-model:activeId="leftActiveId" v-model:collapsed="leftCollapsed" />
<RightContainer class="right-container" v-model:collapsed="rightCollapsed" v-model:onlineDevices="onlineDevices" />
<CenterContainer @select-warning="onSelectWarning" @select-equipment="onSelectEquipment" />
+ <LegendBar class="legend-container" />
</div>
</template>
<script setup>
- import MapContainer from './components/MapContainer.vue';
+ import DeviceMapContainer from '@/components/map-container/device-map-container.vue';
import LeftContainer from './components/LeftContainer.vue';
import RightContainer from './components/RightContainer.vue';
import CenterContainer from './components/CenterContainer.vue';
+ import LegendBar from './components/LegendBar.vue';
const leftActiveId = ref(1);
const leftCollapsed = ref(false);
@@ -49,44 +55,44 @@
.left-container,
.right-container {
position: absolute;
- top: 96px;
- bottom: 0;
- width: 401px;
+ bottom: 20px;
+ width: 300px;
z-index: 9;
backdrop-filter: blur(2px);
+ border-radius: 10px 10px 10px 10px;
::v-deep(.wrapper) {
display: flex;
flex-direction: column;
position: absolute;
- top: 17px;
- bottom: 20px;
+ top: 0;
+ bottom: 0;
padding: 20px;
width: 300px;
background: rgba(0,0,0,0.3);
backdrop-filter: blur(16px);
border-radius: 10px 10px 10px 10px;
+ box-sizing: border-box;
}
}
.left-container {
- top: 96px;
- left: 0;
+ top: 113px;
+ left: 17px;
background: linear-gradient( 270deg, rgba(17,23,34,0) 0%, rgba(17,23,34,0.56) 50%, rgba(17,23,34,0.96) 100%);
-
- ::v-deep(.wrapper) {
- left: 17px;
- }
}
.right-container {
- top: 54px;
- right: 0;
+ top: 75px;
+ right: 17px;
background: linear-gradient( 270deg, rgba(17,23,34,0.96) 0.16%, rgba(17,23,34,0.56) 57.57%, rgba(4,30,37,0) 100%);
+ }
- ::v-deep(.wrapper) {
- top: 21px;
- right: 17px;
- }
+ .legend-container {
+ position: absolute;
+ left: 50%;
+ bottom: 22px;
+ transform: translateX(-50%);
+ z-index: 9;
}
</style>
--
Gitblit v1.9.3