解决冲突

epmet-oper-web/src/views/main-sidebar.vue

@@ -1,13 +1,14 @@
 <template>
   <aside :class="['aui-sidebar', `aui-sidebar--${$store.state.sidebarLayoutSkin}`]">
     <div class="aui-sidebar__inner">
-      <el-menu
-        :default-active="$store.state.sidebarMenuActiveName"
+      <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" />
+        <sub-menu v-for="menu in $store.state.sidebarMenuList"
+                  :key="menu.id"
+                  :menu="menu" />
       </el-menu>
     </div>
   </aside>
@@ -25,11 +26,12 @@ 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: n;
+  display: none;
 }
 </style>