Merge remote-tracking branch 'origin/master'

src/api/base_info/campsite/index.js

@@ -10,6 +10,22 @@ export function page(query) {
   });
 }
 
+export function allPage(query) {
+  return fetch({
+    url: '/vehicle/campsite/allPage',
+    method: 'get',
+    params: query
+  });
+}
+
+export function campsiteAllPage(query) {
+  return fetch({
+    url: '/vehicle/campsite/allPage',
+    method: 'get',
+    params: query
+  });
+}
+
 export function getObj(id) {
   return fetch({
     url: '/vehicle/campsite/' + id,

src/main.js

@@ -79,7 +79,7 @@ Object.keys(filters).forEach(key => {
 });
 
 // register global progress.
-const whiteList = ['/login', '/authredirect', '/map', '/stockCrowd', '/stockCrowdDetail', '/companyInfo', '/provinceMap'];// 不重定向白名单
+const whiteList = ['/login', '/authredirect', '/map', '/stockCrowd', '/stockCrowdDetail', '/companyInfo', '/provinceMap', '/campsite'];// 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start(); // 开启Progress
   if (getToken()) { // 判断是否有token

src/views/baseInfo/campsite/campsite.vue

@@ -21,7 +21,7 @@
         </div>
       </div>
       <!--营地分布图-->
-      <company-map v-on:headCallBack="headCall"  v-if="toList" :toSonData="list" :provinceName="provinceName"></company-map>
+      <company-map v-on:headCallBack="headCall"  v-if="toList" :toSonData="type" :provinceName="provinceName"></company-map>
       <!--营地数据-->
       <div v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="0">
         <div class="shoppings company-list"
@@ -72,7 +72,7 @@
   /*引入postcss-px2rem 通过require的形式*/
   //  var px2rem = require('postcss-px2rem');
   import {
-    page
+    allPage
   } from 'api/base_info/campsite';
   import chinaMap from '../companyInfo/chinaMap';
   import companyMap from "../companyInfo/companyMap";
@@ -99,6 +99,7 @@
       companyMap},
     data() {
       return {
+        type: "campsite",
         toList: false,
         nodata: false,
         nomore:false,
@@ -339,7 +340,7 @@
         let params = this.objDeepCopy(this.listQuery);//深拷贝
         params.page = this.page++;
         this.send = !0;
-        page(params)
+        allPage(params)
           .then(res => {
             this.loading = false;
             let allList = [];
@@ -358,7 +359,7 @@
             }
             res.data.data.forEach(function (item) {
               allList.push(item);
-            });debugger
+            });
             if(res.data.data.length< this.listQuery.limit && this.list.length>0){
               //已加载全部
               this.nomore = true;

src/views/baseInfo/companyInfo/companyMap.vue

@@ -13,11 +13,10 @@
     getRegionByCodes,
   } from 'api/base_info/region/';
   import {
-    page,
-    addObj,
-    getObj,
-    delObj,
-    putObj
+    campsiteAllPage,
+  } from 'api/base_info/campsite';
+  import {
+    allPage,
   } from 'api/base_info/branch_company';
   export default {
     props: ["toSonData","provinceName"],
@@ -41,9 +40,17 @@
       }
     },
     mounted() {
+//      let that = this;
+//      if(this.map){
+//        this.map.addEventListener("zoomend", function(e){
+//          var ZoomNum = that.map.getZoom();
+//          this.addMarker(map);
+//        });
+//      }
     },
     watch: {
       provinceName(newValue, oldValue) {
+        let that = this;
         console.log(this.provinceName);
         if(this.map){
           if(this.provinceName == "兰州"){
@@ -52,50 +59,68 @@
             this.map.centerAndZoom(this.provinceName,6);
           }
         }
+//        this.map.addEventListener("zoomend", function(e){
+//          var ZoomNum = that.map.getZoom();
+//          that.map.clearOverlays();//清空地图上标注点
+//          that.addMarker(this,map);
+//        });
       },
     },
     methods: {
-      getList() {
-        page(this.listQuery)
-          .then(response => {
-            let listTemp = response.data.data;
-            //一次读入所有涉及地区，防止多次读取
-            if (!this.$utils.isEmpty(listTemp)) {
-              let allRegions = new Set();
-              for (let index in listTemp) {
-                allRegions.add(listTemp[index].addrProvince);
-                allRegions.add(listTemp[index].addrCity);
-                allRegions.add(listTemp[index].addrTown);
-                let regions = getRegionByCodes([listTemp[index].addrProvince, listTemp[index].addrCity, listTemp[index].addrTown]);
-                listTemp[index].address = regions[0].name + ' ' + regions[1].name + ' ' + regions[2].name + ' ';
-              }
-              getRegionByCodes([...allRegions]);
-            }
-            let arr = this.list;
-            listTemp.map(function(item){
-              arr.push(item);
-            });
-            this.list = arr;
-          })
-      },
       handler({map}) {
         this.map = map;
-        let list = this.toSonData;
-        // 定位
-        this.geolocation(map);
-        // 产生随机点
-        const bounds = map.getBounds();
-        for (let i = 0; i < list.length; i++) {
-          const point = {
-            title: "",//list[i].name
-            point: {
-              lng: list[i].longitude,
-              lat: list[i].latitude
-            }
-          };
-          this.pointList.push(point);
+        if(this.toSonData =="campsite"){
+          campsiteAllPage(this.listQuery)
+            .then(response => {
+              let listTemp = response.data.data;
+              let arr = [];
+              listTemp.map(function(item){
+                arr.push(item);
+              });
+              this.list = arr;
+              // 定位
+              this.geolocation(map);
+              // 产生随机点
+              const bounds = map.getBounds();
+              for (let i = 0; i < arr.length; i++) {
+                const point = {
+                  title: "",//list[i].name
+                  point: {
+                    lng: arr[i].longitude,
+                    lat: arr[i].latitude
+                  }
+                };
+                this.pointList.push(point);
+              }
+              this.addMarker(map);
+            })
+        } else {
+          allPage(this.listQuery)
+            .then(response => {
+              let listTemp = response.data.data;
+              let arr = [];
+              listTemp.map(function(item){
+                arr.push(item);
+              });
+              this.list = arr;
+              // 定位
+              this.geolocation(map);
+              // 产生随机点
+              const bounds = map.getBounds();
+              for (let i = 0; i < arr.length; i++) {
+                const point = {
+                  title: "",//list[i].name
+                  point: {
+                    lng: arr[i].longitude,
+                    lat: arr[i].latitude
+                  }
+                };
+                this.pointList.push(point);
+              }
+              this.addMarker(map);
+            })
         }
-        this.addMarker(map);
+
       },
       mapClick(map, e) {
         const point = e.point;
@@ -108,6 +133,7 @@
         const p = new BMap.Point(point.lng, point.lat);
         this.pickPoint = new BMap.Marker(p);
         this.addressDetail(point);//根据经纬度获取省市信息
+//        this.addMarker(map);
       },
       addressDetail(point){ //获取地理位置
         let mydata = getSonRegionByCodes(1);
@@ -130,9 +156,17 @@
         });
       },
       addMarker(map) {
+        let  zoom = map.getZoom();
+        var myIcon = new BMap.Icon('https://cwmp.upyuns.com/attachment/images/4/2019/05/HnFr78H280dv972KuNZku70297rz7z.png',new BMap.Size(16,16));//这里先不用第三个参数IconOptions;
+//        if(zoom <6){
+//          myIcon = new BMap.Icon('https://cwmp.upyuns.com/attachment/images/4/2019/05/HnFr78H280dv972KuNZku70297rz7z.png',new BMap.Size(16,16));//这里先不用第三个参数IconOptions
+//        }
         for (const item of this.pointList) {
           const point = new BMap.Point(item.point.lng, item.point.lat);
-          const mk = new BMap.Marker(point);
+          var mk = new BMap.Marker(point, {icon:myIcon});
+//          if(zoom > 6){
+//            mk = new BMap.Marker(point);
+//          }
           const label = new BMap.Label(item.title);
           label.setOffset(new BMap.Size(15, -15));
           label.setStyle({