guoxiaohuan 4 vuotta sitten
vanhempi
commit
2a4bd00413
2 muutettua tiedostoa jossa 15 lisäystä ja 23 poistoa
  1. 14 22
      src/store/index.js
  2. 1 1
      src/views/room/detail.vue

+ 14 - 22
src/store/index.js

@@ -1,22 +1,16 @@
 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'
 
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        // ssoToken: 'admin:chuyushu',
+        ssoToken: 'admin:chuyushu',
         // ssoToken: '',
-        ssoToken: null,
+        // ssoToken: null,
         plazaName: '',
         isPreview: false,
         lastRoute: '',
@@ -69,7 +63,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) {
@@ -166,18 +160,16 @@ export default new Vuex.Store({
     },
     actions: {
         // 获取项目列表、userId
-        async getUserInfo({
-            commit
-        }, palyload) {
-            console.log('getUserInfo',1)
+        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)
+                        console.log('getUserInfo', 2)
                         commit('STOREACCESSLEVEL', res.level)
                         let level = res.level
                         if (window.opener) {
@@ -210,16 +202,16 @@ export default new Vuex.Store({
                     }
                 })
                 .catch((err) => {
-                    console.log('getuserfo catch',err)
+                    console.log('getuserfo catch', err)
                     // router.push({
                     //     path: '/404',
                     // })
                     commit('SETISREQUESTtAUTH', err)
                 })
-                console.log('getUserInfo',3)
+            console.log('getUserInfo', 3)
         },
         async getFloors(context) {
-          await queryFloor({
+            await queryFloor({
                 plazaId: localStorage.getItem('PLAZAID') || context.state.plazaId,
             }).then((res) => {
                 if (res.result == 'success') {
@@ -253,4 +245,4 @@ export default new Vuex.Store({
         },
     },
     modules: {},
-})
+})

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

@@ -115,7 +115,7 @@
             <el-table-column prop='sbjc' label='设备名称' min-width='150' :show-overflow-tooltip='true' resizable>
                 <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备内' :show-overflow-tooltip='true'>
+            <el-table-column prop='assetnum' label='设备内' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
             </el-table-column>
             <el-table-column prop='sl' label='数量' width='70' :show-overflow-tooltip='true'>