From 5808f76456ca0d40de5074f132b73a5a488e3e13 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 09 Dec 2025 09:12:03 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/layerManagement/components/folderFile.vue | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/views/layerManagement/components/folderFile.vue b/src/views/layerManagement/components/folderFile.vue
index 27250ff..eac8fde 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,15 +46,16 @@
<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> 个
+ <span class="totalQuantity">{{ 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²
+ <span class="areaStyle">{{ formData.total_area.toFixed(2) }}</span> m²
</div>
</div>
</div>
@@ -82,7 +82,7 @@
</template>
<script setup>
-const emit = defineEmits(['refreshMethod']);
+const emit = defineEmits(['refreshMethod','callParentMethod']);
import EventBus from '@/utils/eventBus';
import { ElMessage } from 'element-plus';
import dayjs from 'dayjs';
@@ -117,6 +117,7 @@
}));
};
const handleTypeChange = typeValue => {
+formData.value.algorithm_name = '';
const matchedCategory = allAlgorithms.value.find(category => category.dict_key === typeValue);
if (!matchedCategory || !matchedCategory.algorithms || matchedCategory.algorithms.length === 0) {
// 无匹配的算法时清空
@@ -151,6 +152,7 @@
};
const cancelHandel = () => {
clearAllData();
+ emit('callParentMethod');
};
const submitHandle = () => {
if (!formData.value.name) {
@@ -184,6 +186,7 @@
EventBus.emit('gettreeDataApi');
emit('refreshMethod');
clearAllData();
+ emit('callParentMethod');
});
} else {
//文件夹编辑
@@ -191,6 +194,7 @@
ElMessage.success('编辑成功');
EventBus.emit('gettreeDataApi');
clearAllData();
+ emit('callParentMethod');
});
}
};
@@ -228,12 +232,13 @@
position: absolute;
top: 0;
right: 0;
- height: 95%;
+height: calc(100% - 32px);
z-index: 99;
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;
@@ -277,11 +282,17 @@
font-size: 14px;
color: #ffffff;
}
- .areaStyle {
+ .totalQuantity {
font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: bold;
- font-size: 20px;
- color: #FFFFFF;
+ font-weight: bold;
+ font-size: 20px;
+ }
+ .areaStyle {
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: bold;
+ font-size: 20px;
+ color: #FFFFFF;
+
}
}
.itemData {
--
Gitblit v1.9.3