guoxiaohuan 4 years ago
parent
commit
50802996d8
3 changed files with 72 additions and 72 deletions
  1. 6 6
      public/systemConf.js
  2. 64 64
      src/router/index.js
  3. 2 2
      src/store/index.js

+ 6 - 6
public/systemConf.js

@@ -21,14 +21,14 @@
  */
 var __systemConf = {
     // 系统编码
-    systemCode: "wandaBmGuide",
+    systemCode: 'wandaBmGuide',
     conf: {
         // 阿里云
-        // editerUrl: "http://60.205.177.43:80/wandaEditer/", // 编辑器地址
-        // wandaBmGuideUrl: "http://60.205.177.43:80/wandaBmGuide/", //管理书地址
+        editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
+        wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
         // http://glsms.wanda-dev.cn/ 测试服
-        editerUrl: "http://glsms.wanda-dev.cn/wandaEditer/", // 编辑器地址
-        wandaBmGuideUrl: "http://glsms.wanda-dev.cn/wandaBmGuide/", //管理书地址
+        // editerUrl: "http://glsms.wanda-dev.cn/wandaEditer/", // 编辑器地址
+        // wandaBmGuideUrl: "http://glsms.wanda-dev.cn/wandaBmGuide/", //管理书地址
     },
 }
-window.__systemConf = __systemConf
+window.__systemConf = __systemConf

+ 64 - 64
src/router/index.js

@@ -1,106 +1,106 @@
-import Vue from "vue"
-import store from "@/store"
-import VueRouter from "vue-router"
-import {
-    query
-} from "@/utils/query"
+import Vue from 'vue'
+import store from '@/store'
+import VueRouter from 'vue-router'
+import { query } from '@/utils/query'
 Vue.use(VueRouter)
 
 const routes = [
     // 登陆页面
     {
-        path: "/",
-        redirect: "/home/overview",
+        path: '/',
+        redirect: '/home/overview',
     },
     {
-        path: "/404",
-        component: () => import("../components/404"),
+        path: '/404',
+        component: () => import('../components/404'),
     },
     // home
     {
-        path: "/home",
-        name: "home",
-        component: () => import("../views/index"),
-        redirect: "/home/first",
-        children: [{
-                path: "first",
-                component: () => import("../views/first"),
+        path: '/home',
+        name: 'home',
+        component: () => import('../views/index'),
+        redirect: '/home/first',
+        children: [
+            {
+                path: 'first',
+                component: () => import('../views/first'),
             },
             //概览
             {
-                path: "overview",
-                component: () => import("../views/overview"),
+                path: 'overview',
+                component: () => import('../views/overview'),
             },
             // 楼层功能
             {
-                path: "floorFunc",
-                component: () => import("../views/floorFunc"),
+                path: 'floorFunc',
+                component: () => import('../views/floorFunc'),
             },
             // 设备设施
             {
-                path: "equipment",
-                component: () => import("../views/equipment"),
+                path: 'equipment',
+                component: () => import('../views/equipment'),
             },
             // 其他功能
             {
-                path: "other",
-                component: () => import("../views/other"),
+                path: 'other',
+                component: () => import('../views/other'),
             },
             // 分析
             {
-                path: "analysis",
-                component: () => import("../views/analysis"),
+                path: 'analysis',
+                component: () => import('../views/analysis'),
             },
             //图例库管理
             {
-                path: "legendLibrary",
-                component: () => import("../views/legendLibrary"),
+                path: 'legendLibrary',
+                component: () => import('../views/legendLibrary'),
             },
             //图例绘制规则
             {
-                path: "legendRules",
-                component: () => import("../views/legendRules"),
+                path: 'legendRules',
+                component: () => import('../views/legendRules'),
             },
         ],
     },
 ]
 const router = new VueRouter({
-    mode: "history",
+    mode: 'history',
     base: process.env.BASE_URL,
     routes,
 })
 //不需要token的路由
-const ignore = ["/404", "/legendLibrary", "/legendRules"]
+const ignore = ['/404', '/legendLibrary', '/legendRules']
 router.beforeEach(async (to, from, next) => {
-    if (!ignore.includes(to.path)) {
-        const token = query().token
-        const ssoToken = store.getters["ssoToken"]
-        if (ssoToken) {
-            store.commit("SETSSOTOKEN", ssoToken)
-            await store.dispatch("getUserInfo", router)
-            await store.dispatch("getFloors")
-            await store.dispatch("getBrand")
-            next()
-        } else if (token) {
-            store.commit("SETSSOTOKEN", token)
-            await store.dispatch("getUserInfo", router)
-            next()
-        } else {
-            let lastRoute = {
-                path: to.path,
-                params: to.params,
-                query: to.query,
-            }
-            store.commit("SETLASTROUTER", lastRoute)
-            let ssoServer = "http://oauth.wanda-dev.cn"
-            let systemcode = "CAD156",
-                signal = new Date().getTime(),
-                version = "1.0.0"
-            window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
-        }
-    } else {
-        next()
-        return
-    }
+    // if (!ignore.includes(to.path)) {
+    //     const token = query().token
+    //     const ssoToken = store.getters["ssoToken"]
+    //     if (ssoToken) {
+    //         store.commit("SETSSOTOKEN", ssoToken)
+    // await store.dispatch('getUserInfo', router)
+    await store.dispatch('getFloors')
+    await store.dispatch('getBrand')
+    //         next()
+    //     } else if (token) {
+    //         store.commit("SETSSOTOKEN", token)
+    //         await store.dispatch("getUserInfo", router)
+    //         next()
+    //     } else {
+    //         let lastRoute = {
+    //             path: to.path,
+    //             params: to.params,
+    //             query: to.query,
+    //         }
+    //         store.commit("SETLASTROUTER", lastRoute)
+    //         let ssoServer = "http://oauth.wanda-dev.cn"
+    //         let systemcode = "CAD156",
+    //             signal = new Date().getTime(),
+    //             version = "1.0.0"
+    //         window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
+    //     }
+    // } else {
+    //     next()
+    //     return
+    // }
+    next()
 })
-export default router
+export default router

+ 2 - 2
src/store/index.js

@@ -8,8 +8,8 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        // ssoToken: 'admin:lengqiang',
-        ssoToken: null,
+        ssoToken: 'admin:lengqiang',
+        // ssoToken: null,
         isPreview: false,
         lastRoute: '',
         isrequestAuth: true, // 是否请求登录校验接口