Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-04-12 de01693a063433610388fab33cd4927f2f663e60

 src/conf/MapConfig.js

@@ -1,6 +1,5 @@
import * as L from 'leaflet'
import TDT from './TDT'
import { LayerSewersPoint } from './layers/LayerSewers'
import { LayerTopic } from './LayerTopic'
import { LayerBasin } from './layers/LayerBasin'

@@ -42,15 +41,10 @@
  IntranetBaseMaps: TDT.intranet,
  InternetBaseMaps: TDT.internet,
  Layers: {
    LayerSewersLine: [LayerBasin, LayerTopic],
    layerSewersPoint: LayerSewersPoint
    LayerSewersLine: [LayerBasin, LayerTopic]
  } // 污雨水图层配置
}

const mapTokenArray = ['5d76218063082952d18b76da5005f490',
  'f1b72b5e7cb1175acddfa485f1bc9770',
  'ac8bbce8119b337d75d4b06696f6186d',
  '9bf834ce1ba3ba01c568147e9bfcab7c']
/**
 * 内网GIS，获取token参数
 */
@@ -86,7 +80,7 @@
  mapOptions,
  mapConfig,
  TokenConfig,
  BLUEMAP_HOST,
  mapTokenArray
  BLUEMAP_HOST
  // mapTokenArray
  // MagicMaker
}