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

zhangshuaibao

2021-03-31 65113eae10994702a740a79e7461539d7bcbba08

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


 Conflicts:

	src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue

	src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue

	src/components/BaseNav/PublicBounced/PublicBounced.vue

 src/api/request.js

@@ -9,7 +9,7 @@
  })
}
export const FlueGas = (data = {}) => {
  return $http.post('/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
  return $http.post('http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
    headers: {
      'Content-Type': 'application/json'
    }

 src/assets/images/map-pages/icon/toolbox/cross.png

 src/assets/images/map-pages/icon/toolbox/fullscreen.png

 src/assets/images/map-pages/icon/toolbox/vertical.png

 src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue

@@ -10,6 +10,7 @@
<script>
export default {
  name: 'EchartsTab',
  props: ['displayContent'],
  data () {
    return {}
  }

 src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue

@@ -46,6 +46,7 @@
  .main-matter{
    font-size: 13px;
    font-weight: normal;
    padding: 10px 6px;
    border: 1px solid #396d83;
    .row-item-one{
      margin-bottom: 7px;

 src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue

@@ -28,10 +28,9 @@
  background-color: rgba(33, 41, 69,0.9);
}
.main {
  width: 100%;
  height: 100%;
  border: 1px solid #396d83;
  padding: 6px;
  .main-video {
    //border: 1px solid #396d83;
    width: 100%;
    height: 100%;
    video {

 src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue

@@ -1,20 +1,26 @@
<template>
  <div class="public-table">
    <el-col class="el-col">
      <el-table
          border
          tooltip-effect="dark"
          :data="data"
      >
        <el-table-column prop="name" label="序号"></el-table-column>
        <el-table-column prop="name" label="类别"></el-table-column>
        <el-table-column prop="date" label="固废名称"></el-table-column>
        <el-table-column prop="address" label="代码"></el-table-column>
        <el-table-column prop="address" label="产生量"></el-table-column>
        <el-table-column prop="name" label="储存量"></el-table-column>
        <el-table-column prop="date" label="产生装置"></el-table-column>
      </el-table>
    </el-col>
  <div class="win">
    <!-- 四个角的边框效果 -->
    <div class="border_corner border_corner_left_top"></div>
    <div class="border_corner border_corner_right_top"></div>
    <div class="border_corner border_corner_left_bottom"></div>
    <div class="border_corner border_corner_right_bottom"></div>
    <div class="main">
      <div class="main-video">
        <el-table
            tooltip-effect="dark"
            :data="data"
        >
          <el-table-column prop="name" label="序号"></el-table-column>
          <el-table-column prop="name" label="类别"></el-table-column>
          <el-table-column prop="date" label="固废名称"></el-table-column>
          <el-table-column prop="address" label="代码"></el-table-column>
          <el-table-column prop="address" label="产生量"></el-table-column>
          <el-table-column prop="name" label="储存量"></el-table-column>
          <el-table-column prop="date" label="产生装置"></el-table-column>
        </el-table>
      </div>
    </div>
  </div>
</template>

@@ -24,7 +30,15 @@
  props: ['requestSolidWasteData'],
  data () {
    return {
      data: []
      data: [{
        date: '2016-05-03',
        name: '王小虎',
        address: '上海市普陀区'
      }, {
        date: '2016-05-02',
        name: '王小虎',
        address: '上海市普陀区'
      }]
    }
  },
  mounted () {
@@ -42,7 +56,63 @@
</script>

<style lang="less" scoped>
.public-table {
.win {
  position: relative;
  background-color: rgba(33, 41, 69, 0.9);
}

.main {
  width: 100%;
  height: 100%;
  //padding: 10px 6px;
  //border: 1px solid #396d83;
  .main-video {
    //border: 1px solid #396d83;
    width: 100%;
    min-height: 165px;

    video {
      width: 100%;
      height: 100%;
      outline: none;
    }
  }
}

.border_corner {
  z-index: 999;
  position: absolute;
  width: 14px;
  height: 14px;
  background: rgba(0, 0, 0, 0);
  border: 1.5px solid #47d5ea;
}

.border_corner_left_top {
  top: 0;
  left: 0;
  border-right: none;
  border-bottom: none;
}

.border_corner_right_top {
  top: 0;
  right: 0;
  border-left: none;
  border-bottom: none;
}

.border_corner_left_bottom {
  bottom: 0;
  left: 0;
  border-right: none;
  border-top: none;
}

.border_corner_right_bottom {
  bottom: 0;
  right: 0;
  border-left: none;
  border-top: none;
}
</style>

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,5 +1,5 @@
<template>
  <div class="public-bounced" v-if="flag">
  <div class="public-bounced" v-draw v-if="flag">
    <div class="public-bounced-title">
      <span>{{ displayContent.Name }}</span>
      <i class="el-icon-circle-close" @click="closePopup"></i>
@@ -7,11 +7,11 @@
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <GasTab :displayContent="displayContent"></GasTab>
<!--        <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
<!--        <GasECharts></GasECharts>-->
        <GasTabs></GasTabs>
        <!--        <PublicTable></PublicTable>-->
<!--                <GasECharts></GasECharts>-->
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
          <GasECharts v-else></GasECharts>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <GasVideo></GasVideo>
@@ -24,8 +24,8 @@

import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
// import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
import GasTabs from './GasComponents/GasTabs'

@@ -34,6 +34,8 @@
  components: {
    GasTabs,
    GasTab,
    PublicTable,
    GasECharts,
    // PublicTable,
    // GasECharts,
    GasVideo

 src/components/LayerController/logic/Company.js

@@ -19,9 +19,10 @@
      layer: layer
    })
    const res = await mapApi.getCompany()
    console.log(res)
    // console.log(res)
    const data = res.Result.DataInfo || {}
    for (let i = 0; i < data.length; i++) {
      // console.log(data[i])
      // 经纬度 位置
      const positionX = data[i].Latitude
      const positionY = data[i].Longitude
@@ -32,7 +33,14 @@
          iconUrl: iconUrl,
          iconSize: [50, 50],
          iconAnchor: [25, 25]
        })
        }),
        test: data[i]
      })
      marker.bindTooltip(data[i].name, {
        permanent: true,
        offset: [0, -16],
        direction: 'top',
        className: ''
      })

      layer.addLayer(marker)
@@ -40,20 +48,13 @@
  }

  this.bindTooltip = (layer) => {
    console.log(layer)
    return '企业'
    // console.log(layer)
    // return layer.options.test.name
  }

  this.clickListener = (layer) => {
    /* this.animalService.pulseEffect(e.latlng)
  this.clickListener = (e) => {
    // this.animalService.pulseEffect(e.latlng)
    console.log(e)
    return this.PublicBounced.$el
    */
    console.log(layer)
    // return this.PublicBounced.$el
  }

  // 固废点击进行的 内容的设置
  // SetSolidWasteContent (config, containerPopup) {
  //   this.SolidWastePopup = containerPopup
  // }
}

 src/components/LayerController/logic/SolidWaste.js

@@ -52,6 +52,8 @@

  this.clickListener = async (e) => {
    this.animalService.pulseEffect(e.latlng)
    // this.setPanTo(e.latlng, 200)
    console.log(e)
    const dataValue = {
      StoragePlaceId: e.layer.options.test.StoragePlaceId
    }
@@ -59,11 +61,20 @@
    // console.log(result)
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setData(result, 'gufei')
    instance.$mount()
    document.body.appendChild(instance.$el)
    instance.setData(result, 'gufei')
  }

  // panTo
  // this.setPanTo = (pos, value) => {
  //   var position = pos
  //   position = this.map.latLngToLayerPoint(position)
  //   position.y += value
  //   position = this.map.layerPointToLatLng(position)
  //   this.map.flyTo(position)
  // }

  // 不同类型图片封装
  this.differentTypes = (judgeValue) => {
    var effectOfChange

 src/components/LayerController/logic/WasteGas.js

@@ -11,6 +11,7 @@
const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'

const mapApi = require('../../../api/mapApi').default
const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
module.exports = function () {
  /**
   * 返回marker对象数组
@@ -43,14 +44,23 @@

  this.bindTooltip = (layer) => {
    console.log(layer)
    return '测试废气'
    return '废气点'
  }

  this.clickListener = (e) => {
    console.log(e)
  this.clickListener = async (e) => {
    // console.log(e)
    this.animalService.pulseEffect(e.latlng)
    const dataValue = {
      StoragePlaceId: e.layer.options.test.StoragePlaceId
    }
    const result = await mapApi.GetWasteGas(dataValue)
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setData(result)
    instance.$mount()
    document.body.appendChild(instance.$el)
  }
  // 不同类型图片封装
  // 不同类型图片加载
  this.differentTypes = (ContrLevel) => {
    var effectOfChange
    if (ContrLevel === 1) {

 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/components/panel/ToolBoxPanel.vue

@@ -1,5 +1,5 @@
<template>
  <div class="left-top-toolbox-panel">
  <div class="left-top-toolbox-panel" v-if="toolBoxPanelVisible">
    <div class="specific-tools">
      <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"
                 @mouseover.enter.native="changeSelectMouse">
@@ -9,17 +9,19 @@
      <transition name="animationChange">
        <el-row v-show="selectGroup" class="specific-tools-group">
          <el-popover
              trigger="manual"
              placement="bottom"
              trigger="click"
              :popper-class="'tools-panel-content'"
              v-for="(item,index) in menuList" :key="index"
              :width="item.index === '2'?230 : 150"
              v-model="isShow[index]"
          >
            <el-button slot="reference" class="el-button" :class="active === index && checked? 'tools-panel-choose':''"
                       @click="changeChoose(index)">
              <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
            <el-button slot="reference" class="el-button"
                       :class="active === index? 'tools-panel-choose':''"
                       @click.native="changeChoose(index)">
              <img :src="item.iconSelecd" alt="" v-if="active === index"/>
              <img :src="item.icon" alt="" v-else/>
              <span v-if="active === index && checked">{{ item.label }}</span>
              <span v-if="active === index">{{ item.label }}</span>
              <span v-else class="default-span">{{ item.label }}</span>
            </el-button>
            <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
@@ -28,7 +30,7 @@
              <img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
            </el-button>
            <div class="base-map-inner-panel" v-show="item.index==='2'">
              <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
              <div v-for="item in basemapHelper.basemapList" :key="item.code" class="basemap-layer-item">
                <img class="base-map-img" width="50" height="50" :src="item.conf.icon_actived" :title="item.name"
                     @click="changeBasemap(item)" alt=""/>
                <el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
@@ -83,6 +85,11 @@
import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
import mm from '@assets/images/map-pages/icon/toolbox/M2.png'

// 下载
import FullScreen from '@assets/images/map-pages/icon/toolbox/fullscreen.png'
import cross from '@assets/images/map-pages/icon/toolbox/cross.png'
import vertical from '@assets/images/map-pages/icon/toolbox/vertical.png'

// 测量的方法
import Measure from '@/components/plugin/MeaSure'

@@ -90,10 +97,11 @@
  name: 'ToolBoxPanel',
  data () {
    return {
      isShow: false,
      isShow: [],
      currentBaseMapCode: 'tianditu_img',
      basemapList: [],
      selectGroup: false,
      toolBoxPanelVisible: false,
      drawLayer: null,
      drawLayerArray: [],
      map: null,
@@ -230,19 +238,19 @@
            {
              index: '4-1',
              label: '全屏',
              icon: '',
              icon: FullScreen,
              title: '全屏'
            },
            {
              index: '4-2',
              label: 'A4横向',
              icon: '',
              icon: cross,
              title: 'A4横向'
            },
            {
              index: '4-3',
              label: 'A4纵向',
              icon: '',
              icon: vertical,
              title: 'A4纵向'
            }
          ]
@@ -255,24 +263,16 @@
      return this.$store.state.map.basemapHelper
    }
  },
  watch: {
    basemapHelper (newVal) {
      if (newVal != null) {
        this.updateBasemapList()
      }
    }
  },
  methods: {
    updateBasemapList () {
      this.basemapList = this.basemapHelper.getBasemapList()
      console.log()
    init (map) {
      this.map = map
      this.toolBoxPanelVisible = true
    },
    changeBasemap (itm) {
      this.active = -1
      const code = itm.code
      this.basemapList.forEach((item) => {
      this.basemapHelper.basemapList.forEach((item) => {
        if (item.code === code) {
          console.log(this.currentBaseMapCode)
          if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) {
            this.currentBaseMapCode = code
            this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true)
@@ -280,7 +280,7 @@
            this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
          }

          this.basemapHelper.getBasemapList().forEach((item) => {
          this.basemapHelper.basemapList.forEach((item) => {
            item.layer.bringToBack()
          })
        }
@@ -291,17 +291,25 @@
        this.drawLayer = this.L.layerGroup().addTo(this.map)
      }
      this.active = index
      if (this.checkbutton === index) {
        this.checked = !this.checked
        this.Selecd = -1
      } else {
        if (this.checkbutton === -1) {
          this.checked = !this.checked
        } else {
          this.checked = true
        }
      // this.isShow[index] = !this.isShow[index]
      // this.isShow[index - 1] = !this.isShow[index - 1]
      // if (this.checkbutton === index) {
      //   this.checked = !this.checked
      //   this.Selecd = -1
      // } else {
      //   if (this.checkbutton === -1) {
      //     this.checked = !this.checked
      //   } else {
      //     this.checked = true
      //   }
      // }
      // this.checkbutton = index
      // console.log(this.isShow[index - 1])
      console.log(this.basemapList)
      for (let i = 0; i < this.isShow.length; i++) {
        this.isShow[i] = false
      }
      this.checkbutton = index
      this.isShow[index] = true
    },
    choiceItem (itemT, indexT) {
      this.Selecd = indexT
@@ -407,6 +415,7 @@
    },
    changeSelectMouse () {
      this.selectGroup = true
      this.isShow = []
    }
  }
}

 src/conf/Constants.js

@@ -5,13 +5,10 @@
}

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

export const props = {

 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=管网',
      url: 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
    }
  ]

 src/views/MapTemplate.vue

@@ -39,7 +39,7 @@
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
// 底图业务js逻辑
import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'

import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
// // 公共展示数据
@@ -68,7 +68,8 @@
      lcServiceLayerVisible: false,
      basemapHelper: {},
      serviceLayerHelper: {},
      vectorLayerHelper: {}
      vectorLayerHelper: {},
      toolBoxVisible: false
    }
  },
  computed: {
@@ -82,18 +83,6 @@
    })
  },
  methods: {
    ChangeState () {
      const data = {
        companyId: 3900100145,
        userCode: 'wenchun.deng',
        name: '',
        marginWarr: '',
        longDayWarr: ''
      }
      const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
      AddSolidWaste.requestData(data)
      AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
    },
    AddGasHelper () {
      const data = {
        companyId: 3900100145,
@@ -144,7 +133,6 @@
    init () {
      const mapcontainer = this.$refs.rootmap
      this.map = Sgis.initMap(mapcontainer)
      this.$refs.toolBox.map = this.map

      window.popupComp = this.$refs.popup
      var layerFactory = new LayerFactory({
@@ -164,10 +152,10 @@
      this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 初始化动态要素图层助手
      this.vectorLayerHelper.initVectorLayers(this.config)

      this.ChangeState()
      // this.ChangeState()
      // this.AddGasHelper()
      // this.ChangeWaterState()

      this.$refs.toolBox.init(this.map)
      this.saveMapStatus()
      // this.setMapObj(this.mapObj)
      // this.setBasemapHelper(this.basemapHelper)