Merge branch 'master' of http://git.hivekion.com:3000/liaoboping/LSSE-front

src/store/modules/user.js

@@ -10,7 +10,7 @@ const user = {
     welcome: '',
     avatar: '',
     roles: [],
-    info: {}
+    info: {},
   },
 
   mutations: {
@@ -29,75 +29,82 @@ const user = {
     },
     SET_INFO: (state, info) => {
       state.info = info
-    }
+    },
   },
 
   actions: {
     // 登录
-    Login ({ commit }, userInfo) {
+    Login({ commit }, userInfo) {
       return new Promise((resolve, reject) => {
-        login(userInfo).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 => {
-          reject(error)
-        })
+        login(userInfo)
+          .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) => {
+            reject(error)
+          })
       })
     },
 
     // 获取用户信息
-    GetInfo ({ commit }) {
+    GetInfo({ commit }) {
       return new Promise((resolve, reject) => {
-        getInfo().then(response => {
-          const result = response.data
-          if (result && result.id) {
-            localStorage.setItem('userId',result.id)
-            localStorage.setItem('uRealName', result.nickName)
-          }
-          if (result.roles && result.permissions.length > 0) {
-            const role = result.roles
-            role.permissions = result.permissions.filter(item => item)
-            role.permissions.map(per => {
-              if (per.actionEntitySet != null && per.actionEntitySet.length > 0) {
-                const action = per.actionEntitySet.map(action => { return action.action })
-                per.actionList = action
-              }
-            })
-            // role.permissionList = role.permissions.map(permission => { return permission })
-            commit('SET_ROLES', result.roles)
-            commit('SET_INFO', result)
-          } else {
-            reject(new Error('getInfo: roles must be a non-null array !'))
-          }
-          commit('SET_NAME', { name: result.name, welcome: welcome() })
-          commit('SET_AVATAR', result.avatar)
-          resolve(response)
-        }).catch(error => {
-          reject(error)
-        })
+        getInfo()
+          .then((response) => {
+            const result = response.data
+            if (result && result.id) {
+              localStorage.setItem('userId', result.id)
+              localStorage.setItem('uRealName', result.nickName)
+            }
+            if (result.roles && result.permissions.length > 0) {
+              const role = result.roles
+              role.permissions = result.permissions.filter((item) => item)
+              role.permissions.map((per) => {
+                if (per.actionEntitySet != null && per.actionEntitySet.length > 0) {
+                  const action = per.actionEntitySet.map((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_INFO', result)
+            } else {
+              reject(new Error('getInfo: roles must be a non-null array !'))
+            }
+            commit('SET_NAME', { name: result.name, welcome: welcome() })
+            commit('SET_AVATAR', result.avatar)
+            resolve(response)
+          })
+          .catch((error) => {
+            reject(error)
+          })
       })
     },
 
     // 登出
-    Logout ({ commit, state }) {
+    Logout({ commit, state }) {
       return new Promise((resolve) => {
-        logout(state.token).then(() => {
-          commit('SET_TOKEN', '')
-          commit('SET_ROLES', [])
-          storage.remove(ACCESS_TOKEN)
-          resolve()
-        }).catch((err) => {
-          console.log('logout fail:', err)
-          // resolve()
-        }).finally(() => {
-        })
+        logout(state.token)
+          .then(() => {
+            commit('SET_TOKEN', '')
+            commit('SET_ROLES', [])
+            storage.remove(ACCESS_TOKEN)
+            resolve()
+          })
+          .catch((err) => {
+            console.log('logout fail:', err)
+            // resolve()
+          })
+          .finally(() => {})
       })
-    }
-
-  }
+    },
+  },
 }
 
-export default user
+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,6 +25,8 @@
 <script>
 import { getAction } from '@/api/manage'
 import { mapState } from 'vuex'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+import storage from 'store'
 
 export default {
   data() {