From 6ce743526578db708c4b8eb04ba269ece2f96e1b Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 28 Aug 2020 10:58:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=98=BE=E9=9A=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/main-sidebar-sub-menu.vue        |  4 ++--
 epmet-oper-web/src/views/main-sidebar.vue      | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/epmet-oper-web/src/views/main-sidebar-sub-menu.vue b/epmet-oper-web/src/views/main-sidebar-sub-menu.vue
index cd82f33..fe82986 100644
--- a/epmet-oper-web/src/views/main-sidebar-sub-menu.vue
+++ b/epmet-oper-web/src/views/main-sidebar-sub-menu.vue
@@ -1,5 +1,5 @@
 <template>
-  <!-- <div v-if="menu.showFlag"> -->
+  <div v-if="menu.showFlag">
     <el-submenu
       v-if="menu.children && menu.children.length >= 1"
       :index="menu.id"
@@ -20,7 +20,7 @@
         </svg>
         <span>{{ menu.name }}</span>
     </el-menu-item>
-  <!-- </div> -->
+  </div>
 </template>
 
 <script>
diff --git a/epmet-oper-web/src/views/main-sidebar.vue b/epmet-oper-web/src/views/main-sidebar.vue
index 0514fe2..7116c10 100644
--- a/epmet-oper-web/src/views/main-sidebar.vue
+++ b/epmet-oper-web/src/views/main-sidebar.vue
@@ -1,14 +1,13 @@
 <template>
   <aside :class="['aui-sidebar', `aui-sidebar--${$store.state.sidebarLayoutSkin}`]">
     <div class="aui-sidebar__inner">
-      <el-menu :default-active="$store.state.sidebarMenuActiveName"
-               :collapse="false"
-               :unique-opened="true"
-               :collapseTransition="false"
-               class="aui-sidebar__menu">
-        <sub-menu v-for="menu in $store.state.sidebarMenuList"
-                  :key="menu.id"
-                  :menu="menu" />
+      <el-menu
+        :default-active="$store.state.sidebarMenuActiveName"
+        :collapse="$store.state.sidebarFold"
+        :unique-opened="true"
+        :collapseTransition="false"
+        class="aui-sidebar__menu">
+        <sub-menu v-for="menu in $store.state.sidebarMenuList" :key="menu.id" :menu="menu" />
       </el-menu>
     </div>
   </aside>
@@ -26,12 +25,11 @@ export default {
   },
   created () {
     this.$store.state.sidebarMenuList = window.SITE_CONFIG['menuList']
-    console.log(this.$store.state.sidebarMenuList)
   }
 }
 </script>
 <style>
 .el-menu--collapse .el-submenu__title span {
-  display: none;
+  display: n;
 }
 </style>