From b51930a3cc1fcc11fe04ea0b8925eb6d7490a0d3 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 11 Nov 2025 16:49:38 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v7.0/7.0.4' into test
---
src/views/layerManagement/components/folderFile.vue | 5 +++--
src/views/layerManagement/components/leftList.vue | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/layerManagement/components/folderFile.vue b/src/views/layerManagement/components/folderFile.vue
index 372af90..1e55585 100644
--- a/src/views/layerManagement/components/folderFile.vue
+++ b/src/views/layerManagement/components/folderFile.vue
@@ -46,13 +46,14 @@
<div class="detailInfo" v-if="layerParams.editFolder">
<div class="infpItem" v-if="!itSLandPlanning">
<div class="itemData">
- <div class="title">围栏总数量</div>
+ <div class="title">{{ layerParams.fileType === 1 ? '识别区' : '禁飞区' }}总数量</div>
+
<div class="num">
<span>{{ formData.total_count }}</span> 个
</div>
</div>
<div class="itemData">
- <div class="title">围栏总面积</div>
+ <div class="title">{{ layerParams.fileType === 1 ? '识别区' : '禁飞区' }}总面积</div>
<div class="num">
<span class="areaStyle">{{ formData.total_area }}</span> m²
</div>
diff --git a/src/views/layerManagement/components/leftList.vue b/src/views/layerManagement/components/leftList.vue
index abebf4d..e82fb2b 100644
--- a/src/views/layerManagement/components/leftList.vue
+++ b/src/views/layerManagement/components/leftList.vue
@@ -223,10 +223,10 @@
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; // 自定义禁飞区类型标识
+ layerParams.value.fenceType = 2; // 自定义禁飞区类型标识
}
emit('update:deitData', node.data);
}
--
Gitblit v1.9.3