Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

chenzeping

2021-03-31 dd74fe40bc849d2826a985abfee272b81ceef68b

Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

 src/components/LayerController/modules/LcServiceLayer.vue

@@ -6,8 +6,7 @@
        <div class="wms-panel">
            <div v-for="item in serviceLayers" :key="item.code" class="layerbox">
                <div><input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
                            @change="swAllLayers(item)"/>{{ item.name }} <span @click="swFilter(item)" v-if="item.childLayer"
                                                                               class="btn-filter">过滤</span>
                            @change="swAllLayers(item)"/>{{ item.name }}
                </div>
                <div class="layerbox-item">
                    <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code"><input type="checkbox"
@@ -66,9 +65,9 @@
    swWmsLayer (itm) {
      itm.checked = !itm.checked
      if (itm.checked) {
        window.layerFactory.show(itm.code)
        window.layerFactory.show(itm)
      } else {
        window.layerFactory.hide(itm.code)
        window.layerFactory.hide(itm)
      }
      // this.updateWms()
    },

 src/components/LayerController/service/LayerFactory.js

@@ -18,44 +18,55 @@
      var layers = config.layers
      for (var j = 0; j < layers.length; j++) {
        var childConfig = layers[j]
        var code = childConfig.code
        var wfs = childConfig.wfs
        var wms = childConfig.wms
        var url = childConfig.url
        // 判断是否已经加载过，加载过就 直接得到对象调用 显示函数
        var layer = this.layers[code]
        if (!layer) {
          layer = this.L.featureGroup({}).addTo(this.map)
          // 2. 判断类型
          if (wfs) {
            // 3. 实例化具体service
            var wfsLayerService = new WfsLayerService(childConfig)
            wfsLayerService.init(layer)
          }
          if (wms) {
            var wmsLayerService = new WmsLayerService(childConfig)
            wmsLayerService.init(layer)
          }
          // 请求业务数据接口
          if (url) {
            var busiLayerService = new BusiLayerService(childConfig)
            busiLayerService.init(layer)
          }
          layer ? (this.layers[code] = layer) : console.log('LayerFactory：newLayer is null，please check !!!')
        } else {
          this.show(code)
        }
        var checked = childConfig.checked
        checked && this.load(childConfig)
      }
    }
  }

  show (code) {
    var _layer = this.layers[code].addTo(this.map)
    this.setZIndex(_layer)
  load (config) {
    var code = config.code
    var wfs = config.wfs
    var wms = config.wms
    var url = config.url
    // 判断是否已经加载过，加载过就 直接得到对象调用 显示函数
    var layer = this.layers[code]
    if (!layer) {
      layer = this.L.featureGroup({}).addTo(this.map)
      // 2. 判断类型
      if (wfs) {
        // 3. 实例化具体service
        var wfsLayerService = new WfsLayerService(config)
        wfsLayerService.init(layer)
        this.setZIndex(layer)
      }
      if (wms) {
        var wmsLayerService = new WmsLayerService(config)
        wmsLayerService.init(layer)
      }
      // 请求业务数据接口
      if (url) {
        var busiLayerService = new BusiLayerService(config)
        busiLayerService.init(layer)
      }
      layer ? (this.layers[code] = layer) : console.log('LayerFactory：newLayer is null，please check !!!')
    } else {
      this.show(code)
    }
  }

  hide (code) {
    var layer = this.layers[code]
  show (config) {
    var layer = this.layers[config.code]
    if (layer) {
      layer.addTo(this.map)
      this.setZIndex(layer)
    } else {
      this.load(config)
    }
  }

  hide (config) {
    var layer = this.layers[config.code]
    layer && this.map.removeLayer(layer)
  }


 src/conf/Constants.js

@@ -5,9 +5,6 @@
}

export const logicMapper = {
  // fsqy: 'Sample.js',
  fspfk: 'Sample.js',
  fsjcd: 'Sample.js',
  wasteGasJcd: 'WasteGas.js',
  wasteWaterJcd: 'WasteWater.js',
  solidWasteJcd: 'SolidWaste.js',

 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
@@ -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
  } // 污雨水图层配置
}

 src/conf/layers/LayerArea.js

