From 4a080fd0160843583c49e05110b4d6e767502e86 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 31 Oct 2025 11:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/图层管理' into 图层管理
---
src/views/layerManagement/index.vue | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/views/layerManagement/index.vue b/src/views/layerManagement/index.vue
index 7b733e1..ace1624 100644
--- a/src/views/layerManagement/index.vue
+++ b/src/views/layerManagement/index.vue
@@ -18,8 +18,7 @@
!layerParams.addNest &&
!layerParams.editNest &&
!layerParams.addFolder &&
- !layerParams.editFolder &&
- activeType !== '2'
+ !layerParams.editFolder
"
@update:coverData="handleCoverDataUpdate"
@update:deitData="handleEdit"
@@ -28,13 +27,12 @@
@newFencesMethods="newFencesMethods"
></leftList>
<rightEdit
- v-if="layerParams.addNest || (layerParams.editNest && activeType !== '2')"
+ v-if="layerParams.addNest || (layerParams.editNest)"
@callParentMethod="parentMethod"
></rightEdit>
<folderFile
- v-if="layerParams.addFolder || (layerParams.editFolder && activeType !== '2')"
+ v-if="layerParams.addFolder || (layerParams.editFolder)"
></folderFile>
- <nationalSpatialPlanning v-if="activeType === '2'" />
</div>
</div>
</basic-container>
@@ -114,7 +112,7 @@
} else if (activeName.value === '自定义禁飞区') {
id = 2;
} else {
- return;
+ id = 3;
}
dataFolderApi(id).then(res => {
const originalFolderList = res.data.data || [];
--
Gitblit v1.9.3