合并分支 'feature/branch_wm' 到 'develop'

Feature/branch wm

查看合并请求 !14

src/views/chart/chart/bubble/bubble_antv.js

@@ -102,6 +102,7 @@ const location = [[
 export function baseBubbleMapOption(chartDom, chartId, chart, action) {
   const xAxis = JSON.parse(chart.xaxis)
   const yAxis = JSON.parse(chart.yaxis)
+  console.log('xAxis,yAxis', xAxis, yAxis)
   let customAttr
   if (chart.customAttr) {
     customAttr = JSON.parse(chart.customAttr)
@@ -166,7 +167,7 @@ export function baseBubbleMapOption(chartDom, chartId, chart, action) {
     }
   })
   const mapData = { type: 'FeatureCollection', features: newTableRow }
-
+  console.log('mapData===', mapData)
   chartDom.removeAllLayer()
     .then(() => {
       const pointLayer = new PointLayer({})

src/views/chart/chart/cityBrightness/cityBrightness_antv.js

 import { Scene, PointLayer } from '@antv/l7'
 import { GaodeMap } from '@antv/l7-maps'
 import { getLanguage } from '@/lang'
-
+// const location = [
+//   [113.950375, 22.534875],
+//   [113.950625, 22.534875],
+//   [113.930125, 22.515625],
+//   [113.930375, 22.515625],
+//   [113.929625, 22.515625]
+// ]
+const location = [[
+  121.473701,
+  31.230416
+], [
+  102.710002,
+  25.045806
+], [
+  111.765617,
+  40.817498
+], [
+  116.407526,
+  39.90403
+], [
+  125.32599,
+  43.896536
+], [
+  104.075931,
+  30.651651
+], [
+  117.200983,
+  39.084158
+], [
+  106.258754,
+  38.471317
+], [
+  117.284922,
+  31.861184
+], [
+  117.020359,
+  36.66853
+], [
+  112.562398,
+  37.873531
+], [
+  113.26653,
+  23.132191
+], [
+  108.327546,
+  22.815478
+], [
+  87.627704,
+  43.793026
+], [
+  118.763232,
+  32.061707
+], [
+  115.909228,
+  28.675696
+], [
+  114.468664,
+  38.037057
+], [
+  113.753602,
+  34.765515
+], [
+  120.152791,
+  30.267446
+], [
+  110.349228,
+  20.017377
+], [
+  114.341861,
+  30.546498
+], [
+  112.98381,
+  28.112444
+], [
+  103.826308,
+  36.059421
+], [
+  119.295144,
+  26.100779
+], [
+  91.117212,
+  29.646922
+], [
+  106.70741,
+  26.598194
+], [
+  123.42944,
+  41.835441
+], [
+  106.551556,
+  29.563009
+], [
+  108.954239,
+  34.265472
+], [
+  101.780199,
+  36.620901
+], [
+  126.661669,
+  45.742347
+]]
 export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action) {
-  console.log('chart==chart.data.tableRow==', chart, chart.data.tableRow)
   const xAxis = JSON.parse(chart.xaxis)
   const yAxis = JSON.parse(chart.yaxis)
+  // console.log('chart==chart.data.tableRow==', chart, chart.data.tableRow)
+  // console.log('xAxis,yAxis', xAxis, yAxis)
   let customAttr
   if (chart.customAttr) {
     customAttr = JSON.parse(chart.customAttr)
@@ -29,8 +130,8 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
         // pitch: 64.88, // 地图倾角
         style: mapStyle,
         // style: 'dark',
-        center: [114.060288, 22.53684], // 地图中心经纬度
-        zoom: 15.63,
+        center: [116.41667, 39.91667], // 地图中心经纬度-北京
+        zoom: 10,
         maxZoom: 20
       }),
       logoVisible: false
@@ -46,21 +147,13 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
     chartDom.removeAllLayer()
     return chartDom
   }
-  // const newTableRow = chart.data.tableRow.map((item, index) => {
-  //   return {
-  //     type: 'Feature',
-  //     properties: {
-  //       capacity: item[yAxis[0].dataeaseName]
-  //     },
-  //     geometry: {
-  //       type: 'Point',
-  //       coordinates: provinceLocation[index]
-  //     },
-  //     bbox: [provinceLocation[index][0], provinceLocation[index][1], provinceLocation[index][0], provinceLocation[index][1]]
-  //   }
+  // chart.data.tableRow.map((item, index) => {
+  //   console.log('item===', index, item, item[yAxis[0].dataeaseName])
   // })
-  // const mapData = { type: 'FeatureCollection', features: newTableRow }
-  const mapData = { type: 'FeatureCollection', features: [{ type: 'Feature', properties: {
+  const newTableRow = location.map((item, index) => {
+    return {
+      type: 'Feature',
+      properties: {
         h0: '3',
         h1: '2',
         h2: '1',
@@ -85,11 +178,46 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
         h21: '4',
         h22: '6',
         h23: '6'
-  }, geometry: {
+      },
+      geometry: {
         type: 'Point',
-    coordinates: [113.950375, 22.534875]
-  }, bbox: [113.950375, 22.534875, 113.950375, 22.534875] }] }
-
+        coordinates: location[index]
+      },
+      bbox: [location[index][0], location[index][1], location[index][0], location[index][1]]
+    }
+  })
+  const mapData = { type: 'FeatureCollection', features: newTableRow }
+  // console.log('11==map==', mapData)
+  // const mapData = { type: 'FeatureCollection', features: [{ type: 'Feature', properties: {
+  //   h0: '3',
+  //   h1: '2',
+  //   h2: '1',
+  //   h3: '0',
+  //   h4: '0',
+  //   h5: '0',
+  //   h6: '0',
+  //   h7: '3',
+  //   h8: '4',
+  //   h9: '5',
+  //   h10: '6',
+  //   h11: '5',
+  //   h12: '6',
+  //   h13: '4',
+  //   h14: '4',
+  //   h15: '5',
+  //   h16: '4',
+  //   h17: '5',
+  //   h18: '4',
+  //   h19: '4',
+  //   h20: '5',
+  //   h21: '4',
+  //   h22: '6',
+  //   h23: '6'
+  // }, geometry: {
+  //   type: 'Point',
+  //   coordinates: [113.950375, 22.534875]
+  // }, bbox: [113.950375, 22.534875, 113.950375, 22.534875] }] }
+  // bbox 参数: 使用边界框(bbox)指定静态图像的整个视口
   chartDom.removeAllLayer()
     .then(() => {
       const pointLayer = new PointLayer({})
@@ -101,7 +229,7 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
         //     y: xAxis[1].dataeaseName
         //   }
         // })
-        .size(2)
+        .size(4)
         .color('h8', [
           '#0A3663',
           '#1558AC',