1

src/components/sellDashboard/map/centerMpBaidu.vue

@@ -60,12 +60,12 @@ export default {
         //实例化点
         const point = new BMap.Point(item.Lng, item.Lat)
         //自定义点的样式
-        // type 0 激活 蓝色五角星 20191119035847676 
-        //      1 未拜访 黄色五角星 20191119035853676
-        //      2 未激活 红色五角星 20191119035858082
+        // type 0 激活 绿色 20191125015057879 
+        //      1 未拜访 紫色 20191125015102111
+        //      2 未激活 红色 20191125015100234
         const icon = new BMap.Icon(
-          item.type === 0 ? 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191119035847676.png' : item.type === 1 ? 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191119035853676.png' : 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191119035858082.png',
-          new BMap.Size(48, 48)
+          item.type === 0 ? 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015057879.png' : item.type === 1 ? 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015102111.png' : 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015100234.png',
+          new BMap.Size(30, 30)
         );
         //生成点标注
         const marker = new BMap.Marker(point, { icon: icon });
@@ -80,46 +80,62 @@ export default {
         map.addOverlay(marker);
       })
       // //2种聚合的实现
-      const size = new BMap.Size( 48, 48 )
+      const size = new BMap.Size( 30, 30 )
       var markerClusterer1 = new window.BMapLib.MarkerClusterer(map, {
-        markers: markerClusterers[1],
-        styles: [{
-          url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191119035853676.png',
-          size: size,
-          textSize: 18,
-          textColor: 'white',
-        }, {
-          url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191119035853676.png',
-          size: size,
-          textSize: 18,
-          textColor: 'white',
-        }, {
-          url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191119035853676.png',
-          size: size,
-          textSize: 18,
-          textColor: 'white',
-        }]
-      })
-      var markerClusterer2 = new window.BMapLib.MarkerClusterer(map, {
-        markers: markerClusterers[2],
-        styles: [{
-          url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191119035858082.png',
-          size: size,
-          textSize: 18,
-          textColor: 'white',
-        }, {
-          url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191119035858082.png',
-          size: size,
-          textSize: 18,
-          textColor: 'white',
-        }, {
-          url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191119035858082.png',
-          size: size,
-          textSize: 18,
-          textColor: 'white',
-        }]
-      })
-      var markerClusterer4 = new window.BMapLib.MarkerClusterer(map, { markers: markerClusterers[0] })
+          markers: markerClusterers[1],
+          styles: [{
+            url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015102111.png',
+            size: size,
+            textSize: 18,
+            textColor: 'white',
+          }, {
+            url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015102111.png',
+            size: size,
+            textSize: 18,
+            textColor: 'white',
+          }, {
+            url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015102111.png',
+            size: size,
+            textSize: 18,
+            textColor: 'white',
+          }]
+        })
+        var markerClusterer2 = new window.BMapLib.MarkerClusterer(map, {
+          markers: markerClusterers[2],
+          styles: [{
+            url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015100234.png',
+            size: size,
+            textSize: 18,
+            textColor: 'white',
+          }, {
+            url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015100234.png',
+            size: size,
+            textSize: 18,
+            textColor: 'white',
+          }, {
+            url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015100234.png',
+            size: size,
+            textSize: 18,
+            textColor: 'white',
+          }]
+        })
+        var markerClusterer4 = new window.BMapLib.MarkerClusterer(map, { markers: markerClusterers[0],
+          styles: [{
+            url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015057879.png',
+            size: size,
+            textSize: 18,
+            textColor: 'white',
+          }, {
+            url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015057879.png',
+            size: size,
+            textSize: 18,
+            textColor: 'white',
+          }, {
+            url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015057879.png',
+            size: size,
+            textSize: 18,
+            textColor: 'white',
+          }] })
       this.map = map
     },
     markerClick(point, item){

src/components/viitto/dataLook.vue

@@ -586,8 +586,8 @@
         </el-col>
       </el-row>
       <el-row>
-        <lineChart v-if="chartShow && RB_Branch_id !== 0 && ChunData" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList" :ChunData="ChunData"/>
-        <lineChart2 v-if="chartShow && RB_Branch_id === 0 && ChunData" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList" :ChunData="ChunData"/>
+        <lineChart v-if="chartShow && RB_Branch_id !== 0 && ChunData.length > 0" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList" :ChunData="ChunData"/>
+        <lineChart2 v-if="chartShow && RB_Branch_id === 0 && ChunData.length > 0" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList" :ChunData="ChunData"/>
         <!-- <lineChart2 v-if="chartShow  && ChunData" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList" :ChunData="ChunData"/> -->
       </el-row>
     </div>

src/components/viitto/lineChart.vue

@@ -82,7 +82,7 @@ export default {
       let _this = this
       setTimeout(()=>{
         _this.init()
-      }, 1000)
+      }, 2000)
   },methods:{
     initChun(){
       

src/components/viitto/lineChart2.vue

@@ -82,7 +82,7 @@ export default {
       let _this = this
       setTimeout(()=>{
         _this.init()
-      }, 1000)
+      }, 2000)
   },methods:{
     initChun(){