From 9bd82b69690a9c9190f61e9bfce9ce6110ca54b5 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 10 Nov 2025 16:29:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
src/views/layerManagement/components/leftList.vue | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/views/layerManagement/components/leftList.vue b/src/views/layerManagement/components/leftList.vue
index b387d2b..505c737 100644
--- a/src/views/layerManagement/components/leftList.vue
+++ b/src/views/layerManagement/components/leftList.vue
@@ -28,13 +28,13 @@
<el-button class="ztzf-button"> 上传 </el-button>
</el-upload>
- <template v-if="activeName === '自定义禁飞区'">
+ <!-- <template v-if="activeName === '自定义禁飞区'">
<template v-if="failuresInfo.length">
<el-button class="ztzf-button" @click="synchronize"> 继续同步 </el-button>
<el-button class="ztzf-button" @click="failuresDel"> 取消同步 </el-button>
</template>
<el-button v-else class="ztzf-button" @click="synchronize"> 同步 </el-button>
- </template>
+ </template> -->
<el-button class="ztzf-button" @click="selectAll">全选</el-button>
</div>
@@ -170,9 +170,9 @@
} else {
// 全选：仅设置 level 3 节点的 id
treeRef.value.setCheckedKeys(allFenceKeys);
- checkedKeys.value = allFenceKeys; // 同步更新 checkedKeys
- checkedNodes.value = allFenceNodes; // 存储 level 3 数据
- coverData.value = allFenceNodes; // 同步 coverData
+ checkedKeys.value = allFenceKeys;
+ checkedNodes.value = allFenceNodes;
+ coverData.value = allFenceNodes;
}
emit('update:coverData', coverData.value);
}
@@ -356,13 +356,13 @@
position: absolute;
top: 0;
left: 0;
- height: 95%;
+height: calc(100% - 32px);
z-index: 99;
- width: 392px;
+ width: 382px;
overflow: hidden;
background: rgba(0, 0, 0, 0.8);
border-radius: 8px 8px 8px 8px;
- padding: 16px 12px;
+ padding: 16px 0 16px 12px;
display: flex;
flex-direction: column;
}
@@ -370,6 +370,7 @@
.searchBox {
display: flex;
margin-top: 10px;
+padding-right: 12px;
.inputName {
width: 184px;
height: 32px;
@@ -414,19 +415,21 @@
margin: 12px 0 14px 0;
display: flex;
gap: 0 10px;
-
+padding-right: 12px;
.el-button {
margin: 0 !important;
}
}
.tableListBox {
+ overflow-y: scroll;
+ height: 0;
+ flex-grow: 1;
+ padding-right: 12px;
:deep(.el-tree-node__content) {
height: 38px !important;
line-height: 38px !important;
}
- overflow-y: scroll;
- height: 0;
- flex-grow: 1;
+
.isTheTerritory {
:deep() {
.el-tree-node__expand-icon {
--
Gitblit v1.9.3