From 6670ccdd0a7052d5001f53aa39d7121ec19c8987 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 17 Nov 2025 10:40:36 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v8.0/8.0.2' into test

---
 src/views/layerManagement/components/rightEdit.vue |    6 +
 src/views/layerManagement/components/leftList.vue  |   29 +++--
 src/views/device/airport.vue                       |  152 +++++++++++++++---------------
 src/views/layerManagement/index.vue                |   74 +++++++++-----
 4 files changed, 147 insertions(+), 114 deletions(-)

diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index e64fa9d..ccaa340 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -1,10 +1,10 @@
 <template>
   <basic-main-content>
     <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" ref="crud" @row-del="rowDel"
-               v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
-               @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-               @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
-               @tree-load="treeLoad">
+      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
+      @tree-load="treeLoad">
       <template #menu-left>
         <el-button type="danger" icon="el-icon-delete" plain v-if="permission.device_delete" @click="handleDelete">删 除
         </el-button>
@@ -43,7 +43,7 @@
         <div v-if="row.firmware_status == 4" class="onlineStatus">
           <el-tag effect="dark" class="active-element" @click="updateFirmware(row)">升级中</el-tag>
           <el-progress v-if="row.firmware_progress > 0 && row.firmware_progress < 100"
-                       :percentage="row.firmware_progress"></el-progress>
+            :percentage="row.firmware_progress"></el-progress>
         </div>
       </template>
       <template #domain="{ row }">
@@ -53,31 +53,31 @@
       </template>
       <template #mode_code="{ row }">
         <span class="text" v-if="row.domain == 3 || row.domain == 0"
-              :style="row.mode_code != '-1' ? 'color: #00ee8b' : 'color: #de5e5e'">
+          :style="row.mode_code != '-1' ? 'color: #00ee8b' : 'color: #de5e5e'">
           {{ getModelText(row.mode_code) }}
         </span>
       </template>
       <template #menu="scope">
         <el-dropdown>
           <el-button type="primary" text v-if="permission.oss_set"><el-icon>
-            <MoreFilled />
-          </el-icon>更多</el-button>
+              <MoreFilled />
+            </el-icon>更多</el-button>
           <template #dropdown v-if="scope.row.domain == 3">
             <el-dropdown-menu teleported>
               <el-dropdown-item command="a">
                 <el-button type="primary" text icon="el-icon-paperclip" v-if="permission.oss_set"
-                           @click.stop="handleOpenOssSet(scope.row, scope.index)">存储配置</el-button>
+                  @click.stop="handleOpenOssSet(scope.row, scope.index)">存储配置</el-button>
               </el-dropdown-item>
               <el-dropdown-item command="b">
                 <el-button type="primary" text icon="el-icon-share" v-if="permission.per_share && scope.row.domain == 3"
-                           @click.stop="handleOpenDevicePerShare(scope.row, scope.index)">机场授权</el-button>
+                  @click.stop="handleOpenDevicePerShare(scope.row, scope.index)">机场授权</el-button>
               </el-dropdown-item>
               <el-dropdown-item command="c"> <el-button type="primary" text icon="el-icon-position"
-                                                        :disabled="!scope.row.status" v-if="permission.rang_con && scope.row.domain == 3"
-                                                        @click.stop="handleOpenRemoteDebugging(scope.row, scope.index)">远程调试</el-button>
+                  :disabled="!scope.row.status" v-if="permission.rang_con && scope.row.domain == 3"
+                  @click.stop="handleOpenRemoteDebugging(scope.row, scope.index)">远程调试</el-button>
               </el-dropdown-item>
               <el-dropdown-item command="d"><el-button type="primary" text icon="el-icon-collection"
-                                                       v-if="permission.fly_device_offline" @click.stop="rollFirmware(scope.row)">固件版本管理</el-button>
+                  v-if="permission.fly_device_offline" @click.stop="rollFirmware(scope.row)">固件版本管理</el-button>
               </el-dropdown-item>
               <el-dropdown-item command="d" v-if="!scope.row.status">
                 <el-button type="primary" text icon="el-icon-collection" @click.stop="dockNotLine(scope.row)">
@@ -85,13 +85,11 @@
                 </el-button>
               </el-dropdown-item>
               <el-dropdown-item command="e"><el-button type="primary" text icon="el-icon-document-delete"
