Merge branch 'master' of http://120.26.64.82:10880/BFFE/dz2.1

src/components/publicPageTree/index.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="publicPageTree_tree">
       <el-scrollbar style="height: 100%" :horizontal="false">
-        <el-tree class="filter-tree" :data="data" :props="defaultProps" :node-key="nodeKey" :default-expanded-keys="defaultKeys" :filter-node-method="filterNode" ref="tree" @node-click="treeNodeClick" />
+        <el-tree class="filter-tree" :data="data" :props="defaultProps" :node-key="nodeKey" :default-expanded-keys="defaultKeys" highlight-current="true" :filter-node-method="filterNode" ref="tree" @node-click="treeNodeClick" />
       </el-scrollbar>
     </div>
   </div>
@@ -147,4 +147,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/layout/components/Sidebar/SidebarItem.vue

@@ -58,13 +58,13 @@ export default {
     return {};
   },
   mounted () {
-    // 
+    //
     // const vnodes
     // vnodes.push(<span slot='title'>{(title)}</span>)
   },
   methods: {
     hasOneShowingChild (children = [], parent) {
-      // 
+      //
       const showingChildren = children.filter((item) => {
         if (item.hidden) {
           return false;

src/styles/sidebar.scss

@@ -77,7 +77,7 @@
         background: #074FB8 !important;
       }
       .el-menu-item{
-        background-color: #074FB8 !important;
+        background-color: #074FB8;
       }
     }
 
@@ -102,7 +102,7 @@
     & .nest-menu .el-submenu > .el-submenu__title,
     & .el-submenu .el-menu-item {
       min-width: $sideBarWidth !important;
-      background-color: $subMenuBg !important;
+      background-color: $subMenuBg;
       &:hover {
         background-color: $subMenuHover !important;
       }