diff --git a/src/mock/treeData.ts b/src/mock/treeData.ts index a2fbdb9..a35f8bc 100644 --- a/src/mock/treeData.ts +++ b/src/mock/treeData.ts @@ -17,9 +17,9 @@ export const treeData = [ title: '顶层沸溢火', point: 1, position: [ - 11660771.84, - 3692443.52, - 47.9283447265625 + 11660785.92, + 3692445.44, + 23.0313525390625 ], img:img1, content: '模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗', diff --git a/src/popup/pop.component.vue b/src/popup/pop.component.vue index b458dc6..cb9fdb5 100644 --- a/src/popup/pop.component.vue +++ b/src/popup/pop.component.vue @@ -107,6 +107,7 @@ border-radius: 6px; background: #000; position: absolute; + overflow: hidden; } } .content{ diff --git a/src/views/base.component.ts b/src/views/base.component.ts index f1b2ce0..025ca84 100644 --- a/src/views/base.component.ts +++ b/src/views/base.component.ts @@ -138,6 +138,7 @@ export default class BaseComponent extends Vue { if(layer.selected){ if(layer.showPop){ this.player.api.marker.showPopupWindow(layer.ids) + this.player.api.marker.focus(layer.ids,50,2) } this.player.api.marker.show(layer.ids) }else{ diff --git a/src/views/overview.component.ts b/src/views/overview.component.ts index 70e12ab..5b406af 100644 --- a/src/views/overview.component.ts +++ b/src/views/overview.component.ts @@ -70,7 +70,9 @@ export default class OverViewComponent extends BaseComponent { this.player.api.polyline.clear(); this.player.api.heatmap.clear(); this.currentLayers = this.getCurrentLayers(); - this.player.api.cameraTour.add(this.tourPathData) + this.player.api.cameraTour.add(this.tourPathData,(res)=>{ + console.log(res) + }) // this.tourPathData.forEach((item)=>{ // })