bdzl2/bxztApp
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bdzl2:568e89686f7fa0330d06df56854c4f71168f6560
Branches Tags
bdzl2:main
bdzl2:dev
bdzl2:feat-zc
..
compare: bdzl2:00488a301f0522d3d51db5380c7bf30732ed5fc1
Branches Tags
bdzl2:dev
bdzl2:feat-zc
bdzl2:main

No commits in common. "568e89686f7fa0330d06df56854c4f71168f6560" and "00488a301f0522d3d51db5380c7bf30732ed5fc1" have entirely different histories.
568e89686f ... 00488a301f

2 changed files with 24 additions and 56 deletions
Show Stats Expand all files Collapse all files

9
packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useMapMarkers.js
View File

@ -176,8 +176,7 @@ export function useMapMarkers() {
pixelSize: 12, pixelSize: 12,
outlineColor: Cesium.Color.WHITE, outlineColor: Cesium.Color.WHITE,
outlineWidth: 2, outlineWidth: 2,
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
disableDepthTestDistance: Number.POSITIVE_INFINITY
} }
}) })
entities.push(pointEntity) entities.push(pointEntity)
@ -655,8 +654,7 @@ export function useMapMarkers() {
width: 48, width: 48,
height: 48, height: 48,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM, verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
heightReference: resolveBillboardHeightReference(result.samplingSucceeded), heightReference: resolveBillboardHeightReference(result.samplingSucceeded)
disableDepthTestDistance: Number.POSITIVE_INFINITY
}, },
properties: { properties: {
type, type,
@ -743,8 +741,7 @@ export function useMapMarkers() {
width: 48, width: 48,
height: 48, height: 48,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM, verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
heightReference: resolveBillboardHeightReference(result.samplingSucceeded), heightReference: resolveBillboardHeightReference(result.samplingSucceeded)
disableDepthTestDistance: Number.POSITIVE_INFINITY
}, },
properties: { properties: {
type: 'station', type: 'station',

71
packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue
View File

@ -694,30 +694,28 @@ const initializeScene = async () => {
}, },
}) })
// 3. 添加模拟点位（人员和设备）- 已移至步骤10.5（地形就绪后） // 3. 添加模拟点位（人员和设备）
// 原因：在地形加载前添加会导致相机飞行时标记悬浮 const allMockPoints = mockDataService.getAllMockPoints()
// const allMockPoints = mockDataService.getAllMockPoints() allMockPoints.forEach((point) => {
// allMockPoints.forEach((point) => { const config =
// const config = point.type === 'soldier'
// point.type === 'soldier' ? mockDataService.createPersonnelEntityConfig(point, soldierIcon)
// ? mockDataService.createPersonnelEntityConfig(point, soldierIcon) : mockDataService.createDeviceEntityConfig(point, deviceIcon)
// : mockDataService.createDeviceEntityConfig(point, deviceIcon) viewer.entities.add(config)
// viewer.entities.add(config) })
// }) console.log(`[index.vue] 已添加 ${allMockPoints.length} 个模拟点位`)
// console.log(`[index.vue] 已添加 ${allMockPoints.length} 个模拟点位`)
// 4. 添加路径起点标记（用于"一键启动"）- 已移至步骤10.5（地形就绪后） // 4. 添加路径起点标记（用于"一键启动"）
// 原因：在地形加载前添加会导致相机飞行时标记悬浮 const allPaths = mockDataService.getAllAnimationPaths()
// const allPaths = mockDataService.getAllAnimationPaths() Object.entries(allPaths).forEach(([pathId, path]) => {
// Object.entries(allPaths).forEach(([pathId, path]) => { const icon = path.metadata.type === 'soldier' ? soldierIcon : deviceIcon
// const icon = path.metadata.type === 'soldier' ? soldierIcon : deviceIcon const config = mockDataService.createPathStartMarkerConfig(
// const config = mockDataService.createPathStartMarkerConfig( { ...path, id: pathId },
// { ...path, id: pathId }, icon
// icon )
// ) viewer.entities.add(config)
// viewer.entities.add(config) })
// }) console.log('[index.vue] 已添加 3 个路径起点标记')
// console.log('[index.vue] 已添加 3 个路径起点标记')
// 5. 设置地图点击事件监听 // 5. 设置地图点击事件监听
mapClickHandler.setupClickHandler(viewer, registerEventHandler, registerPostRenderListener) mapClickHandler.setupClickHandler(viewer, registerEventHandler, registerPostRenderListener)
@ -783,33 +781,6 @@ const initializeScene = async () => {
console.log('[index.vue] 等待地形完全就绪...') console.log('[index.vue] 等待地形完全就绪...')
await new Promise(resolve => setTimeout(resolve, 1000)) await new Promise(resolve => setTimeout(resolve, 1000))
// 10.5. 添加模拟点位和路径起点标记（在地形就绪后）
console.log('[index.vue] 添加模拟点位...')
const allMockPoints = mockDataService.getAllMockPoints()
allMockPoints.forEach((point) => {
const config =
point.type === 'soldier'
? mockDataService.createPersonnelEntityConfig(point, soldierIcon)
: mockDataService.createDeviceEntityConfig(point, deviceIcon)
viewer.entities.add(config)
})
console.log(`[index.vue] 已添加 ${allMockPoints.length} 个模拟点位`)
// 添加路径起点标记（用于"一键启动"）
const allPaths = mockDataService.getAllAnimationPaths()
Object.entries(allPaths).forEach(([pathId, path]) => {
const icon = path.metadata.type === 'soldier' ? soldierIcon : deviceIcon
const config = mockDataService.createPathStartMarkerConfig(
{ ...path, id: pathId },
icon
)
viewer.entities.add(config)
})
console.log('[index.vue] 已添加 3 个路径起点标记')
// 触发立即渲染，确保 CLAMP_TO_GROUND 生效
viewer.scene.requestRender()
// 11. 加载应急资源数据（在地形就绪后） // 11. 加载应急资源数据（在地形就绪后）
console.log('[index.vue] 加载应急资源数据...') console.log('[index.vue] 加载应急资源数据...')
await loadEmergencyResources(DISASTER_CENTER.lon, DISASTER_CENTER.lat) await loadEmergencyResources(DISASTER_CENTER.lon, DISASTER_CENTER.lat)