Merge branch 'refs/heads/feature/v8.0/8.0.1' into test

张含笑

2025-11-11 5867b96277606b29d267bb6303ab60754159037b

Merge branch 'refs/heads/feature/v8.0/8.0.1' into test

 src/views/layerManagement/components/folderFile.vue

@@ -8,7 +8,7 @@
          <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=" !itSLandPlanning">
        <div class="label">关联算法</div>
        <div>
          <el-select

 src/views/layerManagement/components/leftList.vue

@@ -13,7 +13,7 @@
    </div>
    <div class="btnGroups">
      <el-button v-if="activeName !== '国土空间规划'" class="ztzf-button" @click="addFence">{{
        props.activeName === '自定义识别区' ? '新增围栏' : '新增禁飞区'
        props.activeName === '自定义识别区' ? '新增识别区' : '新增禁飞区'
      }}</el-button>
      <el-button v-if="activeName !== '国土空间规划'" class="ztzf-button" @click="addFolder"
        >新增文件夹</el-button
@@ -36,7 +36,10 @@
        <el-button v-else class="ztzf-button" @click="synchronize"> 同步 </el-button>
      </template> -->

      <el-button class="ztzf-button" @click="selectAll">全选</el-button>
      <!-- <el-button class="ztzf-button" @click="selectAll">全选</el-button> -->
      <el-button class="ztzf-button" @click="selectAll">
  {{ checkedKeys.length === getAllFenceKeys().length ? '取消全选' : '全选' }}
</el-button>
    </div>
    <div
      class="tableListBox"
@@ -154,21 +157,24 @@
  emit('update:coverData', coverData.value);
};
// 全选方法
const getAllFenceKeys = () => {
  return treeData.value.flatMap(
    folder => folder.children.map(fence => fence.id)
  );
};
const selectAll = () => {
  if (treeRef.value) {
    const allFenceKeys = treeData.value.flatMap(
      folder => folder.children.map(fence => fence.id) // folder 是 level 2，children 是 level 3
    );

    const allFenceKeys = getAllFenceKeys();
    const allFenceNodes = treeData.value.flatMap(folder => folder.children);
    
    if (checkedKeys.value.length === allFenceKeys.length) {
      // 取消全选：清空 keys 和数据
      // 取消全选
      treeRef.value.setCheckedKeys([]);
      checkedKeys.value = [];
      checkedNodes.value = [];
      coverData.value = [];
    } else {
      // 全选：仅设置 level 3 节点的 id
      // 全选
      treeRef.value.setCheckedKeys(allFenceKeys);
      checkedKeys.value = allFenceKeys;
      checkedNodes.value = allFenceNodes;
@@ -191,9 +197,15 @@
    coverData.value = folderChildren;
    emit('update:coverData', coverData.value);
  } else {
    emit('update:coverData', [node.data]);
    // const currentNodeId = node.data.id;
    // treeRef.value.setCheckedKeys([currentNodeId]);
    // checkedKeys.value = [currentNodeId];
    // checkedNodes.value = [node.data];
    coverData.value = [node.data];
    emit('update:coverData', coverData.value);
  }
};

// 编辑按钮事件
const handleEdit = node => {
  if (node.data.level == 2) {

 src/views/layerManagement/index.vue

@@ -308,6 +308,7 @@
  });
  viewer = publicCesiumInstance.getViewer();
  viewInstance.value = publicCesiumInstance;
  viewInstance.value?.flyToContour();
  const nanChangPosition = Cesium.Cartesian3.fromDegrees(
    115.892151, // 经度
    28.676493, // 纬度
@@ -400,6 +401,7 @@
  getdataFolderApi();
  EventBus.on('deleteMapEntityById', deleteMapEntityById);
  EventBus.on('deleteMapEntitiesByFolderId', deleteMapEntitiesByFolderId);
  
});
onBeforeUnmount(() => {
  destroyMap();