ソースを参照

Merge branch 'develop' into aly_dev

guoxiaohuan 4 年 前
コミット
40dffaf9af
3 ファイル変更8 行追加6 行削除
  1. 1 1
      package.json
  2. 2 1
      src/components/floorMap/index.vue
  3. 5 4
      src/router/index.js

+ 1 - 1
package.json

@@ -10,7 +10,7 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.22",
-        "@saga-web/big": "1.0.73",
+        "@saga-web/big": "1.0.74",
         "@saga-web/draw": "2.1.100",
         "@saga-web/feng-map": "1.0.22",
         "@saga-web/graph": "2.1.105",

+ 2 - 1
src/components/floorMap/index.vue

@@ -104,7 +104,8 @@ export default {
                         this.fParser.parseData(res)
                         this.fParser.spaceList.forEach(t => {
                             this.scene.addItem(t)
-                            t.nameSize = 16
+                            t.nameSize = 14
+                            t.nameColor = '#646A73'
                             if (t.data.Name && this.bunkObj[t.data.Name]) {
                                 t.name = this.bunkObj[t.data.Name].brandname
                             } else {

+ 5 - 4
src/router/index.js

@@ -1,7 +1,9 @@
 import Vue from 'vue'
 import store from '@/store'
 import VueRouter from 'vue-router'
-import { query } from '@/utils/query'
+import {
+    query
+} from '@/utils/query'
 
 Vue.use(VueRouter)
 const routes = [
@@ -24,8 +26,7 @@ const routes = [
         name: 'home',
         component: () => import('../views/index'),
         redirect: '/home/homepage',
-        children: [
-            {
+        children: [{
                 path: 'homepage',
                 component: () => import('../views/homepage'),
             },
@@ -111,4 +112,4 @@ router.beforeEach(async (to, from, next) => {
         return
     }
 })
-export default router
+export default router