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

chenyabin

2021-04-07 cd80929f0ae8882a98cfe3936b2a96bded1c12d8

 src/conf/MapConfig.js

@@ -3,6 +3,7 @@
import { LayerSewersPoint } from './layers/LayerSewers'
import { LayerTopic } from './LayerTopic'
import { LayerPipeLine } from './LayerPipeLine'
import { LayerBasin } from './layers/LayerBasin'

const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -26,7 +27,7 @@
  // center: [26, 104],
  center: [38.828558921813965, 117.41676807403564],
  // center: [29.454345703125, 113.40362548828125],
  zoom: 14,
  zoom: 5,
  worldCopyJump: true,
  inertia: true,
  zoomControl: false,
@@ -42,7 +43,7 @@
  IntranetBaseMaps: TDT.intranet,
  InternetBaseMaps: TDT.internet,
  Layers: {
    LayerSewersLine: [LayerPipeLine, LayerTopic],
    LayerSewersLine: [LayerBasin, LayerTopic, LayerPipeLine],
    layerSewersPoint: LayerSewersPoint
  } // 污雨水图层配置
}