From a59928a183f3eb580a98ef6bcfb80b95d42559a9 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 11 Nov 2025 10:23:41 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v7.0/7.0.4' into feature/v8.0/8.0.1
---
src/views/layerManagement/components/leftList.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/layerManagement/components/leftList.vue b/src/views/layerManagement/components/leftList.vue
index 4b717b7..575d158 100644
--- a/src/views/layerManagement/components/leftList.vue
+++ b/src/views/layerManagement/components/leftList.vue
@@ -13,7 +13,7 @@
</div>
<div class="btnGroups">
<el-button v-if="activeName !== '国土空间规划'" class="ztzf-button" @click="addFence">{{
- props.activeName === '电子围栏' ? '新增围栏' : '新增禁飞区'
+ props.activeName === '自定义识别区' ? '新增围栏' : '新增禁飞区'
}}</el-button>
<el-button v-if="activeName !== '国土空间规划'" class="ztzf-button" @click="addFolder"
>新增文件夹</el-button
@@ -240,7 +240,7 @@
if (node.data.level == 2) {
layerParams.value.editFolder = true;
layerParams.value.addAnEditingFolder = 2;
- if (props.activeName === '电子围栏') {
+ if (props.activeName === '自定义识别区') {
layerParams.value.fileType = 1;
} else if (props.activeName === '自定义禁飞区') {
layerParams.value.fileType = 2;
@@ -252,7 +252,7 @@
coverData.value = [];
layerParams.value.editNest = true;
layerParams.value.decideWhetherToAddOrEdit = 2;
- if (props.activeName === '电子围栏') {
+ if (props.activeName === '自定义识别区') {
layerParams.value.fenceType = 1; // 电子围栏类型标识
} else if (props.activeName === '自定义禁飞区') {
layerParams.value.fenceType = 2; // 自定义禁飞区类型标识
@@ -296,7 +296,7 @@
const addFence = () => {
layerParams.value.addNest = true;
layerParams.value.decideWhetherToAddOrEdit = 1;
- if (props.activeName === '电子围栏') {
+ if (props.activeName === '自定义识别区') {
layerParams.value.fenceType = 1; // 电子围栏类型标识
} else if (props.activeName === '自定义禁飞区') {
layerParams.value.fenceType = 2; // 自定义禁飞区类型标识
@@ -307,7 +307,7 @@
const addFolder = () => {
layerParams.value.addFolder = true;
layerParams.value.addAnEditingFolder = 1;
- if (props.activeName === '电子围栏') {
+ if (props.activeName === '自定义识别区') {
layerParams.value.fileType = 1;
} else if (props.activeName === '自定义禁飞区') {
layerParams.value.fileType = 2;
--
Gitblit v1.9.3