优化代码

@@ -41,14 +41,15 @@ export default {
           if (index !== 0) item = item.slice(1)
           if (index !== 0) item = item.slice(1)
           return item
           return item
         })
         })
-        this.getMatched(pathList, this.$store.getters.sidebarRouters, matched)
+        this.getMatched(pathList, this.$store.getters.defaultRoutes, matched)
       } else {
       } else {
-        matched = router.matched.filter((item) => item.meta && item.meta.title)
+        matched = router.matched.filter(item => item.meta && item.meta.title)
       }
       }
+      // 判断是否为首页
       if (!this.isDashboard(matched[0])) {
       if (!this.isDashboard(matched[0])) {
         matched = [{ path: "/index", meta: { title: "首页" } }].concat(matched)
         matched = [{ path: "/index", meta: { title: "首页" } }].concat(matched)
       }
       }
-      this.levelList = matched.filter((item) => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
     },
     },
     findPathNum(str, char = "/") {
     findPathNum(str, char = "/") {
       let index = str.indexOf(char)
       let index = str.indexOf(char)
@@ -60,12 +61,14 @@ export default {
       return num
       return num
     },
     },
     getMatched(pathList, routeList, matched) {
     getMatched(pathList, routeList, matched) {
-      let data = routeList.find((item) => item.path == pathList[0])
+      let data = routeList.find(item => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0])
+      if (data) {
         matched.push(data)
         matched.push(data)
         if (data.children && pathList.length) {
         if (data.children && pathList.length) {
           pathList.shift()
           pathList.shift()
           this.getMatched(pathList, data.children, matched)
           this.getMatched(pathList, data.children, matched)
         }
         }
+      }
     },
     },
     isDashboard(route) {
     isDashboard(route) {
       const name = route && route.name
       const name = route && route.name

@@ -62,11 +62,10 @@ export default {
       const showingChildren = children.filter(item => {
       const showingChildren = children.filter(item => {
         if (item.hidden) {
         if (item.hidden) {
           return false
           return false
-        } else {
+        }
         // Temp set(will be used if only has one showing child)
         // Temp set(will be used if only has one showing child)
         this.onlyOneChild = item
         this.onlyOneChild = item
         return true
         return true
-        }
       })
       })
 
 
       // When there is only one child router, the child router is displayed by default
       // When there is only one child router, the child router is displayed by default

@@ -26,6 +26,7 @@ const sessionCache = {
     if (value != null) {
     if (value != null) {
       return JSON.parse(value)
       return JSON.parse(value)
     }
     }
+    return null
   },
   },
   remove (key) {
   remove (key) {
     sessionStorage.removeItem(key);
     sessionStorage.removeItem(key);
@@ -59,6 +60,7 @@ const localCache = {
     if (value != null) {
     if (value != null) {
       return JSON.parse(value)
       return JSON.parse(value)
     }
     }
+    return null
   },
   },
   remove (key) {
   remove (key) {
     localStorage.removeItem(key);
     localStorage.removeItem(key);

@@ -522,8 +522,8 @@ export default {
             })
             })
           });
           });
         });
         });
-        this.title = "修改角色";
       });
       });
+      this.title = "修改角色";
     },
     },
     /** 选择角色权限范围触发 */
     /** 选择角色权限范围触发 */
     dataScopeSelectChange(value) {
     dataScopeSelectChange(value) {
@@ -543,8 +543,8 @@ export default {
             this.$refs.dept.setCheckedKeys(res.checkedKeys);
             this.$refs.dept.setCheckedKeys(res.checkedKeys);
           });
           });
         });
         });
-        this.title = "分配数据权限";
       });
       });
+      this.title = "分配数据权限";
     },
     },
     /** 分配用户操作 */
     /** 分配用户操作 */
     handleAuthUser: function(row) {
     handleAuthUser: function(row) {