Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/layout/components/Navbar.vue

@@ -5,9 +5,9 @@
     <!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" /> -->
       <!-- <SignNumArr class="SignNumArr"/> -->
 	  <div class="sign_box">
-	    <div class="sign_item" :class="{active: activeMenu.includes((item.path||item.redirect))}"  v-for="item in this.sidebarRouters.filter(res => {
+	    <div class="sign_item" :class="{active: activeMenu.includes((item.path||item.redirect))}"  v-for="(item,index) in this.sidebarRouters.filter(res => {
 	          return res.hidden == false || res.redirect == 'index'
-	        })"
+	        })" :key="index"
 	      @click="tabBtn(item)">
 	      <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
 	      <item v-if="!item.meta" :icon="item.meta && item.meta.icon" :title="'首页'" />
@@ -143,7 +143,7 @@ export default {
 	  }
 	  this.$store.dispatch('TabFn', item.path)
     this.showde = true
-   
+
 	},
 	init() {
 	  const route = this.$route;

ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue

@@ -3,16 +3,14 @@
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <!-- <item :title="onlyOneChild.meta.title" /> -->
           <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
         </el-menu-item>
       </app-link>
     </template>
 
     <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body >
-      <template slot="title">
+     <template slot="title">
         <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
-        <!-- <item v-if="item.meta" :title="item.meta.title" /> -->
       </template>
       <sidebar-item
         v-for="child in item.children"
@@ -57,7 +55,8 @@ export default {
     return {
     }
   },
-  mounted() {
+  mounted() {
+    // console.log(this.item)
   },
   methods: {
     hasOneShowingChild(children = [], parent) {

ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -4,7 +4,7 @@
         <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
             <el-menu
                 :default-active="activeMenu"
-                :default-openeds = '["0"]'
+                :default-openeds ='[activeMenuT]'
 				        ref="menu"
                 :collapse="isCollapse"
                 :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg"
@@ -56,10 +56,16 @@ export default {
             // // if set path, the sidebar will highlight the path you set
             // if (meta.activeMenu) {
             //     return meta.activeMenu;
-            // }
-          console.log(this.tabIndex)
+            // }
+
+          // console.log(this.tabIndex)
 
             return this.tabIndex;
+        },
+        activeMenuT(){
+          let tabshow = {}
+          console.log(this.tabIndex,234)
+         return this.tabIndex
         },
         handleSide() {
           let add = []
@@ -67,7 +73,8 @@ export default {
             if(this.activeMenu.includes(item.path||item.redirect)){
               add.push(item)
             }
-          }
+          }
+          console.log(add)
           return add
         },
         showLogo() {
@@ -76,10 +83,8 @@ export default {
         variables() {
             return variables;
         },
-        isCollapse() {
-          // !this.sidebar.opened
-
-            return !this.sidebar.opened
+        isCollapse() {
+            return !this.sidebar.opened;
         },
         iejgu(){
           return [0]