Merge branch 'master' into guangyin

# Conflicts:
#	src/views/overview.component.html
#	src/views/overview.component.ts

src/views/overview.component.ts

@@ -51,6 +51,8 @@ export default class OverViewComponent extends BaseComponent {
     activeNames = ['1']
     //展示告警详情右侧
     waringRightShow = false
+    //显示展示隐藏按钮
+    showPlay = false
 
     // 是否隐藏除地图外所有板块
     public hideAllPanel = false;
@@ -190,6 +192,7 @@ export default class OverViewComponent extends BaseComponent {
         this.hideAllPanel = !this.hideAllPanel;
         this.drawerChange(!this.hideAllPanel)
         if(!this.hideAllPanel){
+            this.showPlay = false
             this.player.api.cameraTour.stop();
             this.player.api.settings.setInteractiveMode(0)
         }
@@ -353,6 +356,7 @@ export default class OverViewComponent extends BaseComponent {
                 this.toggleLayer(item)
             }
         })
+        this.showPlay = true
         this.player.api.cameraTour.play(item.id)
     }
     closeRight(){