-                                                       v-if="permission.fly_device_offline" @click.stop="handleDeviceOffline(scope.row)">注销</el-button>
+                  v-if="permission.fly_device_offline" @click.stop="handleDeviceOffline(scope.row)">注销</el-button>
               </el-dropdown-item>
               <el-dropdown-item command="e">
-                <el-button type="primary" text icon="el-icon-document-delete"
-                           v-if="permission.fly_device_offline"
-                           :disabled="scope.row.dem_status === 1"
-                           @click.stop="handleStatus(scope.row)">
+                <el-button type="primary" text icon="el-icon-document-delete" v-if="permission.fly_device_offline"
+                  :disabled="scope.row.dem_status === 1" @click.stop="handleStatus(scope.row)">
                   {{ scope.row.dem_status === 0 ? '初始化地形' : (scope.row.dem_status === 1 ? '初始化中' : '更新地形') }}
                 </el-button>
               </el-dropdown-item>
@@ -106,7 +104,7 @@
                     <el-button type="primary" text icon="el-icon-key" v-if="permission.operate_password_set" @click.stop="handleOperatePassword(scope.row, scope.index)">操控密码设置</el-button>
                   </el-dropdown-item> -->
               <el-dropdown-item command="d"><el-button type="primary" text icon="el-icon-collection"
-                                                       @click.stop="rollFirmware(scope.row)">固件版本管理</el-button>
+                  @click.stop="rollFirmware(scope.row)">固件版本管理</el-button>
               </el-dropdown-item>
             </el-dropdown-menu>
           </template>
@@ -191,7 +189,7 @@
         固件版本升级/回退:
         <el-select v-model="rollFirmVersion" clearable placeholder="请选择固件版本" style="width: 240px">
           <el-option v-for="item in firmList" :key="item.firmware_version" :label="item.firmware_version"
-                     :value="item.firmware_version" />
+            :value="item.firmware_version" />
         </el-select>
       </div>
       <template #footer>
@@ -203,7 +201,7 @@
     </el-dialog>
 
     <el-drawer class="ztzf-drawer-body-basic-container ztzf-el-card__body" title="机场授权管理" size="60%" append-to-body
-               v-model="devicePerShareVisible" :direction="'rtl'">
+      v-model="devicePerShareVisible" :direction="'rtl'">
       <DevicePerShare ref="devicePerShare" />
     </el-drawer>
 
@@ -252,7 +250,7 @@
     DevicePerShare,
     DockControlPanel,
   },
