01/09

tab完成 80%

src/layout/components/AppMain.vue

@@ -2,8 +2,8 @@
   <section class="app-main">
     <!-- mode="out-in"  -->
     <transition name="fade-transform">
-      <!-- :include="cachedViews" -->
-      <keep-alive>
+      <!--  -->
+      <keep-alive :include="cachedViews">
         <router-view :key="key" />
       </keep-alive>
     </transition>

src/layout/components/TagsView.vue

@@ -66,7 +66,7 @@ export default {
     generateTitle,
     generateRoute () {
       console.log(this.$route)
-      if (this.$route.name) {
+      if (this.$route.path) {
         return this.$route
       }
       return false
@@ -76,7 +76,6 @@ export default {
     },
     addViewTags () {
       const route = this.generateRoute()
-      console.log(route)
       if (!route) {
         return false
       }

src/layout/index.vue

@@ -8,8 +8,9 @@
     <div class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
         <navbar />
+        <tags-view></tags-view>
       </div>
-      <!-- <tags-view></tags-view> -->
+
       <app-main />
     </div>
   </div>

src/permission.js

@@ -40,7 +40,6 @@ router.beforeEach(async (to, from, next) => {
           await store.dispatch('user/getInfo')
           // 请求接口 生成可访问路由
           const accessRoutes = await store.dispatch('permission/generateRoutes')
-
           // 动态添加可访问的路由
           router.addRoutes(accessRoutes)
           // 确保addroutes完整的hack方法

src/router/index.js

@@ -37,6 +37,7 @@ export const constantRoutes = [
     hidden: false,
     children: [
       {
+        name: '首页',
         path: 'main',
         component: () => import('@/views/main/index'),
         hidden: false,
@@ -50,6 +51,7 @@ export const constantRoutes = [
     hidden: false,
     children: [
       {
+        name: '定时任务',
         path: 'timedtask',
         component: () => import('@/views/timedTask/index'),
         hidden: false,
@@ -62,6 +64,7 @@ export const constantRoutes = [
     hidden: false,
     children: [
       {
+        name: '侧边栏',
         path: 'setSilder',
         component: () => import('@/views/setSilder/addSilder'),
         hidden: false,
@@ -70,6 +73,7 @@ export const constantRoutes = [
   },
   {
     path: '/login',
+    name: '登录',
     component: () => import('@/views/login/index'),
     hidden: true
   },
@@ -87,6 +91,7 @@ export const constantRoutes = [
     hidden: false,
     children: [
       {
+        name: '零星收费',
         path: 'sporadicList',
         component: () => import('@/views/setSilder/addSilder'),
         hidden: false,

src/store/modules/permission.js

@@ -48,21 +48,42 @@ const mutations = {
 // 递归遍历数组
 function recursionRouter (arr) {
   if (arr.length > 0) {
-    let newArr = arr.map(item => {
+    let newArr = [];
+    for (let i = 0; i < arr.length; i++) {
+      if (arr[i].type == 1) {
+        continue
+      }
       let obj = {};
-      obj.component = item.component;
-      // if (item.type != '1' && item.component != 'Layout') {
-      //   console.log(item)
-      //   obj.name = item.name
+      obj.component = arr[i].component;
+      // if (item.type != '1' && item.component) {
+      //   if (!item.path.startsWith('/') && item.component != 'Layout') {
+      //     obj.names = item.name
+      //   }
       // }
-      item.hid == 0 ? obj.hidden = false : obj.hidden = true
-      obj.path = item.path;
-      obj.meta = { 'title': item.name, 'icon': item.icon }
-      if (item.sysMenus && item.sysMenus.length > 0) {
-        obj.children = recursionRouter(item.sysMenus);
+      arr[i].hid == 0 ? obj.hidden = false : obj.hidden = true
+      obj.path = arr[i].path;
+      obj.meta = { 'title': arr[i].name, 'icon': arr[i].icon }
+      if (arr[i].sysMenus && arr[i].sysMenus.length > 0) {
+        obj.children = recursionRouter(arr[i].sysMenus);
       }
-      return obj
-    })
+      newArr.push(obj)
+    }
+    // newArr = arr.map(item => {
+    //   let obj = {};
+    //   obj.component = item.component;
+    //   // if (item.type != '1' && item.component) {
+    //   //   if (!item.path.startsWith('/') && item.component != 'Layout') {
+    //   //     obj.names = item.name
+    //   //   }
+    //   // }
+    //   item.hid == 0 ? obj.hidden = false : obj.hidden = true
+    //   obj.path = item.path;
+    //   obj.meta = { 'title': item.name, 'icon': item.icon }
+    //   if (item.sysMenus && item.sysMenus.length > 0) {
+    //     obj.children = recursionRouter(item.sysMenus);
+    //   }
+    //   return obj
+    // })
     return newArr
   }
 }