From d94baed69ebfa0347b321d6fee42dded181161fe Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 15 Nov 2025 20:28:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
src/views/layerManagement/components/folderFile.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/views/layerManagement/components/folderFile.vue b/src/views/layerManagement/components/folderFile.vue
index 2cc12cf..27bfa17 100644
--- a/src/views/layerManagement/components/folderFile.vue
+++ b/src/views/layerManagement/components/folderFile.vue
@@ -8,12 +8,12 @@
<el-input class="ztzf-layer-input inputName" v-model="formData.name" placeholder="请输入" />
</div>
</div>
- <div class="itemRow" v-if="layerParams.addAnEditingFolder === 1 && layerParams.fileType !==2 && !itSLandPlanning">
+ <div class="itemRow" v-if="(layerParams.addAnEditingFolder === 1 && layerParams.fileType !==2) || (layerParams.addAnEditingFolder === 2 && layerParams.fileType !==2) && !itSLandPlanning">
<div class="label">关联算法</div>
<div>
<el-select
class="ztzf-layer-search filter-item"
-
+
@change="handleTypeChange"
v-model="formData.event_type"
placeholder="请选择"
@@ -28,7 +28,6 @@
</el-select>
<el-select
v-model="formData.algorithm_name"
-
class="ztzf-layer-search"
placeholder="请选择"
clearable
@@ -47,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>
@@ -233,7 +233,8 @@
width: 324px;
overflow: hidden;
- background: rgba(0, 0, 0, 0.8);
+ background: rgba(0,0,0,0.51);
+ backdrop-filter: blur(4px);
border-radius: 8px 8px 8px 8px;
padding: 16px 12px;
--
Gitblit v1.9.3