Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

YaolongHan 4 năm trước cách đây
mục cha
commit
6593f38540
2 tập tin đã thay đổi với 50 bổ sung46 xóa
  1. 2 2
      src/components/404.vue
  2. 48 44
      src/store/index.js

+ 2 - 2
src/components/404.vue

@@ -3,7 +3,7 @@
         <div class='not-img'>
             <img src='@/assets/imgs/dlsb.png' alt />
         </div>
-        <div class='not-text' v-if='permissions && permissions.includes("GLSMS_VIEW")'>
+        <div class='not-text' v-if='isrequestAuth=="err"'>
             <span>您的权限不足……</span>
             <span>建议您联系管理员开通管理说明书相关权限</span>
         </div>
@@ -23,7 +23,7 @@ export default {
         return {}
     },
     computed: {
-        ...mapGetters(['permissions'])
+        ...mapGetters(['isrequestAuth'])
     },
     mounted() {},
     methods: {

+ 48 - 44
src/store/index.js

@@ -1,13 +1,7 @@
 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'
 
@@ -20,7 +14,7 @@ export default new Vuex.Store({
         plazaName: '',
         isPreview: false,
         lastRoute: '',
-        isrequestAuth: true, // 是否请求登录校验接口
+        isrequestAuth: null, // 是否请求登录校验接口
         permissions: [], //权限信息 "GLSMS_VIEW":"说明书查看"、"GLSMS_SYMBOL_MANAGE": "图例库管理"、 "GLSMS_PLANARGRAPH_MANAGE":"平面图维护"
         plazas: [], //项目列表
         userInfo: {
@@ -154,46 +148,56 @@ export default new Vuex.Store({
     },
     actions: {
         // 获取项目列表、userId
-        async getUserInfo({
-            commit
-        }, palyload) {
+        async getUserInfo({ commit }, palyload) {
             await login({
-                returnTree: true
-            }).then((res) => {
-                // 获取用户当前权限
-                if (res.result === 'success') {
-                    commit('STOREACCESSLEVEL', res.level)
-                    let level = res.level
-                    if (window.opener) {
-                        let data = window.opener.__fromGroupPage
-                        level = data.level
-                        commit('SETPLAZENAME', data.plazaName)
-                        localStorage.setItem('PLAZAID', data.plazaId)
-                        commit('STOREPLAZAID', data.plazaId)
-                        router.push({
-                            path: './home/homepage'
-                        })
-                    } else {
-                        if (level === 0) {
-                            if (res.treeData[0].ccode) {
-                                localStorage.setItem('PLAZAID', res.treeData[0].ccode)
-                                commit('STOREPLAZAID', res.treeData[0].ccode)
-                                commit('SETPLAZENAME', res.treeData[0].cname)
-                            }
+                returnTree: true,
+            })
+                .then((res) => {
+                    // 获取用户当前权限
+                    console.log(res.result)
+                    if (res.result === 'success') {
+                        commit('STOREACCESSLEVEL', res.level)
+                        let level = res.level
+                        if (window.opener) {
+                            let data = window.opener.__fromGroupPage
+                            level = data.level
+                            commit('SETPLAZENAME', data.plazaName)
+                            localStorage.setItem('PLAZAID', data.plazaId)
+                            commit('STOREPLAZAID', data.plazaId)
                             router.push({
-                                path: './home/homepage'
+                                path: './home/homepage',
                             })
                         } else {
-                            router.push({
-                                path: './group'
-                            })
+                            if (level === 0) {
+                                if (res.treeData[0].ccode) {
+                                    localStorage.setItem('PLAZAID', res.treeData[0].ccode)
+                                    commit('STOREPLAZAID', res.treeData[0].ccode)
+                                    commit('SETPLAZENAME', res.treeData[0].cname)
+                                }
+                                router.push({
+                                    path: './home/homepage',
+                                })
+                            } else {
+                                router.push({
+                                    path: './group',
+                                })
+                            }
                         }
+                        // commit('SETISREQUESTtAUTH', false)
+                        // commit('SETISREQUESTtAUTH', false)
+                    } else {
+                        router.push({
+                            path: '/404',
+                        })
+                        commit('SETISREQUESTtAUTH', res)
                     }
-                    // commit('SETISREQUESTtAUTH', false)
-
-                    // commit('SETISREQUESTtAUTH', false)
-                }
-            })
+                })
+                .catch((err) => {
+                    router.push({
+                        path: '/404',
+                    })
+                    commit('SETISREQUESTtAUTH', err)
+                })
         },
         getFloors(context) {
             queryFloor({
@@ -230,4 +234,4 @@ export default new Vuex.Store({
         },
     },
     modules: {},
-})
+})