分公司+营地地图

src/api/base_info/campsite/index.js

@@ -18,6 +18,14 @@ export function allPage(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/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"
@@ -99,6 +99,7 @@
       companyMap},
     data() {
       return {
+        type: "campsite",
         toList: false,
         nodata: false,
         nomore:false,

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"],
@@ -68,55 +67,59 @@
       },
     },
     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;
-        page(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);
-          })
+        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);
+            })
+        }
 
       },
       mapClick(map, e) {

src/views/baseInfo/companyInfo/index.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"
@@ -30,7 +30,7 @@
         >
           <div class="item-right-p company-item">
             <div class="ellipsis company-name">{{item.name}}</div>
-            <p class="ellipsis">负责人：{{item.leader}}</p>
+            <p class="ellipsis">总经理：{{item.leader}}</p>
             <p>地址： {{item.address + item.addrDetail}}</p>
             <p class="ellipsis">电话：{{item.leaderContactInfo}}</p>
           </div>
@@ -104,6 +104,7 @@
       companyMap},
     data() {
       return {
+        type: "companyInfo",
         toList: false,
         nodata: false,
         nomore:false,