guoxiaohuan 4 년 전
부모
커밋
202d6bcd85
5개의 변경된 파일13개의 추가작업 그리고 12개의 파일을 삭제
  1. 1 0
      src/components/404.vue
  2. 6 7
      src/router/index.js
  3. 2 2
      src/store/index.js
  4. 3 3
      src/views/room/detail.vue
  5. 1 0
      src/views/room/room3.vue

+ 1 - 0
src/components/404.vue

@@ -29,6 +29,7 @@ export default {
     methods: {
         goLogin() {
             this.$store.commit('SETSSOTOKEN', null)
+            localStorage.removeItem('beforeunload')
             let ssoServer = ''
             if (window.location.host == 'http://glsms.wanda-dev.cn') {
                 ssoServer = 'http://oauth.wanda-dev.cn'

+ 6 - 7
src/router/index.js

@@ -89,13 +89,12 @@ router.beforeEach(async (to, from, next) => {
         __token = null
     beforeunload && (__token = JSON.parse(beforeunload).ssoToken)
     if (!ignore.includes(to.path)) {
-        let token = __token || query().token || store.getters['ssoToken']
-        // 开发环境模式token有模式值
-        if (process.env.NODE_ENV == 'aly' || process.env.NODE_ENV == 'serve') {
-            token = 'admin:chuyushu'
-        }
-        // console.log('token====', token)
-        if (token) {
+        // 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) {
             store.commit('SETSSOTOKEN', token)
             if (to.path == '/') {
                 next('/group')

+ 2 - 2
src/store/index.js

@@ -8,9 +8,9 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        ssoToken: 'admin:chuyushu',
+        // ssoToken: 'admin:chuyushu',
         // ssoToken: '',
-        // ssoToken: null,
+        ssoToken: null,
         plazaName: '',
         isPreview: false,
         lastRoute: '',

+ 3 - 3
src/views/room/detail.vue

@@ -248,9 +248,9 @@ export default {
                 manufacturer: this.row.manufacturer || '--',
                 sbxh: this.row.sbxh || '--',
                 brand: this.row.brand || '--',
-                location: '1572',
-                classstructureid: this.row.classstructureid,
-                type_code: this.row.type_code
+                location: this.row.classstructureid,
+                classstructureid: this.row.classstructureid
+                // type_code: this.row.type_code
             }
             // if (this.floorChange) {
             //     postParams.gname = this.floorChange

+ 1 - 0
src/views/room/room3.vue

@@ -73,6 +73,7 @@ export default {
             this.$emit('Index2Emit', page)
         },
         innerTable(row) {
+            console.log(row)
             this.row = row
             this.innerVisible = true
         }