Browse Source

Merge branch 'master' of git.sagacloud.cn:web/ibms

zhangyu 5 years ago
parent
commit
ba20c33cfd

+ 2 - 2
src/components/business_space/table/equipTable.vue

@@ -6,8 +6,8 @@
                     <el-table-column width="180" label="设备名称">
                         <template slot-scope="scope">
                             <span>
-                                <el-tooltip :content="scope.row.infos.EquipName" placement="top">
-                                <span>{{scope.row.infos.EquipName | cutString(15)}}</span>
+                                <el-tooltip :content="scope.row.infos.EquipName" placement="top">                                 
+                                <span>{{scope.row.infos.EquipLocalName || scope.row.infos.EquipName | cutString(15)}}</span>
                                 </el-tooltip>
                             </span>
                         </template>

+ 2 - 0
src/framework/layout/layout-store.js

@@ -1,6 +1,7 @@
 import frameworkApi from '@/api/framework'
 import storage from '@/framework/utils/storage'
 import axios from 'axios'
+import authutils from '../../utils/authutils'
 
 const KEY_MENU_SELECTED = 'menu_selected'
 const KEY_PROJECT_SELECTED = 'global_project_selected'
@@ -90,6 +91,7 @@ export default {
                         }
                     } else {
                         state.userInfo = null
+                        authutils.toLoginPage()
                     }
                     resolve(resp)
                 })

+ 2 - 0
src/router/system.js

@@ -39,6 +39,7 @@ import propertyLedger from '@/views/ledger/property/index'
 import dialogSystem from '@/views/ledger/property/addproperty'
 import cenotelist from '@/views/ledger/cenotelist/index' //竖井清单
 import auth from '@/views/system/auth'
+import noUser from '@/views/system/nouser'
 
 /** 租户管理 */
 import rentlist from '@/views/rent/rentlist'
@@ -48,6 +49,7 @@ export default [
     { path: '/', name: '', component: LayoutMain, children: [{ path: '', name: 'blank', component: Dasboard }] },
     //{ path: '/login', name: 'Login', component: Login },
     { path: '/auth', name: 'auth', component: auth },
+    { path: '/noUser', name: 'noUser', component: noUser },
     // 系统集成
     {
         path: '/point',

+ 1 - 3
src/views/system/auth/index.vue

@@ -26,10 +26,8 @@ export default {
                 if (lastRoute) {
                     this.$router.replace(lastRoute)
                 } else {
-                    this.$router.replace('/')
+                    this.$router.replace('/nouser')
                 }
-            } else {
-                authutils.toLoginPage()
             }
         })
     },