فهرست منبع

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

YaolongHan 4 سال پیش
والد
کامیت
3fde7eed41
2فایلهای تغییر یافته به همراه12 افزوده شده و 7 حذف شده
  1. 3 1
      src/components/floorMap/index.vue
  2. 9 6
      src/router/index.js

+ 3 - 1
src/components/floorMap/index.vue

@@ -12,7 +12,7 @@
 </template>
 <script>
 import { SFengParser } from '@saga-web/feng-map'
-import { SFloorParser, ItemOrder } from '@saga-web/big'
+import { SFloorParser, ItemOrder, ItemColor } from '@saga-web/big'
 import { FloorView } from '@/lib/FloorView'
 import { FloorScene } from '@/lib/FloorScene'
 import RoomBox from '@/views/room/index'
@@ -22,6 +22,7 @@ import { queryShops } from '@/api/equipmentList.js'
 import { STopologyParser } from '@/lib/parsers/STopologyParser'
 import { mapGetters, mapActions } from 'vuex'
 import { SImageItem, SImageShowType } from '@saga-web/graph/lib'
+import { SColor } from '@saga-web/draw/lib'
 import bus from '@/utils/bus.js'
 
 // import { uuid } from "@/components/mapClass/until";
@@ -315,6 +316,7 @@ export default {
         },
         // 清除电井关联商铺的高亮状态
         clearHightLight() {
+            ItemColor.spaceHighColor = new SColor('#f2c511');
             for (let key in this.wellMap) {
                 this.wellMap[key].forEach(item => {
                     item.highLightFlag = false

+ 9 - 6
src/router/index.js

@@ -83,18 +83,21 @@ const router = new VueRouter({
     routes,
 })
 const ignore = ['/404']
+
 router.beforeEach(async (to, from, next) => {
     // 取出刷新时的 ssoToken, 路由拦截时app.vue 生命周期还没有执行,store中还没有数据,
     let beforeunload = localStorage.getItem('beforeunload'),
         __token = null
     beforeunload && (__token = JSON.parse(beforeunload).ssoToken)
     if (!ignore.includes(to.path)) {
-        // let token = __token || store.getters['ssoToken']
-        let token = store.getters['ssoToken']
-        if (query().token) {
-            store.commit('SETSSOTOKEN', query().token)
-            sessionStorage.setItem('SSOTOKEN', query().token)
-        } else if (token) {
+        //都是需要token检验的页面 首先优先获取路由上带的token
+        let token = to.query.token ? to.query.token : store.getters['ssoToken'] ? store.getters['ssoToken'] : __token
+        // 开发环境模式token有模式值
+        if (process.env.NODE_ENV == 'aly' || process.env.NODE_ENV == 'serve') {
+            token = 'admin:chuyushu'
+        }
+        // console.log('token====', token)
+        if (token) {
             store.commit('SETSSOTOKEN', token)
             if (to.path == '/') {
                 next('/group')