fix: new

src/views/dataJq/dogAte.vue

@@ -5,22 +5,18 @@
     </div>
     <div class="dogAte_co">
       <div id="dogAge" style="width: 400px; height: 200px"></div>
-      <!-- <div></div> -->
     </div>
   </div>
 </template>
 
 <script>
 import { postRequest } from '@/api/dogView.js'
-import M from 'minimatch';
-import { resolve } from 'path';
 export default {
   data() {
     return {};
   },
   methods: {
     async getAge() {
-      
       var loadingFunnel = {
         title: '',
         arrDataX: [],
@@ -64,21 +60,20 @@ export default {
         ],
         tooltip: {
           show: true,
-          // formatter: function(params) {
+          // formatter(params) {
           //   console.log(params)
           //   return params.marker + params.name + ':' + params.data.number + '万'
           // }
         },
         legend: {
+          show: true,
           orient: 'vertical',
           left: 'right',
-          data: [{
-            name: loadingFunnel.arrDataX[0],
-            value:loadingFunnel.arrDataY[0]
-          }]
+          data: loadingFunnel.arrDataX,
+          icon: 'circle'
         },
         grid: {
-          // containLabel: true,
+          containLabel: true,
           left: '10%',
           top: "19%",
           bottom: "0%",
@@ -154,7 +149,7 @@ export default {
             symbol: 'image://' + require('../../assets/img/dog-age04.png')
           }]
         }]
-			})
+			}, true)
     },
     getApi() {
       return new Promise((resolve) => {

src/views/dataJq/mapBox.vue

@@ -104,7 +104,7 @@ export default {
           name: map, //"china",
           type: "map",
           map: map, //'china',
-          mapType: 'china',
+          mapType: map,
           geoIndex: 0,
           zoom: 1,
           data: that.datas,
@@ -130,7 +130,13 @@ export default {
           coordinateSystem: "geo",
           data: that.datas,
           center: jwd,
+          encode: {
+            value: 2,
+          },
+          symbol: bgIcon,
+          symbolSize: [27,24],
           label: {
+            show: true,
             normal: {
               show: true,
               color: "#333",
@@ -158,6 +164,7 @@ export default {
               "show": true
             }
           },
+          visualMap: false,
           "itemStyle": {
             "normal": {
               show: false,
@@ -165,7 +172,7 @@ export default {
             }
           }
         }]
-      })
+      }, true)
     }
     $.getJSON(`/map/china.json`, (data) => {
       that.$echarts.registerMap('china', data);
@@ -175,7 +182,6 @@ export default {
       for (let i = 0; i < provinces.length; i++) {
         if (provinces[i].name.indexOf(param.name) != -1) {
           $.getJSON(`/map/${provinces[i].key}.json`, (data) => {
-            console.log(data)
             that.$echarts.registerMap(provinces[i].key, data);
             that.log.push(provinces[i].key)
             initMap(`${provinces[i].key}`, provinces[i].jwd);
@@ -183,8 +189,6 @@ export default {
             console.log(err)
             that.$message.error('没有更多了！')
           })
-        } else {
-
         }
       }
     })