feat(permission): 登录权限控制

src/layout/components/Navbar.vue

@@ -71,14 +71,11 @@ export default {
     selectChange(val) {
       if (val === 'loginout') {
         this.$store.commit('user/RESET_STATE')
+        this.$store.commit('permission/SET_ROUTES', [])
         this.$router.push('/login')
         return
       }
       this.$router.push('/' + val)
-    },
-    async logout() {
-      await this.$store.dispatch('user/logout')
-      this.$router.push(`/login?redirect=${this.$route.fullPath}`)
     }
   }
 }

src/permission.js

@@ -4,6 +4,7 @@ import store from './store'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
 import getPageTitle from '@/utils/get-page-title'
+import { filterAsyncRoutes } from '@/utils'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
@@ -43,9 +44,11 @@ router.beforeEach(async(to, from, next) => {
         next()
       } else {
         store.commit('user/SET_CLASS', pat)
-        store.commit('permission/SET_ROUTES', asyncRoutes)
+        const asr = filterAsyncRoutes(asyncRoutes, store.getters.roleData.drug_manage)
+        // store.commit('permission/SET_ROUTES', asr)
+        // store.commit('permission/SET_ROUTES', asyncRoutes)
         resetRouter()
-        router.addRoutes(asyncRoutes)
+        router.addRoutes(asr)
         next({ ...to, replace: true })
       }
     }

src/router/modules/reagent.js

