【fix ESLint】src/permission.js

jero-web/src/permission.js

@@ -3,8 +3,7 @@ import router from './router'
 import store from './store'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import notification from 'ant-design-vue/es/notification'
+import { ACCESS_TOKEN, OAUTH2_LOGIN_PAGE_PATH } from '@/store/mutation-types'
-import { ACCESS_TOKEN,INDEX_MAIN_PAGE_PATH, OAUTH2_LOGIN_PAGE_PATH } from '@/store/mutation-types'
 import { generateIndexRouter, isOAuth2AppEnv, findFirstRoute } from '@/utils/util'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
@@ -17,20 +16,17 @@ router.beforeEach((to, from, next) => {
   if (Vue.ls.get(ACCESS_TOKEN)) {
     /* has token */
     if (to.path === '/user/login' || to.path === OAUTH2_LOGIN_PAGE_PATH) {
-      
       store.dispatch('GetPermissionList').then(res => {
-        const menuData = res.result.menu;
+        const menuData = res.result.menu
-        if (menuData === null || menuData === "" || menuData === undefined) {
+        if (menuData === null || menuData === '' || menuData === undefined) {
-          return;
+          return
         }
-        let constRoutes = [];
+        const constRoutes = generateIndexRouter(menuData)
-        constRoutes = generateIndexRouter(menuData);
         // 添加主界面路由
         store.dispatch('UpdateAppRouter', { constRoutes }).then(() => {
           // 根据roles权限生成可访问的路由表
           // 动态添加可访问路由表
           router.addRoutes(store.getters.addRouters)
-          const redirect = decodeURIComponent(from.query.redirect || to.path)
           next(findFirstRoute(menuData))
           NProgress.done()
         })
@@ -43,12 +39,11 @@ router.beforeEach((to, from, next) => {
     } else {
       if (store.getters.permissionList.length === 0) {
         store.dispatch('GetPermissionList').then(res => {
-              const menuData = res.result.menu;
+          const menuData = res.result.menu
-              if (menuData === null || menuData === "" || menuData === undefined) {
+          if (menuData === null || menuData === '' || menuData === undefined) {
-                return;
+            return
           }
-              let constRoutes = [];
+          const constRoutes = generateIndexRouter(menuData)
-              constRoutes = generateIndexRouter(menuData);
           // 添加主界面路由
           store.dispatch('UpdateAppRouter', { constRoutes }).then(() => {
             // 根据roles权限生成可访问的路由表
@@ -64,8 +59,8 @@ router.beforeEach((to, from, next) => {
             }
           })
         })
-          .catch(() => {
+          .catch((error) => {
-            return Promise.reject()
+            return Promise.reject(error)
           })
       } else {
         next()
@@ -83,7 +78,7 @@ router.beforeEach((to, from, next) => {
       NProgress.done()
     } else {
       // 如果当前是在OAuth2APP环境，就跳转到OAuth2登录页面
-      let path = isOAuth2AppEnv() ? OAUTH2_LOGIN_PAGE_PATH : '/user/login'
+      const path = isOAuth2AppEnv() ? OAUTH2_LOGIN_PAGE_PATH : '/user/login'
       next({ path: path, query: { redirect: to.fullPath } })
       NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
     }