t

src/api/base.js

@@ -5,6 +5,9 @@ import { nologinRequest } from '@/utils/request'
 import { getRequest, getRequestNoSort } from '@/utils/request'
 
 export default {
+  apiareainfolist: params => { // 区域 信息 不登录 临时接口
+    return nologinRequest('https://api.honglouplus.com/api/area/info/list', params, 'loading')
+  },
   admLogin: params => { // 登录
     return nologinRequest('/adm/login', params, 'loading')
   },

src/components/Common/Map.vue

@@ -125,7 +125,7 @@ export default {
                       address: result.formattedAddress
                     }
                     _this.searchKey = result.formattedAddress
-                    _this.markers.push([lng, lat])
+                    _this.markers = [[lng, lat]]
                     _this.loaded = true
                     // 页面渲染好后
                     _this.$nextTick()
@@ -165,7 +165,7 @@ export default {
           this.center = [this.pointObj.longitude, this.pointObj.latitude]
         }
         this.searchKey = !this.pointObj.latitude || !this.pointObj.longitude ? '' : this.pointObj.address
-        this.markers.push(!this.pointObj.latitude || !this.pointObj.longitude ? [] : [this.pointObj.longitude, this.pointObj.latitude])
+        this.markers = (!this.pointObj.latitude || !this.pointObj.longitude ? [] : [[this.pointObj.longitude, this.pointObj.latitude]])
       }
     }
   },

src/views/map/dtl.vue

@@ -469,42 +469,57 @@ export default {
   },
   created() {
     this.getData()
-    this.$api.other.admmapcoordinall().then(res => {
-      let estateList = res.estate_list || []
-      estateList.map(item => {
-        item.position = [item.longitude, item.latitude]
+    this.$api.base.apiareainfolist().then(areaArr => {
+      const arr = areaArr.map((a, aIndex) => {
+        return {
+          key: aIndex,
+          val: a.option1,
+          longitude: a.longitude,
+          latitude: a.latitude,
+          areaName: a.area_name,
+        }
       })
-      this.estateList = [...estateList]
-
-      const query = this.$route.query
-      if (query.id === '95542fdc-b542-4582-9be2-9ab8005728d3') {
-        let small_school_list = res.small_school_list || []
-        small_school_list.map(item => {
-          item.position = [item.longitude, item.latitude]
-        })
-        this.schoolList = [...small_school_list]
-      } else if (query.id === '95542ff1-8176-4267-8344-2aa7f1034ac5') {
-        let medium_school_list = res.medium_school_list || []
-        medium_school_list.map(item => {
+      this.$api.other.admmapcoordinall().then(res => {
+        let estateList = res.estate_list || []
+        estateList.map(item => {
           item.position = [item.longitude, item.latitude]
         })
-        this.schoolList = [...medium_school_list]
-      } else {
-        let schoolList = res.school_list || []
-        schoolList.map(item => {
-          item.position = [item.longitude, item.latitude]
-        })
-        this.schoolList = [...schoolList]
-      }
+        this.estateList = [...estateList]
 
+        const query = this.$route.query
+        if (query.id === '95542fdc-b542-4582-9be2-9ab8005728d3') {
+          let small_school_list = res.small_school_list || []
+          small_school_list.map(item => {
+            item.position = [item.longitude, item.latitude]
+          })
+          this.schoolList = [...small_school_list]
+        } else if (query.id === '95542ff1-8176-4267-8344-2aa7f1034ac5') {
+          let medium_school_list = res.medium_school_list || []
+          medium_school_list.map(item => {
+            item.position = [item.longitude, item.latitude]
+          })
+          this.schoolList = [...medium_school_list]
+        } else {
+          let schoolList = res.school_list || []
+          schoolList.map(item => {
+            item.position = [item.longitude, item.latitude]
+          })
+          this.schoolList = [...schoolList]
+        }
 
-      let areaList = res.area_total || []
-      areaList.map(item => {
-        let lnglatArr = arrToObj(this.dictData.map_area_lnglat)[item.area_type].split(',')
-        item.position = [lnglatArr[0], lnglatArr[1]]
-        item.areaName = arrToObj(this.dictData.area_type)[item.area_type]
+
+        let areaList = res.area_total || []
+        areaList.map(item => {
+          console.log(item)
+          // let lnglatArr = arrToObj(this.dictData.map_area_lnglat)[item.area_type].split(',')
+          // item.position = [lnglatArr[0], lnglatArr[1]]
+          // item.areaName = arrToObj(this.dictData.area_type)[item.area_type]
+          const areaIndex = arrToObj(arr)[item.area_type]
+          item.position = [arr[areaIndex].longitude, arr[areaIndex].latitude]
+          item.areaName = arr[areaIndex].areaName
+        })
+        this.areaList = [...areaList]
       })
-      this.areaList = [...areaList]
     })
   },
   mounted() {},