@@ -1,6 +1,8 @@
/**
 * 区域
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
export const LayerArea = {
  code: 'sewersArea',
  name: '区域信息',
@@ -11,7 +13,7 @@
      name: '公司',
      sname: '公司', // 表名
      checked: true, // 默认选中状态
      url: '?TYPENAME=管网',
      wfs: WFS_URL + '?TYPENAME=公司',
      minZoom: 10, // 在指定级别显示
      childLayer: 'fsss,hbss' // 关联PointLayers
    },
@@ -20,7 +22,7 @@
      name: '码头',
      sname: '码头',
      checked: true, // 默认选中状态
      wfs: '?TYPENAME=含油污水',
      wfs: WFS_URL + '?TYPENAME=码头',
      minZoom: 10,
      childLayer: 'fsss,hbss' // 关联PointLayers
    },
@@ -29,7 +31,7 @@
      name: '装置区',
      sname: '装置区',
      checked: true, // 默认选中状态
      wfs: '?TYPENAME=含盐污水',
      wfs: WFS_URL + '?TYPENAME=装置区',
      minZoom: 10
    }
  ]

 src/conf/layers/LayerHbss.js

@@ -3,77 +3,68 @@
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
export const LayerFsss = {
  code: 'sewersFsss',
export const LayerHbss = {
  code: 'sewersHbss',
  name: '环保设施',
  checked: false, // 默认选中状态
  layers: [
    {
      code: 'fourlink',
      name: '四通',
      sname: '四通',
      code: 'yj',
      name: '窨井',
      sname: '窨井',
      checked: true,
      minZoom: 10,
      wfs: WFS_URL + '?TYPENAME=四通',
      wfs: WFS_URL + '?TYPENAME=窨井',
      icon: 'sewers/四通.png'
    },
    {
      code: 'tee',
      name: '三通',
      sname: '三通',
      code: 'ybz',
      name: '雨篦子',
      sname: '雨篦子',
      checked: false,
      minZoom: 10,
      wfs: WFS_URL + '?TYPENAME=三通',
      wfs: WFS_URL + '?TYPENAME=雨篦子',
      icon: 'sewers/三通.png'
    },
    {
      code: 'piperack',
      name: '管架(墩)',
      sname: 'PipeRack',
      code: 'fht',
      name: '防火堤',
      sname: '防火堤',
      minZoom: 10,
      wfs: WFS_URL + '?TYPENAME=管架',
      wfs: WFS_URL + '?TYPENAME=防火堤',
      checked: false
    },
    {
      code: 'pipegallery',
      name: '管廊(带)',
      sname: 'PipeGallery',
      code: 'jsc',
      name: '集水池',
      sname: '集水池',
      minZoom: 10,
      wfs: WFS_URL + '?TYPENAME=管廊',
      wfs: WFS_URL + '?TYPENAME=集水池',
      checked: false
    },
    {
      code: 'pipesegment',
      name: '流向',
      sname: 'ywslx',
      wfs: WFS_URL + '?TYPENAME=流向',
      code: 'jlz',
      name: '截流闸',
      sname: '截流闸',
      wfs: WFS_URL + '?TYPENAME=截流闸',
      checked: false
    },
    {
      code: 'pipeline',
      name: '管网',
      code: 'yly',
      name: '溢流堰',
      sname: '溢流堰',
      minZoom: 10,
      sname: 'pipeline',
      wfs: WFS_URL + '?TYPENAME=管网',
      wfs: WFS_URL + '?TYPENAME=溢流堰',
      checked: false
    },
    {
      code: 'valve',
      name: '阀门',
      code: 'gyd',
      name: '隔油池',
      sname: '隔油池',
      minZoom: 10,
      sname: 'valve',
      checked: false,
      wfs: WFS_URL + '?TYPENAME=阀门',
      wfs: WFS_URL + '?TYPENAME=隔油池',
      icon: 'sewers/阀门.png'
    },
    {
      code: 'elbow',
      name: '弯头',
      sname: 'Elbow',
      minZoom: 10,
      checked: false,
      wfs: WFS_URL + '?TYPENAME=弯头',
      icon: 'sewers/弯头.png'
    }
  ]
}

 src/conf/layers/LayerPk.js

@@ -1,6 +1,8 @@
/**
 * 排口
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
export const LayerPk = {
  code: 'sewersPk',
  name: '排口',
@@ -11,7 +13,7 @@
      name: '内排口',
      sname: '内排口',
      checked: true,
      wfs: '?TYPENAME=管网',
      wfs: WFS_URL + '?TYPENAME=内排口',
      minZoom: 10 // 在指定级别显示
    },
    {
@@ -19,7 +21,7 @@
      name: '外排口',
      sname: '外排口',
      checked: true, // 默认选中状态
      wfs: '?TYPENAME=事故水',
      wfs: WFS_URL + '?TYPENAME=外排口',
      minZoom: 10
    }
  ]