-  data () {
+  data() {
     // const self = this
 
     const validatePass = (rule, value, callback) => {
@@ -791,7 +789,7 @@
 
   computed: {
     ...mapGetters(['permission', 'userInfo']),
-    permissionList () {
+    permissionList() {
       return {
         addBtn: this.validData(this.permission.air_add, true),
         viewBtn: this.validData(this.permission.air_view, true),
@@ -799,7 +797,7 @@
         editBtn: this.validData(this.permission.air_edit, true),
       }
     },
-    ids () {
+    ids() {
       let ids = []
       this.selectionList.forEach(ele => {
         ids.push(ele.id)
@@ -807,7 +805,7 @@
       return ids.join(',')
     },
   },
-  destroyed () {
+  destroyed() {
     this.treeResolveMap.clear()
     this.websocketMap.forEach((k, v) => {
       if (null != v) {
@@ -817,17 +815,17 @@
       }
     })
   },
-  mounted () {
+  mounted() {
     getRegionTreeAll({ parentCode: this.userInfo.detail.areaCode }).then(res => {
       const column = this.findObject(this.option.column, 'area_code')
       column.dicData = res.data.data ? [res.data.data] : []
     })
   },
   methods: {
-    getDockModeText (value) {
+    getDockModeText(value) {
       return EDockModeText[value] || ''
     },
-    getModelText (value) {
+    getModelText(value) {
       let txt = '离线'
       if (value === 0 || value === 4) {
         txt = '在线'
@@ -841,7 +839,7 @@
       return txt
     },
     // 关闭所有的webscoket
-    closeAllWebsoket () {
+    closeAllWebsoket() {
       this.websocketMap.forEach((k, v) => {
         if (null != v) {
           v.close()
@@ -851,7 +849,7 @@
       })
     },
     // 连接webSocket
-    connectWebSocket (data) {
+    connectWebSocket(data) {
       const webSocketId = data.workspace_id
       if (!this.webSocketIdSet.has(webSocketId)) {
         // 防止重复连接
@@ -861,14 +859,14 @@
         this.useConnectWebSocket1(webSocketId, webSorketUrl)
       }
     },
-    useConnectWebSocket1 (webSocketId, url) {
+    useConnectWebSocket1(webSocketId, url) {
       const websocket = new ConnectWebSocket(url)
       // 加入 webscoket map
       this.websocketMap.set(webSocketId, websocket)
       websocket?.registerMessageHandler(this.messageHandler)
       websocket?.initSocket()
     },
-    async messageHandler (payload) {
+    async messageHandler(payload) {
       if (!payload) {
         return
       }
@@ -893,7 +891,7 @@
         }
       })
     },
-    init () {
+    init() {
       (this.page = {
         pageSize: 10,
         currentPage: 1,
@@ -902,7 +900,7 @@
         this.onLoad(this.page)
     },
     // 打开权限分享页面
-    handleOpenDevicePerShare (row) {
+    handleOpenDevicePerShare(row) {
       var that = this
       this.devicePerShareVisible = true
       this.$nextTick(() => {
@@ -910,14 +908,14 @@
       })
     },
     // 打开远程调试
-    handleOpenRemoteDebugging (row) {
+    handleOpenRemoteDebugging(row) {
       this.curDeviceInfo = row
       this.remoteDebuggingShow = true
       this.operateTitle = row.nickname + ' - ' + row.device_sn
     },
 
     // 设备注销
-    handleDeviceOffline (row) {
+    handleDeviceOffline(row) {
       this.cancenOperate = true
       this.cancelSNName = row.nickname
       this.cancenOperateRow = row
@@ -925,21 +923,23 @@
 
     // 设备
     handleStatus(row) {
-      console.log(row, '8888')
       // dem_status
-      initAirportTerrainHeight({ dockSn: row.device_sn, centerLon: row.longitude, centerLat: row.latitude,  }).then(res => {
-        ElMessage.success('操作成功')
-      })
-      if (row.dem_status != 0){
-      deleteAirportTerrainHeight({ dockSn: row.device_sn }).then(res => {
-        ElMessage.success('操作成功')
-      })
+      if (row.dem_status === 2 || row.dem_status === 3) {
+        deleteAirportTerrainHeight({ dockSn: row.device_sn }).then(res => {
+          initAirportTerrainHeight({ dockSn: row.device_sn, centerLon: row.longitude, centerLat: row.latitude, }).then(res => {
+            ElMessage.success('操作成功')
+            this.init()
+          })
+        })
+      } else {
+        initAirportTerrainHeight({ dockSn: row.device_sn, centerLon: row.longitude, centerLat: row.latitude,  }).then(res => {
+            ElMessage.success('操作成功')
+            this.init()
+        })
       }
-
-      this.init()
     },
 
-    cancenOperateDo () {
+    cancenOperateDo() {
       this.cancenOperate = false
       this.deleteFlag = false
       deviceOffline(this.cancenOperateRow.device_sn, true).then(res => {
@@ -952,7 +952,7 @@
     },
 
     // 打开存储对象配置页面
-    handleOpenOssSet (row) {
+    handleOpenOssSet(row) {
       var that = this
       this.deviceSn = row.device_sn
       this.ossSetBox = true
@@ -968,7 +968,7 @@
       })
     },
     // 打开固件管理页面
-    handleOpenFirmwarm (row) {
+    handleOpenFirmwarm(row) {
       var that = this
       this.firmwareManageVisible = true
       this.$nextTick(() => {
@@ -976,7 +976,7 @@
       })
     },
     // 设备下线
-    dockNotLine (row) {
+    dockNotLine(row) {
       let txt = row.hidden_flag === 1 ? '上线' : '下线'
       ElMessageBox.confirm(`确定${txt}该设备吗?`, '提示', {
         confirmButtonText: '确定',
@@ -997,7 +997,7 @@
         .catch(() => { })
     },
     // 版本回退点击事件
-    rollFirmware (row) {
+    rollFirmware(row) {
       if (row.status == 0) {
         this.$message({
           type: 'warning',
@@ -1046,7 +1046,7 @@
       })
     },
     // 比较版本大小
-    compare (version1, version2) {
+    compare(version1, version2) {
       let arr1 = version1.split('.')
       let arr2 = version2.split('.')
       let length = Math.max(arr1.length, arr2.length)
@@ -1060,7 +1060,7 @@
       return 0
     },
     // 版本回退
-    rollFirmwareConfirm () {
+    rollFirmwareConfirm() {
       // 无人机升级/回滚
       if (this.rollFirmVersion == '') {
         this.$message({
@@ -1135,7 +1135,7 @@
       })
     },
     // 升级固件按钮事件
-    updateFirmware (row) {
+    updateFirmware(row) {
       if (row.status == 0) {
         this.$message({
           type: 'warning',
@@ -1167,7 +1167,7 @@
       })
     },
     // 确定升级固件版本
-    updateFirmwareConfirm () {
+    updateFirmwareConfirm() {
       var that = this
       var arr = []
       arr.push(that.firmwareInfo)
@@ -1183,13 +1183,13 @@
         done()
       })
     },
-    handleOssSetClose () {
+    handleOssSetClose() {
       this.ossEnd = ''
       this.deviceSn = ''
       this.bindOssId = null
     },
     // 存储对象配置确定
-    ossSetConfirm () {
+    ossSetConfirm() {
       var that = this
       // 判断是否已选择
       if (!this.ossEnd) {
@@ -1216,7 +1216,7 @@
       })
     },
     // 取消配置
-    cancelOssSetConfirm () {
+    cancelOssSetConfirm() {
       var that = this
       // 判断是否已有配置
       if (!this.bindOssId) {
@@ -1236,13 +1236,13 @@
       })
     },
     // 取消按钮 oss
-    cancelOssSet () {
+    cancelOssSet() {
       this.ossEnd = ''
       this.deviceSn = ''
       this.bindOssId = null
       this.ossSetBox = false
     },
-    rowSave (row, done, loading) {
+    rowSave(row, done, loading) {
       let areaCode = row.area_code
       if (Array.isArray(areaCode)) {
         areaCode = areaCode[areaCode.length - 1]
@@ -1267,7 +1267,7 @@
         }
       )
     },
-    rowUpdate (row, index, done, loading) {
+    rowUpdate(row, index, done, loading) {
       const submitData = {
         ...row,
         area_code: row.area_code.split(',').pop(),
@@ -1314,7 +1314,7 @@
         }
       )
     },
-    rowDel (row) {
+    rowDel(row) {
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1331,24 +1331,24 @@
           })
         })
     },
-    searchReset () {
+    searchReset() {
       this.query = {}
       this.onLoad(this.page)
     },
-    searchChange (params, done) {
+    searchChange(params, done) {
       this.query = params
       this.page.currentPage = 1
       this.onLoad(this.page, params)
       done()
     },
-    selectionChange (list) {
+    selectionChange(list) {
       this.selectionList = list
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = []
       this.$refs.crud.toggleSelection()
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据')
         return
@@ -1370,7 +1370,7 @@
           this.$refs.crud.toggleSelection()
         })
     },
-    async getFullAreaCode (areaCode) {
+    async getFullAreaCode(areaCode) {
       console.log('getFullAreaCode', areaCode)
       if (!areaCode) return ''
 
@@ -1389,7 +1389,7 @@
         return `${provinceCode},${cityCode},${code}`
       }
     },
-    beforeOpen (done, type) {
+    beforeOpen(done, type) {
       if (['edit', 'view'].includes(type)) {
         getDetail(this.form.id).then(async res => {
           const data = res.data.data
@@ -1407,16 +1407,16 @@
         })
       }
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize
     },
-    refreshChange () {
+    refreshChange() {
       this.onLoad(this.page, this.query)
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       // this.closeAllWebsoket();
       const { releaseTimeRange } = this.query
       let values = {
@@ -1451,7 +1451,7 @@
         this.selectionClear()
       })
     },
-    treeLoad (tree, treeNode, resolve) {
+    treeLoad(tree, treeNode, resolve) {
       // 保存resolve
       this.treeResolveMap.set(tree.child_sn, resolve)
       var params = {
@@ -1483,7 +1483,7 @@
     //     })
     // },
     // 设置无人机操作密码
-    setOperatePasswordConfirm () {
+    setOperatePasswordConfirm() {
       var that = this
       this.$refs.passwordForm.validate(valid => {
         if (valid) {
@@ -1510,7 +1510,7 @@
       })
     },
     // 操作密码设置
-    handleOperatePassword (row) {
+    handleOperatePassword(row) {
       this.operatePasswordSetBox = true
       this.passwordForm.id = row.id
     },
diff --git a/src/views/layerManagement/components/leftList.vue b/src/views/layerManagement/components/leftList.vue
index 23fb1a6..812bcdd 100644
--- a/src/views/layerManagement/components/leftList.vue
+++ b/src/views/layerManagement/components/leftList.vue
@@ -188,37 +188,44 @@
 };
 // 定位按钮事件
 const handleLocation = node => {
- if (node.data.level === 2) {
-    layerParams.value.isSingleLocating = false; 
+  if (node.data.level === 2) {
+    layerParams.value.isSingleLocating = false;
+    // 新增:标记当前定位的文件夹ID
+    layerParams.value.currentLocationFolderId = node.data.id;
   } else if (node.data.level === 3) {
-    layerParams.value.isSingleLocating = true; 
+    layerParams.value.isSingleLocating = true;
+    // 清空文件夹定位标识
+    layerParams.value.currentLocationFolderId = null;
   }
 
   const currentCheckedKeys = [...checkedKeys.value];
   const currentCheckedNodes = [...checkedNodes.value];
   EventBus.emit('focusOnNode', node.data);
+  
   if (node.data.level === 2) {
     const folderChildren = node.data.children || [];
     const childrenIds = folderChildren.map(child => child.id);
-    // 合并已选中的节点和当前文件夹的子节点
-    const newCheckedKeys = [...new Set([...currentCheckedKeys, ...childrenIds])];
-    const newCheckedNodes = [...currentCheckedNodes, ...folderChildren];
+    const newChildrenIds = childrenIds.filter(id => !currentCheckedKeys.includes(id));
+    const newChildrenNodes = folderChildren.filter(child => newChildrenIds.includes(child.id));
+    
+    const newCheckedKeys = [...new Set([...currentCheckedKeys, ...newChildrenIds])];
+    const newCheckedNodes = [...currentCheckedNodes, ...newChildrenNodes];
+    
     treeRef.value.setCheckedKeys(newCheckedKeys);
     checkedKeys.value = newCheckedKeys;
     checkedNodes.value = newCheckedNodes;
     coverData.value = newCheckedNodes;
-  } 
-  // 如果是单个节点(level 3),仅添加到选中列表(如果未选中)
-  else if (!currentCheckedKeys.includes(node.data.id)) {
-  layerParams.value.isSingleLocating = true
+    emit('update:coverData', coverData.value);
+  } else if (!currentCheckedKeys.includes(node.data.id)) {
+    layerParams.value.isSingleLocating = true;
     currentCheckedKeys.push(node.data.id);
     currentCheckedNodes.push(node.data);
     treeRef.value.setCheckedKeys(currentCheckedKeys);
     checkedKeys.value = currentCheckedKeys;
     checkedNodes.value = currentCheckedNodes;
     coverData.value = currentCheckedNodes;
+    emit('update:coverData', coverData.value);
   }
-  emit('update:coverData', coverData.value);
 };
 // 编辑按钮事件
 const handleEdit = node => {
diff --git a/src/views/layerManagement/components/rightEdit.vue b/src/views/layerManagement/components/rightEdit.vue
index 4566fc7..9e9dee6 100644
--- a/src/views/layerManagement/components/rightEdit.vue
+++ b/src/views/layerManagement/components/rightEdit.vue
@@ -45,6 +45,7 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+                :disabled-date="disabledDate"
           />
         </div>
       </div>
@@ -156,7 +157,10 @@
 const isDisabled = computed(() => {
   return layerParams.value.editingIsProhibited;
 });
-
+// 禁用当天之前的日期
+const disabledDate = time => {
+  return time.getTime() < Date.now() - 8.64e7 // 86400000 = 24 * 60 * 60 * 1000
+}
 watch(
   () => layerParams.value.fenceArea,
   newArea => {
diff --git a/src/views/layerManagement/index.vue b/src/views/layerManagement/index.vue
index 9ff0fda..2a1c09d 100644
--- a/src/views/layerManagement/index.vue
+++ b/src/views/layerManagement/index.vue
@@ -97,7 +97,8 @@
   editFolderData: null,
   editingIsProhibited: false, //禁止编辑
   isDetailShow: false,
-  isSingleLocating:false
+  isSingleLocating:false ,
+  currentLocationFolderId:null,
 });
 
 const handleClick = tab => {
@@ -169,6 +170,8 @@
 };
 // 点击显示区域
 const handleCoverDataUpdate = data => {
+console.log('daa',data);
+
   selectDataList.value = data;
   if (selectDataList.value.length > 0) {
   
@@ -241,9 +244,7 @@
       },
       zIndex: 99, 
     });
-  });
-
-  
+  });  
  if (!layerParams.value.isSingleLocating) {
     focusOnAllFeatures(); 
   }
@@ -251,16 +252,44 @@
 };
 const focusOnAllFeatures = () => {
   if (tbJwdList.length === 0 || !viewer) return;
+  
+  // 判断是否有指定定位的文件夹
+  if (layerParams.value.currentLocationFolderId) {
+    // 筛选当前文件夹下的所有子节点坐标
+    const targetFolderPositions = selectDataList.value
+      .filter(item => item.folder_id === layerParams.value.currentLocationFolderId)
+      .flatMap(item => {
+        const positions = parseGeoDataToPositions(item.geo_data, item.altitude);
+        return positions.length >= 3 ? positions : [];
+      });
+    
+    if (targetFolderPositions.length > 0) {
+      const positionsData = targetFolderPositions.map(pos => [
+        pos.lng,
+        pos.lat,
+        pos.height || 0
+      ]);
+      flyVisual({
+        positionsData,
+        viewer,
+        multiple: activeName.value === '国土空间规划' ? 13 : 10,
+        pitch: -90
+      });
+      return; // 仅聚焦当前文件夹,结束方法
+    }
+  }
+
+  // 无指定文件夹时,聚焦所有选中数据
   const positionsData = tbJwdList.map(pos => [
     pos.lng,
     pos.lat,
-    pos.height || 0 
+    pos.height || 0
   ]);
   flyVisual({
     positionsData,
     viewer,
-      multiple:activeName.value == '国土空间规划' ? 13 :4, // 缩放倍数
-    pitch: -90 
+    multiple: activeName.value === '国土空间规划' ? 13 : 4,
+    pitch: -90
   });
 };
 // 区域点击显示详细信息
@@ -409,14 +438,6 @@
   }
 };
 provide('layerParams', layerParams);
-// onMounted(() => {
-//   initMap();
-//   cesiumContextMenu();
-//   getdataFolderApi();
-//   EventBus.on('deleteMapEntityById', deleteMapEntityById);
-//   EventBus.on('deleteMapEntitiesByFolderId', deleteMapEntitiesByFolderId);
-  
-// });
 onMounted(() => {
   initMap();
   cesiumContextMenu();
@@ -431,22 +452,23 @@
 
 //定位到指定节点
 const focusOnNode = (nodeData) => {
-
   if (!viewer || !nodeData?.geo_data) return;
 
   // 解析节点坐标
   const positions = parseGeoDataToPositions(nodeData.geo_data, nodeData.altitude);
-if (positions.length < 3) {
- 
-    return;
-  }
-  flyVisual({
-    positionsData: positions.map(pos => [pos.lng, pos.lat, pos.height || 0]),
-    viewer,
-      multiple:activeName.value == '国土空间规划' ? 13 :7, // 缩放倍数
-    pitch: -90
-  });
+  if (positions.length < 3) return;
 
+  // level 2 节点走全量聚焦,level 3 节点走单个聚焦
+  if (nodeData.level === 2) {
+    focusOnAllFeatures();
+  } else {
+    flyVisual({
+      positionsData: positions.map(pos => [pos.lng, pos.lat, pos.height || 0]),
+      viewer,
+      multiple: activeName.value === '国土空间规划' ? 13 : 7, // 缩放倍数
+      pitch: -90
+    });
+  }
 };
 onBeforeUnmount(() => {
   destroyMap();

--
Gitblit v1.9.3