Merge branch 'master' into guangyin

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: '模拟在密闭建筑物内发生火灾，消防员在高温、浓烟、高噪音的情况下进行火情侦察，寻找被困人员，救出被困人员，灭火抢险等战斗',

src/popup/pop.component.vue

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

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{
@@ -197,7 +198,7 @@ export default class BaseComponent extends Vue {
 
     // 组件渲染完成
     mounted() {
-        console.log(1)
+        //
     }
     beforeDestory(){
         //

src/views/overview.component.ts

@@ -77,7 +77,6 @@ export default class OverViewComponent extends BaseComponent {
     }
 
     public handleChange(data) {
-        console.log(data)
         if(data.GroupID){
         }
     }
@@ -86,9 +85,13 @@ 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)
     }
 
 
@@ -228,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
@@ -262,7 +263,6 @@ export default class OverViewComponent extends BaseComponent {
     //进入路线导览
     playView(item){
         this.toggleAllPanel()
-        console.log(item)
         this.player.api.cameraTour.play(item.id)
     }
     closeRight(){
@@ -279,7 +279,7 @@ export default class OverViewComponent extends BaseComponent {
     }
 
     deactivated(){
-        console.log(123)
+        //
     }
     beforeDestory() {
         if (this.player) {