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

wangqi

2021-03-31 e0eb378045eb18117fcf0a1eac6dad57ce6f743b

 src/conf/MapConfig.js

@@ -7,6 +7,8 @@
import { LayerPipeLine } from './layers/LayerPipeLine'
import { LayerArea } from './layers/LayerArea'
import { LayerPk } from './layers/LayerPk'
import { LayerFsss } from './layers/LayerFsss'
import { LayerHbss } from './layers/LayerHbss'

const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -28,8 +30,8 @@
  minZoom: 3,
  maxZoom: 18,
  // center: [26, 104],
  // center: [38.828558921813965, 117.41676807403564],
  center: [29.769515991210938, 107.03567504882812],
  center: [38.828558921813965, 117.41676807403564],
  // center: [29.454345703125, 113.40362548828125],
  zoom: 14,
  worldCopyJump: true,
  inertia: true,
@@ -46,7 +48,7 @@
  IntranetBaseMaps: TDT.intranet,
  InternetBaseMaps: TDT.internet,
  Layers: {
    LayerSewersLine: [LayerPipeLine, LayerArea, LayerPk, LayerWasteWater, LayerWasteGas, LayerSolidWaste],
    LayerSewersLine: [LayerPipeLine, LayerFsss, LayerHbss, LayerArea, LayerPk, LayerWasteWater, LayerWasteGas, LayerSolidWaste],
    layerSewersPoint: LayerSewersPoint
  } // 污雨水图层配置
}