src/store/modules/user.js

@@ -10,7 +10,7 @@ const user = {
     welcome: '',
     avatar: '',
     roles: [],
-    info: {},
+    info: {}
   },
 
   mutations: {
@@ -29,22 +29,20 @@ const user = {
     },
     SET_INFO: (state, info) => {
       state.info = info
-    },
+    }
   },
 
   actions: {
     // 登录
     Login ({ commit }, userInfo) {
       return new Promise((resolve, reject) => {
-        login(userInfo)
+        login(userInfo).then(response => {
-          .then((response) => {
           console.log(response)
           const result = response.data
           storage.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
           commit('SET_TOKEN', result.token)
           resolve()
-          })
+        }).catch(error => {
-          .catch((error) => {
           reject(error)
         })
       })
@@ -53,8 +51,7 @@ const user = {
     // 获取用户信息
     GetInfo ({ commit }) {
       return new Promise((resolve, reject) => {
-        getInfo()
+        getInfo().then(response => {
-          .then((response) => {
           const result = response.data
           if (result && result.id) {
             localStorage.setItem('userId',result.id)
@@ -62,17 +59,15 @@ const user = {
           }
           if (result.roles && result.permissions.length > 0) {
             const role = result.roles
-              role.permissions = result.permissions.filter((item) => item)
+            role.permissions = result.permissions.filter(item => item)
-              role.permissions.map((per) => {
+            role.permissions.map(per => {
               if (per.actionEntitySet != null && per.actionEntitySet.length > 0) {
-                  const action = per.actionEntitySet.map((action) => {
+                const action = per.actionEntitySet.map(action => { return action.action })
-                    return action.action
-                  })
                 per.actionList = action
               }
             })
             // role.permissionList = role.permissions.map(permission => { return permission })
-              commit('SET_ROLES', result.roles.length === 0 ? ['bfa9086508284827b6a967d126dabeb'] : result.roles)
+            commit('SET_ROLES', result.roles)
             commit('SET_INFO', result)
           } else {
             reject(new Error('getInfo: roles must be a non-null array !'))
@@ -80,8 +75,7 @@ const user = {
           commit('SET_NAME', { name: result.name, welcome: welcome() })
           commit('SET_AVATAR', result.avatar)
           resolve(response)
-          })
+        }).catch(error => {
-          .catch((error) => {
           reject(error)
         })
       })
@@ -90,21 +84,20 @@ const user = {
     // 登出
     Logout ({ commit, state }) {
       return new Promise((resolve) => {
-        logout(state.token)
+        logout(state.token).then(() => {
-          .then(() => {
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           storage.remove(ACCESS_TOKEN)
           resolve()
-          })
+        }).catch((err) => {
-          .catch((err) => {
           console.log('logout fail:', err)
           // resolve()
+        }).finally(() => {
         })
-          .finally(() => {})
       })
-    },
+    }
-  },
+
+  }
 }
 
 export default user

src/views/subsystem/model/index.vue

@@ -343,7 +343,7 @@ export default {
         if (item.children && item.children.length > 0) {
           this.getTree(newChildren, item.children, showKeys)
         }
-        if (newChildren.length > 0 || showKeys.includes(+item.key)) {
+        if (newChildren.length > 0 || showKeys.includes(item.key)) {
           target.push({ ...item, children: newChildren })
         }
       })

src/views/user/Welcome.vue

@@ -25,8 +25,6 @@
 <script>
 import { getAction } from '@/api/manage'
 import { mapState } from 'vuex'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
-import storage from 'store'
 
 export default {
   data() {