yuwenjun 3 лет назад
Родитель
Сommit
6548a9b0bc
4 измененных файлов с 8 добавлено и 4 удалено
  1. 2 0
      src/layout/components/Navbar.vue
  2. 2 2
      src/permission.js
  3. 3 1
      src/store/index.js
  4. 1 1
      src/views/login/index.vue

+ 2 - 0
src/layout/components/Navbar.vue

@@ -38,6 +38,7 @@
 </template>
 
 <script>
+import { closeWebSocket } from '@/utils/WebSocketUtil'
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
@@ -68,6 +69,7 @@ export default {
     async logout() {
       this.$message.success('已退出当前账号')
       this.$store.dispatch('user/logout')
+      closeWebSocket()
       setTimeout(() => {
         this.$router.replace('/login')
       }, 500)

+ 2 - 2
src/permission.js

@@ -59,7 +59,7 @@ router.beforeEach(async(to, from, next) => {
         } catch (error) {
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')
-          Message.error(error || 'Has Error')
+          Message.error(error || '未知错误,请重新登录')
           next(`/login?redirect=${to.path}`)
         }
       }
@@ -71,7 +71,7 @@ router.beforeEach(async(to, from, next) => {
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      Message({ message: '登录失效,请重新登录!' })
+      Message({ message: '登录失效,请重新登录!', duration: 1500 })
       next(`/login`)
       return
     }

+ 3 - 1
src/store/index.js

@@ -17,9 +17,11 @@ const modules = modulesFiles.keys().reduce((modules, modulePath) => {
   return modules
 }, {})
 
-const store = new Vuex.Store({
+const createStore = () => new Vuex.Store({
   modules,
   getters
 })
 
+const store = createStore()
+
 export default store

+ 1 - 1
src/views/login/index.vue

@@ -135,7 +135,7 @@ export default {
             .dispatch('user/login', this.loginForm)
             .then(() => {
               const isAdmin = this.$store.getters.userIdentity === 1
-              isAdmin ? this.$router.push('/supplier/list') : this.$router.push('/auth/list')
+              isAdmin ? this.$router.replace('/supplier/list') : this.$router.replace('/auth/list')
               this.loading = false
               this.$message.success('登录成功')
               this.$store.commit('app/SET_IS_REFRESH', false)