Merge remote-tracking branch 'origin/图层管理' into 图层管理

张含笑

2025-10-31 4a080fd0160843583c49e05110b4d6e767502e86

 src/views/layerManagement/index.vue

@@ -18,8 +18,7 @@
            !layerParams.addNest &&
            !layerParams.editNest &&
            !layerParams.addFolder &&
            !layerParams.editFolder &&
            activeType !== '2'
            !layerParams.editFolder
          "
          @update:coverData="handleCoverDataUpdate"
          @update:deitData="handleEdit"
@@ -28,13 +27,12 @@
          @newFencesMethods="newFencesMethods"
        ></leftList>
        <rightEdit
          v-if="layerParams.addNest || (layerParams.editNest && activeType !== '2')"
          v-if="layerParams.addNest || (layerParams.editNest)"
          @callParentMethod="parentMethod"
        ></rightEdit>
        <folderFile
          v-if="layerParams.addFolder || (layerParams.editFolder && activeType !== '2')"
          v-if="layerParams.addFolder || (layerParams.editFolder)"
        ></folderFile>
        <nationalSpatialPlanning v-if="activeType === '2'" />
      </div>
    </div>
  </basic-container>
@@ -114,7 +112,7 @@
  } else if (activeName.value === '自定义禁飞区') {
    id = 2;
  } else {
    return;
    id = 3;
  }
  dataFolderApi(id).then(res => {
    const originalFolderList = res.data.data || [];