Merge branch 'master' into guangyin

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

src/assets/style/pageCommon.component.scss

@@ -2684,6 +2684,11 @@ svg.loading-icon {
 }
 
 .tree-line{
+
+  &.el-tree--highlight-current .el-tree-node>.el-tree-node__content:hover{
+    background: rgba(125, 174, 255, 0.3);
+  }
+
   &.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{
     background: rgba(125, 174, 255, 0.7);
   }

src/components/view/left/viewLeft.component.html

@@ -10,6 +10,7 @@
                     :indent="0"
                     icon-class="none"
                     highlight-current
+                    :current-node-key="currentNodeKey"
                     @node-click="nodeClick"
                     :data="treeData"
             >

src/components/view/left/viewLeft.component.ts

@@ -21,7 +21,7 @@ Component.registerHooks([
 export default class ViewLeftComponent extends Vue {
     //标题左侧图标
     imgSrc = require("@/assets/icons/png/env/env-title-icon.png");
-
+    currentNodeKey = '';
     treeData = treeData;
     viewList = [
         {

src/views/overview.component.ts

@@ -267,6 +267,8 @@ export default class OverViewComponent extends BaseComponent {
     }
     closeRight(){
         this.viewRightShow = false;
+        const dom = document.querySelector('div.is-current') as any;
+        dom.classList.remove('is-current')
         if(this.currentEvent ){
             this.viewLayer[this.currentEvent.id].selected = false;
             this.addCustom(this.viewLayer[this.currentEvent.id],true);