Compare commits

..

No commits in common. "679390c026ba4e070e2fc25f383acab050bbbf5c" and "250579d1e06e7c00b19498c0265e0f65fae1ddd7" have entirely different histories.

4 changed files with 10 additions and 12 deletions

View File

@ -17,9 +17,9 @@ export const treeData = [
title: '顶层沸溢火', title: '顶层沸溢火',
point: 1, point: 1,
position: [ position: [
11660785.92, 11660771.84,
3692445.44, 3692443.52,
23.0313525390625 47.9283447265625
], ],
img:img1, img:img1,
content: '模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗', content: '模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗',

View File

@ -107,7 +107,6 @@
border-radius: 6px; border-radius: 6px;
background: #000; background: #000;
position: absolute; position: absolute;
overflow: hidden;
} }
} }
.content{ .content{

View File

@ -138,7 +138,6 @@ export default class BaseComponent extends Vue {
if(layer.selected){ if(layer.selected){
if(layer.showPop){ if(layer.showPop){
this.player.api.marker.showPopupWindow(layer.ids) this.player.api.marker.showPopupWindow(layer.ids)
this.player.api.marker.focus(layer.ids,50,2)
} }
this.player.api.marker.show(layer.ids) this.player.api.marker.show(layer.ids)
}else{ }else{
@ -198,7 +197,7 @@ export default class BaseComponent extends Vue {
// 组件渲染完成 // 组件渲染完成
mounted() { mounted() {
// console.log(1)
} }
beforeDestory(){ beforeDestory(){
// //

View File

@ -77,6 +77,7 @@ export default class OverViewComponent extends BaseComponent {
} }
public handleChange(data) { public handleChange(data) {
console.log(data)
if(data.GroupID){ if(data.GroupID){
} }
} }
@ -85,13 +86,9 @@ export default class OverViewComponent extends BaseComponent {
this.currentNav = data; this.currentNav = data;
if(this.player){ if(this.player){
this.currentLayers = this.getCurrentLayers() 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(); this.resetMap();
} }
console.log('当前点击导航', data)
} }
@ -231,8 +228,10 @@ export default class OverViewComponent extends BaseComponent {
} }
} }
this.addCustom(this.viewLayer[item.id],true); this.addCustom(this.viewLayer[item.id],true);
console.log('右侧详情点击事件',item)
} }
mounted() { mounted() {
console.log(2)
} }
get showBackGround(){ get showBackGround(){
let flag = this.currentNav === 'view' && !this.viewRightShow let flag = this.currentNav === 'view' && !this.viewRightShow
@ -263,6 +262,7 @@ export default class OverViewComponent extends BaseComponent {
//进入路线导览 //进入路线导览
playView(item){ playView(item){
this.toggleAllPanel() this.toggleAllPanel()
console.log(item)
this.player.api.cameraTour.play(item.id) this.player.api.cameraTour.play(item.id)
} }
closeRight(){ closeRight(){
@ -279,7 +279,7 @@ export default class OverViewComponent extends BaseComponent {
} }
deactivated(){ deactivated(){
// console.log(123)
} }
beforeDestory() { beforeDestory() {
if (this.player) { if (this.player) {