|
@@ -7,16 +7,14 @@
|
|
|
:wrapClassName="`drawer-sider ${navTheme}`"
|
|
|
:closable="false"
|
|
|
:visible="collapsed"
|
|
|
- @close="drawerClose"
|
|
|
- >
|
|
|
+ @close="drawerClose">
|
|
|
<side-menu
|
|
|
mode="inline"
|
|
|
:menus="menus"
|
|
|
:theme="navTheme"
|
|
|
:collapsed="false"
|
|
|
:collapsible="true"
|
|
|
- @menuSelect="menuSelect"
|
|
|
- ></side-menu>
|
|
|
+ @menuSelect="menuSelect"></side-menu>
|
|
|
</a-drawer>
|
|
|
|
|
|
<side-menu
|
|
@@ -25,8 +23,7 @@
|
|
|
:menus="menus"
|
|
|
:theme="navTheme"
|
|
|
:collapsed="collapsed"
|
|
|
- :collapsible="true"
|
|
|
- ></side-menu>
|
|
|
+ :collapsible="true"></side-menu>
|
|
|
|
|
|
<a-layout :class="[layoutMode, `content-width-${contentWidth}`]" :style="{ paddingLeft: contentPaddingLeft, minHeight: '100vh' }">
|
|
|
<!-- layout header -->
|
|
@@ -36,8 +33,7 @@
|
|
|
:theme="navTheme"
|
|
|
:collapsed="collapsed"
|
|
|
:device="device"
|
|
|
- @toggle="toggle"
|
|
|
- />
|
|
|
+ @toggle="toggle" />
|
|
|
|
|
|
<!-- layout content -->
|
|
|
<a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: fixedHeader ? '64px' : '0' }">
|
|
@@ -60,9 +56,17 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { triggerWindowResizeEvent } from '@/utils/util'
|
|
|
-import { mapState, mapActions } from 'vuex'
|
|
|
-import { mixin, mixinDevice } from '@/utils/mixin'
|
|
|
+import {
|
|
|
+ triggerWindowResizeEvent
|
|
|
+} from '@/utils/util'
|
|
|
+import {
|
|
|
+ mapState,
|
|
|
+ mapActions
|
|
|
+} from 'vuex'
|
|
|
+import {
|
|
|
+ mixin,
|
|
|
+ mixinDevice
|
|
|
+} from '@/utils/mixin'
|
|
|
import config from '@/config/defaultSettings'
|
|
|
|
|
|
import RouteView from './RouteView'
|
|
@@ -70,7 +74,9 @@ import SideMenu from '@/components/Menu/SideMenu'
|
|
|
import GlobalHeader from '@/components/GlobalHeader'
|
|
|
import GlobalFooter from '@/components/GlobalFooter'
|
|
|
import SettingDrawer from '@/components/SettingDrawer'
|
|
|
-import { asyncRouterMap } from '@/config/router.config'
|
|
|
+import {
|
|
|
+ asyncRouterMap
|
|
|
+} from '@/config/router.config'
|
|
|
|
|
|
export default {
|
|
|
name: 'BasicLayout',
|
|
@@ -92,7 +98,8 @@ export default {
|
|
|
computed: {
|
|
|
...mapState({
|
|
|
// 动态主路由
|
|
|
- mainMenu: state => state.permission.routers
|
|
|
+ mainMenu: state => state.permission.routers,
|
|
|
+ nowRouteName: state => state.user.nowRouteName
|
|
|
}),
|
|
|
contentPaddingLeft () {
|
|
|
if (!this.fixSidebar || this.isMobile()) {
|
|
@@ -103,16 +110,30 @@ export default {
|
|
|
}
|
|
|
return '80px'
|
|
|
}
|
|
|
+
|
|
|
},
|
|
|
watch: {
|
|
|
sidebarOpened (val) {
|
|
|
- this.collapsed = !val
|
|
|
+ // console.log(this.$store.state.user.nowRouteName, 'vvvvvvvvvvv')
|
|
|
+ if (this.$store.state.user.nowRouteName != 'NodeMap') {
|
|
|
+ this.collapsed = !val
|
|
|
+ } else {
|
|
|
+ this.collapsed = true
|
|
|
+ }
|
|
|
+ },
|
|
|
+ nowRouteName (val) {
|
|
|
+ // console.log(val, 'vvvvvvvvvvv')
|
|
|
+ if (val == 'NodeMap') {
|
|
|
+ this.collapsed = true
|
|
|
+ } else {
|
|
|
+ this.collapsed = false
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
created () {
|
|
|
- if(this.mainMenu){
|
|
|
+ if (this.mainMenu) {
|
|
|
this.menus = this.mainMenu.find((item) => item.path === '/').children
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
// 没有权限时只显示首页
|
|
|
const noqx = asyncRouterMap.find((item) => item.path === '/').children
|
|
|
this.menus = [noqx.find(item => item.path === '/home')]
|
|
@@ -121,7 +142,8 @@ export default {
|
|
|
},
|
|
|
mounted () {
|
|
|
const userAgent = navigator.userAgent
|
|
|
- if (userAgent.indexOf('Edge') > -1) {
|
|
|
+ console.log(userAgent, this.collapsed, this.nowRouteName, 'this.collapsedthis.collapsedthis.collapsed')
|
|
|
+ if (userAgent.indexOf('Edge') > -1 && this.nowRouteName != 'NodeMap') {
|
|
|
this.$nextTick(() => {
|
|
|
this.collapsed = !this.collapsed
|
|
|
setTimeout(() => {
|
|
@@ -129,6 +151,11 @@ export default {
|
|
|
}, 16)
|
|
|
})
|
|
|
}
|
|
|
+ if (this.nowRouteName == 'NodeMap') {
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.collapsed = true
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
methods: {
|
|
|
...mapActions(['setSidebar']),
|
|
@@ -146,8 +173,7 @@ export default {
|
|
|
}
|
|
|
return left
|
|
|
},
|
|
|
- menuSelect () {
|
|
|
- },
|
|
|
+ menuSelect () {},
|
|
|
drawerClose () {
|
|
|
this.collapsed = false
|
|
|
}
|
|
@@ -156,9 +182,9 @@ export default {
|
|
|
</script>
|
|
|
|
|
|
<style lang="less">
|
|
|
-@import url('../components/global.less');
|
|
|
+ @import url('../components/global.less');
|
|
|
|
|
|
-/*
|
|
|
+ /*
|
|
|
* The following styles are auto-applied to elements with
|
|
|
* transition="page-transition" when their visibility is toggled
|
|
|
* by Vue.js.
|
|
@@ -167,17 +193,17 @@ export default {
|
|
|
* these styles.
|
|
|
*/
|
|
|
|
|
|
-.page-transition-enter {
|
|
|
- opacity: 0;
|
|
|
-}
|
|
|
+ .page-transition-enter {
|
|
|
+ opacity: 0;
|
|
|
+ }
|
|
|
|
|
|
-.page-transition-leave-active {
|
|
|
- opacity: 0;
|
|
|
-}
|
|
|
+ .page-transition-leave-active {
|
|
|
+ opacity: 0;
|
|
|
+ }
|
|
|
|
|
|
-.page-transition-enter .page-transition-container,
|
|
|
-.page-transition-leave-active .page-transition-container {
|
|
|
- -webkit-transform: scale(1.1);
|
|
|
- transform: scale(1.1);
|
|
|
-}
|
|
|
+ .page-transition-enter .page-transition-container,
|
|
|
+ .page-transition-leave-active .page-transition-container {
|
|
|
+ -webkit-transform: scale(1.1);
|
|
|
+ transform: scale(1.1);
|
|
|
+ }
|
|
|
</style>
|