YaolongHan 4 năm trước cách đây
mục cha
commit
936117236d
4 tập tin đã thay đổi với 32 bổ sung16 xóa
  1. 4 4
      package.json
  2. 4 1
      src/router/index.js
  3. 24 11
      src/store/index.js
  4. BIN
      wandaBmGuide.zip

+ 4 - 4
package.json

@@ -12,10 +12,10 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.24",
-        "@saga-web/big": "1.0.91",
-        "@saga-web/draw": "2.1.104",
-        "@saga-web/feng-map": "1.0.26",
-        "@saga-web/graph": "2.1.116",
+        "@saga-web/big": "1.0.92",
+        "@saga-web/draw": "2.1.105",
+        "@saga-web/feng-map": "1.0.27",
+        "@saga-web/graph": "2.1.117",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 4 - 1
src/router/index.js

@@ -85,13 +85,15 @@ const router = new VueRouter({
 const ignore = ["/404"]
 
 router.beforeEach(async (to, from, next) => {
+    console.log('to',from.path,to.path)
     // 取出刷新时的 ssoToken, 路由拦截时app.vue 生命周期还没有执行,store中还没有数据,
     let beforeunload = localStorage.getItem("beforeunload"),
         __token = null
     beforeunload && (__token = JSON.parse(beforeunload).ssoToken)
     if (!ignore.includes(to.path)) {
         //都是需要token检验的页面 首先优先获取路由上带的token
-        let token = null
+        // let token = null
+        let token = to.query.token || store.getters["ssoToken"] || sessionStorage.getItem("SSOTOKEN")
         if (to.query.token) {
             store.commit("SETSSOTOKEN", to.query.token) //存vuex
             sessionStorage.setItem("SSOTOKEN", to.query.token)
@@ -127,6 +129,7 @@ router.beforeEach(async (to, from, next) => {
             if (to.path == "/group" || to.path == "/home/homepage") {
                 if (store.state.accessLevel == -1) {
                     await store.dispatch("getUserInfo", router)
+                    console.log('getUserInfo',4)
                     await store.dispatch("getBrand")
                     // await store.dispatch('getFact')
                 }

+ 24 - 11
src/store/index.js

@@ -1,7 +1,13 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import { login, queryFloor, queryfmapID } from '@/api/login.js'
-import { queryBrand } from '@/api/public.js'
+import {
+    login,
+    queryFloor,
+    queryfmapID
+} from '@/api/login.js'
+import {
+    queryBrand
+} from '@/api/public.js'
 import axios from 'axios'
 import router from '../router'
 
@@ -10,7 +16,7 @@ export default new Vuex.Store({
     state: {
         // ssoToken: 'admin:chuyushu',
         // ssoToken: '',
-        // ssoToken: null,
+        ssoToken: null,
         plazaName: '',
         isPreview: false,
         lastRoute: '',
@@ -63,7 +69,7 @@ export default new Vuex.Store({
         isGetmap: (state) => state.isGetmap,
         planNum: (state) => state.planNum,
         typeNum: (state) => state.typeNum,
-        isrequestAuth:(state)=> state.isrequestAuth
+        isrequestAuth: (state) => state.isrequestAuth
     },
     mutations: {
         SETPLAZENAME(state, data) {
@@ -160,14 +166,18 @@ export default new Vuex.Store({
     },
     actions: {
         // 获取项目列表、userId
-        async getUserInfo({ commit }, palyload) {
+        async getUserInfo({
+            commit
+        }, palyload) {
+            console.log('getUserInfo',1)
             await login({
-                returnTree: true,
-            })
+                    returnTree: true,
+                })
                 .then((res) => {
                     // 获取用户当前权限
                     console.log(res.result)
                     if (res.result === 'success') {
+                        console.log('getUserInfo',2)
                         commit('STOREACCESSLEVEL', res.level)
                         let level = res.level
                         if (window.opener) {
@@ -198,6 +208,7 @@ export default new Vuex.Store({
                         // commit('SETISREQUESTtAUTH', false)
                         // commit('SETISREQUESTtAUTH', false)
                     } else {
+                        console.log('getuserfo error',res)
                         router.push({
                             path: '/404',
                         })
@@ -205,11 +216,13 @@ export default new Vuex.Store({
                     }
                 })
                 .catch((err) => {
-                    router.push({
-                        path: '/404',
-                    })
+                    console.log('getuserfo catch',err)
+                    // router.push({
+                    //     path: '/404',
+                    // })
                     commit('SETISREQUESTtAUTH', err)
                 })
+                console.log('getUserInfo',3)
         },
         getFloors(context) {
             queryFloor({
@@ -246,4 +259,4 @@ export default new Vuex.Store({
         },
     },
     modules: {},
-})
+})

BIN
wandaBmGuide.zip