Parcourir la source

地图全屏展示修改

1004749546@qq.com il y a 4 ans
Parent
commit
130b7bbde5

+ 1 - 1
src/components/GlobalHeader/GlobalHeader.vue

@@ -2,7 +2,7 @@
   <transition name="showHeader">
     <div v-if="visible" class="header-animat">
       <a-layout-header
-        v-if="visible"
+        v-if="visible && $store.state.user.nowRouteName!='NodeMap'"
         :class="[fixedHeader && 'ant-header-fixedHeader', sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed', ]"
         :style="{ padding: '0' }">
         <div v-if="mode === 'sidemenu'" class="header">

+ 1 - 1
src/components/PageHeader/PageHeader.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="page-header">
     <div class="page-header-index-wide">
-      <s-breadcrumb />
+      <s-breadcrumb v-if="$store.state.user.nowRouteName!='NodeMap'" />
       <div class="detail">
         <div class="main" v-if="!$route.meta.hiddenHeaderContent">
           <!-- <div class="row">

+ 16 - 4
src/layouts/BasicLayout.vue

@@ -92,7 +92,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()) {
@@ -102,14 +103,25 @@ export default {
         return '256px'
       }
       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
+		}
+    },
+	nowRouteName (val) {
+		// console.log(val,'vvvvvvvvvvv')
+		if (val == 'NodeMap') {
+			this.collapsed = true
+		}
+	}
   },
   created () {
+	  
     if(this.mainMenu){
       this.menus = this.mainMenu.find((item) => item.path === '/').children
     }else{

+ 2 - 0
src/permission.js

@@ -14,6 +14,8 @@ const whiteList = ['login', 'register', 'registerResult'] // no redirect whiteli
 const defaultRoutePath = '/home'
 
 router.beforeEach((to, from, next) => {
+	store.state.user.nowRouteName = to.name
+	// console.log(to.name,store.state.user.nowRouteName,'router.beforeEach')
   NProgress.start() // start progress bar
   to.meta && (typeof to.meta.title !== 'undefined' && setDocumentTitle(`${to.meta.title} - ${domTitle}`))
   let token = store.state.user.token || sessionStorage.getItem(ACCESS_TOKEN)

+ 6 - 2
src/store/modules/user.js

@@ -11,7 +11,8 @@ const user = {
     welcome: '',
     avatar: '',
     roles: { permissionList: [] },
-    info: {}
+    info: {},
+	nowRouteName: '' // 当前路由名称
   },
 
   mutations: {
@@ -35,7 +36,10 @@ const user = {
     },
     SET_MUSTCHANGEPWD: (state, status) => {
       state.mustChangePwd = status
-    }
+    },
+	SET_NOWROUTENAME: (state, name) => {
+	  state.nowRouteName = name
+	}
   },
 
   actions: {

+ 2 - 2
src/views/map/NodeMap.vue

@@ -47,7 +47,7 @@
           :sm="24"
           :md="24"
           :lg="24"
-          :xl="24"
+          :xl="16"
           :xxl="16">
           <div class="switper-cont">
             <div class="data-title">实时投递数据</div>
@@ -89,7 +89,7 @@
           :sm="24"
           :md="24"
           :lg="24"
-          :xl="24"
+          :xl="8"
           :xxl="8">
           <div class="switper-cont">
             <div class="data-title">实时新增用户</div>