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

徐旺旺

2021-05-17 ba812327b996634e5ba0c33ccb422d9d02ebf547

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

 src/components/LayerController/logic/Company.js

@@ -1,6 +1,7 @@
/**
 * 固废
 * 企业
 */

// 区分不同类型 使用不同img
const companyImg = '/assets/images/map/company_refining.png'
const companyOil = '/assets/images/map/company_oil.png'
@@ -14,7 +15,6 @@
   * @param L leaflet对象
   */
  this.init = async (layer, L) => {
    // const SolidWasteIcon = this.SolidWasteIcon()
    this.animalService = new AnimalService({
      L: L,
      layer: layer
@@ -39,23 +39,10 @@
        className: 'company-bindTooltip',
        iconSize: 16
      })

      const marker = L.marker([positionX, positionY], {
        /* icon: L.icon({
          iconUrl: iconUrl,
          iconSize: [30, 30],
          iconAnchor: [15, 15]
        }), */
        icon: myIcon,
        test: data[i]
      })
      /* const htmls = '<ul><li>' + data[i].name + '</li></ul>'
      marker.bindTooltip(htmls, {
        permanent: true,
        offset: [0, 5],
        direction: 'bottom',
        className: 'company-bindTooltip'
      }) */
      layer.addLayer(marker)
    }
  }
@@ -63,23 +50,27 @@
  * 点位鼠标移入弹框
  * */
  this.bindTooltip = (layer) => {
  //  console.log(layer)
    //  console.log(layer)
    return '<div class="company-bindTooltip-hover"><h3>污染物产生统计</h3><ul>' +
                '<li>生产设施：30（个）</li>' +
                '<li>治理设施：30（个）</li>' +
            '</ul></div>'// layer.options.test.name
      '<li>生产设施：30（个）</li>' +
      '<li>治理设施：30（个）</li>' +
      '</ul></div>'// layer.options.test.name
  }
  /*
  * 点位点击事件
  *
  * */
  this.clickListener = (e) => {
    // this.animalService.pulseEffect(e.latlng)
    const dataValue = {
      StoragePlaceId: e.layer.options.test.name
    }
    debugger
    console.log(dataValue)
    // return this.PublicBounced.$el
    // console.log(e)
    window.map.setView(e.latlng, 15)
    // if (window.map.getZoom() >= 10) {
    //   window.map.removeLayer(e.layer)
    //   e.layer.remove()
    // } else if (window.map.getZoom() < 10) {
    //   window.map.addLayer(e.layer)
    // }
    // const dataValue = {
    //   StoragePlaceId: e.layer.options.test.name
    // }
  }
}

 src/components/LayerController/logic/SourcesPollution.js

@@ -14,9 +14,23 @@
      layer: layer
    })
    const result = await mapApi.getSourcesPoll()
    console.log(result)
    // console.log(result)
    const resultData = result.Result.DataInfo || []
    const polygon = L.polygon(resultData, { color: 'yellow' })
    polygon.addTo(layer)
  }
  this.bindTooltip = (layer) => {
    return 'layer'
  }
  this.click = () => {
    window.$layer.open({
      content: {
        content: 'Popup', // 组件
        data: { // 传递的参数
          datas: 'popupDatas'
        }
      },
      title: ''
    })
  }
}

 src/components/panel/topicSearch/DischargeSearch.vue

@@ -170,7 +170,7 @@
  methods: {
    flyto () {
      const pos = [39.90751504898071, 116.38927817344666]
      window.map.flyTo(pos, 15)
      window.map.setView(pos, 15)
    },
    // 区域筛选
    areaType (val) {

 src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue

@@ -43,8 +43,8 @@
            <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
                 :class="activeNum===index?'hover':''" @click="handleLocation(item,index)">
                <img class="state" :src="getImgSrc(item.properties.type)" style="background: none"/>
                <h3>资源类型:{{item.properties.adminzonename}}</h3>
                <h5>资源名称:{{item.properties.type}}</h5>
                <h3>资源类型:{{item.properties.type}}</h3>
                <h5>资源名称:{{item.properties.companyname}}</h5>
                <p>负责人:<span>{{item.properties.resperson}}</span></p>
                <p>电话:<span>{{item.properties.telephone}}</span></p>
            </div>
@@ -125,6 +125,7 @@
        this.wfsHelper.addLike('name', this.form.keyword)
      }
      const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
      console.log(res)
      if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
        this.list = res.features
      }

 src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue

@@ -526,12 +526,10 @@

      this.bgPoint = res.data[0].startControlPoint

      const point = JSON.parse(this.bgPoint.geomText)

      const p = [point.coordinates[1], point.coordinates[0]]

      // const point = JSON.parse(this.bgPoint.geomText)
      // const p = [point.coordinates[1], point.coordinates[0]]
      // this.bgMarker = this.createFlowMarker(p)
      this.bgMarker = pulseEffect(p)
      // this.bgMarker = pulseEffect(p)
      // this.bgMarker.bindTooltip(this.bgPoint.pointnumbe)
      // this.bgMarker.addTo(window.map)
      // window.map.flyTo(p)
@@ -561,11 +559,11 @@
    },
    bgFmClick (e) {
      // console.log('点击影响的阀门')
      console.log(e)
      // console.log(e)
      // const point = [e.data[0][0], e.data[0][1]]
      const point = [e.startControlPoint.y, e.startControlPoint.x]
      // const marker = this.createFlowMarker(point)
      pulseEffect(point)
      // const marker = this.createFlowMarker(point)
      // marker.addTo(window.map)
      // window.map.flyTo(point, 17)
    },

 src/conf/MapConfig.js

@@ -23,7 +23,6 @@
  crs: L.CRS.EPSG4326,
  minZoom: 3,
  maxZoom: 21,
  // center: [26, 104],
  center: [34.828558921813965, 117.41676807403564],
  zoom: 5,
  // center: [39.907214641571045, 116.39019012451172],