添加上钢楼栋数据

src/mock/index.js

@@ -37,6 +37,7 @@ import gaoqiao from './gaoqiao'
 import heqing from './heqing'
 import laogang from './laogang'
 import shanggang from './shanggang'
+import shanggangBuilding from './shanggang-building'
 import tangqiao from './tangqiao'
 import huinan from './huinan'
 
@@ -85,4 +86,5 @@ export const mockBuilding = {
   caoluBuilding,
   jinqiaoBuilding,
   sanlinBuilding,
+  shanggangBuilding,
 }

src/mock/shanggang.js

@@ -201,7 +201,7 @@ export default {
   }, {
     "name": "上钢六村",
     "address": "成山路143号昌里路340弄7号",
-    "level": 1,
+    "level": 3,
     "location": [121.490309, 31.171689],
     "path": [
       [121.491187, 31.172387],
@@ -230,7 +230,7 @@ export default {
   }, {
     "name": "上钢七村",
     "address": "耀华路414弄1-19号",
-    "level": 2,
+    "level": 1,
     "location": [121.487261, 31.172605],
     "path": [
       [121.486473, 31.171303],
@@ -253,7 +253,7 @@ export default {
       [121.486167, 31.172787],
       [121.486148, 31.172716],
       [121.486584, 31.172798],
-      [121.486726, 31.172203],
+      [121.486714,31.172252],
       [121.486237, 31.172113],
       [121.48644, 31.17133],
       [121.486473, 31.171303]
@@ -327,7 +327,7 @@ export default {
   }, {
     "name": "上钢十村",
     "address": "耀华路414弄1-23号",
-    "level": 1,
+    "level": 2,
     "location": [121.485199, 31.170657],
     "path": [
       [121.484473, 31.171104],
@@ -340,8 +340,11 @@ export default {
       [121.484399, 31.170046],
       [121.484276, 31.170098],
       [121.48387, 31.170119],
-      [121.483606, 31.171086],
+      // [121.483606, 31.171086],
+      [121.483594,31.171127],
       [121.484473, 31.171104]
+      // 121.483604,31.171084
+
     ]
   }, {
     "name": "德州一村",
@@ -472,7 +475,7 @@ export default {
       [121.494843, 31.168047]
     ]
   }, {
-    name: '德州六村',
+    name: '灵岩路56弄',
     address: '灵岩路56弄1-68号',
     level: 2,
     location: [121.491807, 31.166493],
@@ -503,7 +506,7 @@ export default {
   }, {
     "name": "德州七村",
     "address": "德州路350弄1-15号",
-    "level": 3,
+    "level": 1,
     "location": [121.48668, 31.165558],
     "path": [
       [121.486969, 31.16695],
@@ -564,7 +567,7 @@ export default {
       [121.483684, 31.166113]
     ]
   }, {
-    name: '济阳三村',
+    name: '济阳二三村',
     address: '德州路465弄1-14号',
     level: 1,
     location: [121.481267, 31.168378],
@@ -610,9 +613,9 @@ export default {
       [121.481205, 31.170615]
     ]
   }, {
-    name: '新世纪花苑1期',
+    name: '新世纪花苑第一小区',
     address: '耀华路331弄1-59号',
-    level: 1,
+    level: 3,
     location: [121.483437, 31.175054],
     path: [
       [121.485871, 31.17558],
@@ -706,7 +709,7 @@ export default {
       [121.481859, 31.171749]
     ]
   }, {
-    "name": "新世纪花苑2期",
+    "name": "新世纪花苑二、三期",
     "address": "耀华路579弄1-128号",
     "level": 3,
     "location": [121.479338, 31.17249],
@@ -775,36 +778,5 @@ export default {
       [121.48161, 31.172507],
       [121.480662, 31.171985]
     ]
-  }, {
-    "name": "德州七村",
-    "address": "德州路350弄1-15号",
-    "level": 1,
-    "location": [121.48668, 31.165558],
-    "path": [
-      [121.486969, 31.16695],
-      [121.48704, 31.166621],
-      [121.487057, 31.166512],
-      [121.487528, 31.166557],
-      [121.48766, 31.166038],
-      [121.487934, 31.16607],
-      [121.488414, 31.166141],
-      [121.488467, 31.165969],
-      [121.488541, 31.165805],
-      [121.48863, 31.16554],
-      [121.488767, 31.165271],
-      [121.488844, 31.165058],
-      [121.488882, 31.164901],
-      [121.48528, 31.164236],
-      [121.485174, 31.164669],
-      [121.484813, 31.166062],
-      [121.485223, 31.166122],
-      [121.485386, 31.166141],
-      [121.485715, 31.16628],
-      [121.485725, 31.166331],
-      [121.485697, 31.166484],
-      [121.485615, 31.166904],
-      [121.486946, 31.167065],
-      [121.486969, 31.16695]
-    ]
   }]
 }

src/views/main.vue

@@ -221,7 +221,7 @@ export default {
       // this.initLayers()
       this.addController()
       // this.addMarker()
-      this.addEvents()
+      // this.addEvents() // TODO 添加完数据后要恢复
       this.highlightPudong()
       this.initMenu()
     },
@@ -255,7 +255,7 @@ export default {
       // this.detailData = buildingList.building.filter(item => item.name.indexOf(name) >= 0)
       this.detailData = buildingList.building.filter(item => {
         const buildingName = item.name && item.name.replace('(补)', '').replace('（补）', '')
-        return buildingName.indexOf(name) >= 0
+        return buildingName.indexOf(name) >= 0 || item.buildingNo.indexOf(name) >= 0
       })
       this.detailModal = true
     },
@@ -368,7 +368,9 @@ export default {
       }
       const markerList = []
       this.buildingList[`${this.curStreet}Building`].building.forEach(item => {
-        if(item.name.indexOf(name) >= 0 && item.lon && item.lat && item.intention) {
+        const buildingName = item.name && item.name.replace('(补)', '').replace('（补）', '')
+        if (buildingName.indexOf(name) < 0 && item.buildingNo.indexOf(name) < 0) return
+        if(item.lon && item.lat && item.intention) {
           const image = whichImage(item.intention)
           const style = {
             img:image.src,