Ver código fonte

地图修改

1004749546@qq.com 4 anos atrás
pai
commit
09809d7213
4 arquivos alterados com 15 adições e 7 exclusões
  1. BIN
      public/mark.png
  2. 12 4
      src/layouts/BasicLayout.vue
  3. 1 1
      src/permission.js
  4. 2 2
      src/views/map/NodeMap.vue

BIN
public/mark.png


+ 12 - 4
src/layouts/BasicLayout.vue

@@ -114,13 +114,15 @@ export default {
   },
   watch: {
     sidebarOpened (val) {
-      // console.log(this.$store.state.user.nowRouteName ,'vvvvvvvvvvv')
+      // 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')
+      // console.log(val, 'vvvvvvvvvvv')
       if (val == 'NodeMap') {
         this.collapsed = true
       } else {
@@ -140,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(() => {
@@ -148,6 +151,11 @@ export default {
         }, 16)
       })
     }
+    if (this.nowRouteName == 'NodeMap') {
+      this.$nextTick(() => {
+		  this.collapsed = true
+      })
+    }
   },
   methods: {
     ...mapActions(['setSidebar']),

+ 1 - 1
src/permission.js

@@ -15,7 +15,7 @@ const defaultRoutePath = '/home'
 
 router.beforeEach((to, from, next) => {
 	store.state.user.nowRouteName = to.name
-	// console.log(to.name,store.state.user.nowRouteName,'router.beforeEach')
+	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)

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

@@ -315,8 +315,8 @@ export default {
         styles: {
           // 创建一个styleId为"myStyle"的样式(styles的子属性名即为styleId)
           'myStyle': new TMap.MarkerStyle({
-            'width': 25, // 点标记样式宽度(像素)
-            'height': 25, // 点标记样式高度(像素)
+            'width': 30, // 点标记样式宽度(像素)
+            'height': 30, // 点标记样式高度(像素)
             'src': '../mark.png', // 图片路径
             // 焦点在图片中的像素位置,一般大头针类似形式的图片以针尖位置做为焦点,圆形点以圆心位置为焦点
             'anchor': {