@@ -1,16 +1,17 @@
 import Layout from '@/layout'
 
 const reagentRouter = [
-  {
+  // {
-    path: '/reagent',
+  //   path: '/reagent',
-    hidden: true,
+  //   hidden: true,
-    redirect: '/reagent/mainoverview/index',
+  //   redirect: '/reagent/mainoverview/index',
-    meta: { classification: 'reagent' }
+  //   meta: { classification: 'reagent', module_code: 'MainOverview' }
-  },
+  // },
   {
     path: '/reagent/mainoverview',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/mainoverview/index',
+    meta: { classification: 'reagent', module_code: 'MainOverview' },
     children: [
       {
         path: 'index',
@@ -23,7 +24,8 @@ const reagentRouter = [
   {
     path: '/reagent/report',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/report/index',
+    meta: { classification: 'reagent', module_code: 'DataReportIndex' },
     children: [
       {
         path: 'index',
@@ -92,7 +94,8 @@ const reagentRouter = [
   {
     path: '/reagent/warehousing',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/warehousing/index',
+    meta: { classification: 'reagent', module_code: 'DataReportIndex' },
     children: [
       {
         path: 'index',
@@ -105,7 +108,8 @@ const reagentRouter = [
   {
     path: '/reagent/receiving',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/receiving/index',
+    meta: { classification: 'reagent', module_code: 'DrugUseView' },
     children: [
       {
         path: 'index',
@@ -118,7 +122,8 @@ const reagentRouter = [
   {
     path: '/reagent/sendback',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/sendback/index',
+    meta: { classification: 'reagent', module_code: 'DrugReturnView' },
     children: [
       {
         path: 'index',
@@ -131,7 +136,8 @@ const reagentRouter = [
   {
     path: '/reagent/weighing',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/weighing/index',
+    meta: { classification: 'reagent', module_code: 'DrugWeigh' },
     children: [
       {
         path: 'index',
@@ -144,7 +150,8 @@ const reagentRouter = [
   {
     path: '/reagent/inventory',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/inventory/index',
+    meta: { classification: 'reagent', module_code: 'StockTakingIndex' },
     children: [
       {
         path: 'index',
@@ -158,7 +165,7 @@ const reagentRouter = [
     path: '/reagent/database',
     component: Layout,
     redirect: '/reagent/database/msds',
-    meta: { title: '化学品数据库', icon: '化学品数据库', classification: 'reagent' },
+    meta: { title: '化学品数据库', icon: '化学品数据库', classification: 'reagent', module_code: 'ChemicaDatabase' },
     children: [
       {
         path: 'msds',
@@ -177,7 +184,8 @@ const reagentRouter = [
   {
     path: '/reagent/management',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/management/index',
+    meta: { classification: 'reagent', module_code: 'DrugIndex' },
     children: [
       {
         path: 'index',
@@ -190,7 +198,8 @@ const reagentRouter = [
   {
     path: '/reagent/client',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/client/index',
+    meta: { classification: 'reagent', module_code: 'CabinetIndex' },
     children: [
       {
         path: 'index',
@@ -203,7 +212,8 @@ const reagentRouter = [
   {
     path: '/reagent/envrecord',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/envrecord/index',
+    meta: { classification: 'reagent', module_code: 'HumitureIndex' },
     children: [
       {
         path: 'index',
@@ -216,7 +226,8 @@ const reagentRouter = [
   {
     path: '/reagent/form',
     component: Layout,
-    meta: { classification: 'reagent' },
+    redirect: '/reagent/form/index',
+    meta: { classification: 'reagent', module_code: 'DrugCustomForm' },
     children: [
       {
         path: 'index',
@@ -226,19 +237,19 @@ const reagentRouter = [
       }
     ]
   },
-  {
+  // {
-    path: '/reagent/buy',
+  //   path: '/reagent/buy',
-    component: Layout,
+  //   component: Layout,
-    meta: { classification: 'reagent' },
+  //   meta: { classification: 'reagent' },
-    children: [
+  //   children: [
-      {
+  //     {
-        path: 'index',
+  //       path: 'index',
-        name: 'Buy',
+  //       name: 'Buy',
-        component: () => import('@/views/reagent/buy/index'),
+  //       component: () => import('@/views/reagent/buy/index'),
-        meta: { title: '请购', icon: '请购', classification: 'reagent' }
+  //       meta: { title: '请购', icon: '请购', classification: 'reagent' }
-      }
+  //     }
-    ]
+  //   ]
-  },
+  // },
   {
     path: '/gotohome',
     redirect: '/home',

src/router/modules/user.js

@@ -3,16 +3,11 @@
 import Layout from '@/layout'
 
 const userRouter = [
-  {
-    path: '/user',
-    redirect: '/user/info/index',
-    hidden: true,
-    meta: { classification: 'user' }
-  },
   {
     path: '/user/info',
     component: Layout,
-    meta: { classification: 'user' },
+    redirect: '/user/info/index',
+    meta: { classification: 'user', 'module_code': 'UserIndex' },
     children: [
       {
         path: 'index',
@@ -25,7 +20,8 @@ const userRouter = [
   {
     path: '/user/role',
     component: Layout,
-    meta: { classification: 'user' },
+    redirect: '/user/role/index',
+    meta: { classification: 'user', module_code: 'UserRoleIndex' },
     children: [
       {
         path: 'index',

src/store/getters.js

@@ -6,6 +6,7 @@ const getters = {
   name: state => state.user.name,
   permission_routes: state => state.permission.routes,
   classification: state => state.user.classification,
-  isMain: state => state.settings.isMain
+  isMain: state => state.settings.isMain,
+  roleData: state => state.permission.roleData
 }
 export default getters

src/store/modules/permission.js

@@ -36,13 +36,17 @@ export function filterAsyncRoutes(routes, roles) {
 
 const state = {
   routes: [],
-  addRoutes: []
+  addRoutes: [],
+  roleData: {}
 }
 
 const mutations = {
   SET_ROUTES: (state, routes) => {
     state.addRoutes = routes
     state.routes = constantRoutes.concat(routes)
+  },
+  SET_ROLE_DATA: (state, data) => {
+    state.roleData = data
   }
 }
 

src/utils/index.js

@@ -149,3 +149,15 @@ export function throttle(fn, time) {
   }
 }
 
+export function filterAsyncRoutes(routers, roles) {
+  return routers.filter(item => {
+    if (item.path === '*') {
+      return true
+    }
+    if (item.meta && item.meta.title === '返回主页') {
+      return true
+    }
+    return !!roles.find(it => it.module_code === item.meta.module_code)
+  })
+}
+

src/utils/request.js

@@ -71,6 +71,7 @@ service.interceptors.response.use(
           type: 'warning'
         }).then(() => {
           store.commit('user/RESET_STATE')
+          store.commit('permission/SET_ROUTES', [])
           router.push('/login')
         })
       }

src/views/login/index.vue

@@ -70,8 +70,9 @@
 <script>
 // import { validUsername } from '@/utils/validate'
 import stringify from '@/utils/stringify'
-import { login } from '@/api/user/user'
+import { login, user_power } from '@/api/user/user'
 import { asyncRoutes } from '@/router'
+import { filterAsyncRoutes } from '@/utils'
 export default {
   name: 'Login',
   data() {
@@ -131,9 +132,17 @@ export default {
           this.loading = true
           login(stringify(this.loginForm)).then(res => {
             this.$store.commit('user/SET_TOKEN', res.data.token)
-            this.$store.commit('permission/SET_ROUTES', asyncRoutes)
+            // this.$store.commit('permission/SET_ROUTES', asyncRoutes)
-            this.$router.addRoutes(asyncRoutes)
+            // this.$router.addRoutes(asyncRoutes)
+            // this.$router.replace('/home')
+            user_power().then(resp => {
+              // 存储权限数据
+              this.$store.commit('permission/SET_ROLE_DATA', resp.data)
+              const asr = filterAsyncRoutes(asyncRoutes, resp.data.drug_manage)
+              this.$store.commit('permission/SET_ROUTES', asr)
+              this.$router.addRoutes(asr)
               this.$router.replace('/home')
+            })
           }).finally(
             () => {
               this.loading = false