From 278df3748a9308f57cf88ad07e5eb6c601d5284c Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 25 Aug 2025 11:39:49 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.4' into test
---
src/views/dataCenter/dataCenter.vue | 4 +++-
src/components/map-container/mapContainer.vue | 10 +++++-----
src/views/device/airport.vue | 2 ++
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/components/map-container/mapContainer.vue b/src/components/map-container/mapContainer.vue
index 839228b..7d4a24d 100644
--- a/src/components/map-container/mapContainer.vue
+++ b/src/components/map-container/mapContainer.vue
@@ -4,9 +4,9 @@
* @LastEditors: shuishen 1109946754@qq.com
* @LastEditTime: 2025-04-28 11:34:40
* @FilePath: \drone-web-manage\src\components\map-container\mapContainer.vue
- * @Description:
- *
- * Copyright (c) 2024 by shuishen, All Rights Reserved.
+ * @Description:
+ *
+ * Copyright (c) 2024 by shuishen, All Rights Reserved.
-->
<template>
<div class="map-container">
@@ -105,7 +105,7 @@
// 定位到点位
const points = [[lng, lat]] // 确保格式为二维数组
- flyVisual(points, viewer, 4)
+ flyVisual({ positionsData:points, viewer })
}
/**
@@ -160,4 +160,4 @@
width: 100%;
height: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index df187a9..53ed838 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -18,6 +18,7 @@
<!-- 文件夹 -->
<div v-if="switchFolders" class="dataTable">
<el-table
+
class="custom-header custom-body"
v-loading="loadings"
element-loading-text=""
@@ -34,7 +35,7 @@
}}
</template>
</el-table-column>
- <el-table-column property="name" label="任务名称" show-overflow-tooltip />
+ <el-table-column property="recordName" label="任务名称" show-overflow-tooltip />
<el-table-column property="regionName" label="所属区域">
<template #default="scope">
<span>{{scope.row.city_name ? scope.row.city_name :'--'}},{{scope.row.area_name ? scope.row.area_name :'--'}}</span>
@@ -57,6 +58,7 @@
<!-- 表格部分 -->
<div class="dataTable" v-else>
<el-table
+ border
v-loading="loadings"
element-loading-text=""
:data="tableData"
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index ac96407..5479956 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -1149,6 +1149,8 @@
display: flex;
flex-direction: column;
align-items: center;
+ .el-tag:first-child{
+ margin-bottom: 5px;}
}
.onlineStatus {
--
Gitblit v1.9.3