Merge remote-tracking branch 'origin/test' into test

linwei

2025-11-15 d94baed69ebfa0347b321d6fee42dded181161fe

 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;