Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n
This commit is contained in:
commit
b63f67218a
|
|
@ -71,12 +71,14 @@
|
|||
import {useSettingStore} from "@/store/modules/setting"
|
||||
import {useUserStore} from "@/store/modules/user"
|
||||
import {usePermissionStore} from "@/store/modules/permission"
|
||||
import {useTagsViewStore} from "@/store/modules/tagsView"
|
||||
|
||||
const person = ref()
|
||||
const router = useRouter()
|
||||
const SettingStore = useSettingStore()
|
||||
const UserStore = useUserStore()
|
||||
const PermissionStore = usePermissionStore()
|
||||
const TagsViewStore = useTagsViewStore()
|
||||
|
||||
const isCollapse = computed(() =>!SettingStore.isCollapse)
|
||||
// menu 布局
|
||||
|
|
@ -97,7 +99,7 @@
|
|||
await UserStore.logout()
|
||||
router.push({ path: '/login' })
|
||||
PermissionStore.clearRoutes()
|
||||
store.dispatch('tagsView/clearVisitedView')
|
||||
TagsViewStore.clearVisitedView()
|
||||
} catch (e) {}
|
||||
})
|
||||
.catch(() => {})
|
||||
|
|
@ -153,7 +155,7 @@
|
|||
top: 0;
|
||||
background: white;
|
||||
left: 0;
|
||||
z-index: 99;
|
||||
z-index: 9;
|
||||
right: 0;
|
||||
transition: left 0.3s;
|
||||
flex-shrink: 0;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
// 是否折叠
|
||||
const isCollapse = computed(() => {
|
||||
return !useSettingStore.isCollapse
|
||||
return !SettingStore.isCollapse
|
||||
})
|
||||
let { device } = useResizeHandler()
|
||||
// 当屏幕切换的时候进行变换
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
top: 0;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
z-index: 999;
|
||||
z-index: 90;
|
||||
}
|
||||
.m-container-content {
|
||||
//padding: 20px;
|
||||
|
|
|
|||
|
|
@ -14,3 +14,10 @@
|
|||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
|
||||
@media screen and ( max-width: 540px ) {
|
||||
.app-breadcrumb{
|
||||
display: none!important;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue