From 5dc1eb8074f52b2fdc03216b62ae4e2d82acbe0f Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 03 Nov 2025 08:45:21 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v7.0/7.0.4' into 图层管理

---
 src/views/layerManagement/components/folderFile.vue |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/views/layerManagement/components/folderFile.vue b/src/views/layerManagement/components/folderFile.vue
index c794153..8c696bd 100644
--- a/src/views/layerManagement/components/folderFile.vue
+++ b/src/views/layerManagement/components/folderFile.vue
@@ -8,12 +8,12 @@
           <el-input class="ztzf-input inputName" v-model="formData.name" placeholder="请输入" />
         </div>
       </div>
-      <div class="itemRow" v-if="!itSLandPlanning">
+      <div class="itemRow" v-if="layerParams.addAnEditingFolder === 1 && 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,7 @@
           </el-select>
           <el-select
             v-model="formData.algorithm_name"
-            popper-class="ztzf-select-popper"
+           
             class="ztzf-layer-search"
             placeholder="请选择"
             clearable
@@ -55,7 +55,7 @@
         <div class="itemData">
           <div class="title">围栏总面积</div>
           <div class="num">
-            <span>{{ formData.total_area }}</span> m²
+            <span class="areaStyle">{{ formData.total_area }}</span> m²
           </div>
         </div>
       </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,12 +157,14 @@
     ElMessage.error('请输入文件夹名称');
     return;
   }
-  if(!itSLandPlanning){
-    if (!formData.value.event_type) {
-      return ElMessage.warning('请选择类型');
+  if(!itSLandPlanning.value){
+    if (!formData.value.event_type && layerParams.value.fileType === 1) {
+      ElMessage.warning('请选择类型');
+      return;
     }
-    if (!formData.value.algorithm_name) {
-      return ElMessage.warning('请选择算法')
+    if (!formData.value.algorithm_name && layerParams.value.fileType === 1) {
+      ElMessage.warning('请选择算法');
+      return;
     }
   }
   const params = {
@@ -177,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();
     });
   }
@@ -261,18 +268,25 @@
       font-family: Source Han Sans CN, Source Han Sans CN;
       font-weight: 400;
       font-size: 14px;
-      color: #ffffff;
+      color: #DFDFDF;
       margin-bottom: 23px;
       .num {
         span {
           font-family: Source Han Sans CN, Source Han Sans CN;
           font-weight: bold;
-          font-size: 20px;
+          font-size: 14px;
           color: #ffffff;
         }
+         .areaStyle {
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: bold;
+        font-size: 20px;
+        color: #FFFFFF;
+                }
       }
       .itemData {
         width: 50%;
+
       }
     }
   }

--
Gitblit v1.9.3