From 7f3ba6f65e639560b1a148e78a3f3b6d0bd93ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BB=B6=E7=A6=8F?= <> Date: Thu, 18 May 2023 15:30:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E7=81=AB=E7=84=B0?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mock/treeData.ts | 6 +++--- src/popup/pop.component.vue | 1 + src/views/base.component.ts | 1 + src/views/overview.component.ts | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) 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)=>{ // }) From c5a3e310cc1bc7def8dc9b788224c6b5f0624e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BB=B6=E7=A6=8F?= <> Date: Thu, 18 May 2023 15:33:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=85=B3=E9=97=AD=E7=81=AB=E7=84=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/overview.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/overview.component.ts b/src/views/overview.component.ts index 5b406af..fd1f117 100644 --- a/src/views/overview.component.ts +++ b/src/views/overview.component.ts @@ -88,6 +88,11 @@ export default class OverViewComponent extends BaseComponent { this.currentNav = data; if(this.player){ this.currentLayers = this.getCurrentLayers() + if(this.currentEvent ){ + this.viewLayer[this.currentEvent.id].selected = false; + this.addCustom(this.viewLayer[this.currentEvent.id],true); + this.currentEvent = null; + } this.resetMap(); } console.log('当前点击导航', data) From 6fe0020264b494bcaaa3bdf08d0b7eecc6a9148d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BB=B6=E7=A6=8F?= <> Date: Thu, 18 May 2023 15:51:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?style:=E5=88=A0=E9=99=A4console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/base.component.ts | 2 +- src/views/overview.component.ts | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/views/base.component.ts b/src/views/base.component.ts index 025ca84..a0bd6ea 100644 --- a/src/views/base.component.ts +++ b/src/views/base.component.ts @@ -198,7 +198,7 @@ export default class BaseComponent extends Vue { // 组件渲染完成 mounted() { - console.log(1) + // } beforeDestory(){ // diff --git a/src/views/overview.component.ts b/src/views/overview.component.ts index fd1f117..a76d6b7 100644 --- a/src/views/overview.component.ts +++ b/src/views/overview.component.ts @@ -70,16 +70,13 @@ 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,(res)=>{ - console.log(res) - }) + this.player.api.cameraTour.add(this.tourPathData) // this.tourPathData.forEach((item)=>{ // }) } public handleChange(data) { - console.log(data) if(data.GroupID){ } } @@ -95,7 +92,6 @@ export default class OverViewComponent extends BaseComponent { } this.resetMap(); } - console.log('当前点击导航', data) } @@ -235,10 +231,8 @@ export default class OverViewComponent extends BaseComponent { } } this.addCustom(this.viewLayer[item.id],true); - console.log('右侧详情点击事件',item) } mounted() { - console.log(2) } get showBackGround(){ let flag = this.currentNav === 'view' && !this.viewRightShow @@ -269,7 +263,6 @@ export default class OverViewComponent extends BaseComponent { //进入路线导览 playView(item){ this.toggleAllPanel() - console.log(item) this.player.api.cameraTour.play(item.id) } closeRight(){ @@ -284,7 +277,7 @@ export default class OverViewComponent extends BaseComponent { } deactivated(){ - console.log(123) + // } beforeDestory() { if (this.player) {