From f1393f0ceedea20d671e381f32bdfa29e8dc09a7 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 13 Nov 2025 09:12:14 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v8.0/8.0.1' into test
---
src/views/layerManagement/components/folderFile.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/views/layerManagement/components/folderFile.vue b/src/views/layerManagement/components/folderFile.vue
index da5cd02..429b760 100644
--- a/src/views/layerManagement/components/folderFile.vue
+++ b/src/views/layerManagement/components/folderFile.vue
@@ -5,15 +5,15 @@
<div class="itemRow">
<div class="label">{{itSLandPlanning ? '文件' : '文件夹'}}名称</div>
<div>
- <el-input class="ztzf-input inputName" v-model="formData.name" placeholder="请输入" />
+ <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"
- popper-class="ztzf-select-popper"
+
@change="handleTypeChange"
v-model="formData.event_type"
placeholder="请选择"
@@ -28,7 +28,6 @@
</el-select>
<el-select
v-model="formData.algorithm_name"
- popper-class="ztzf-select-popper"
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>
@@ -82,6 +82,8 @@
</template>
<script setup>
+const emit = defineEmits(['refreshMethod']);
+import EventBus from '@/utils/eventBus';
import { ElMessage } from 'element-plus';
import dayjs from 'dayjs';
import { deleteFolderApi, deitFolderApi, addFolderApi } from '@/api/layer/index';
@@ -155,7 +157,7 @@
ElMessage.error('请输入文件夹名称');
return;
}
- if(!itSLandPlanning){
+ if(!itSLandPlanning.value){
if (!formData.value.event_type && layerParams.value.fileType === 1) {
ElMessage.warning('请选择类型');
return;
@@ -179,12 +181,15 @@
// 文件夹新增
addFolderApi(params).then(res => {
ElMessage.success('新增成功');
+ EventBus.emit('gettreeDataApi');
+ emit('refreshMethod');
clearAllData();
});
} else {
//文件夹编辑
deitFolderApi(params).then(res => {
ElMessage.success('编辑成功');
+ EventBus.emit('gettreeDataApi');
clearAllData();
});
}
@@ -223,7 +228,7 @@
position: absolute;
top: 0;
right: 0;
- height: 95%;
+height: calc(100% - 32px);
z-index: 99;
width: 324px;
--
Gitblit v1.9.3