问题修改

陈泽平

2021-05-18 be771111fb2a9770a9fbf13c5d7e976bf8688b6d

问题修改

 public/assets/images/map/sewers/º¬ÓÍÎÛË®.png

 public/assets/images/map/sewers/Éú²úÎÛË®.png

 src/components/LayerController/logic/Sample.js

File was deleted

 src/components/LayerController/logic/WasteGas.js

@@ -37,12 +37,6 @@
      // å®šä¹‰ç±»åž‹ ç”¨æ¥åŒºåˆ†æ•°æ®
      const ContrLevel = data[i].ContrLevel
      var iconUrl = this.differentTypes(ContrLevel)
      // const marker = L.canvasMarker([positionX, positionY], {
      //   img: {
      //     // url: 'assets/images/map/marker-icon.png',
      //     url: iconUrl,
      //     size: STYLES.ICON_SIZE
      //   }
      const marker = L.marker([positionX, positionY], {
        test: data[i],
        icon: L.icon({
@@ -68,7 +62,7 @@
    const res = e.layer.options.test
    window.$layer.open({
      content: {
        content: WasteGasIndex, // ç»„件
        comp: WasteGasIndex, // ç»„件
        parent: this, // çˆ¶ç»„件
        data: { // ä¼ é€’的参数
          storagePlaceId: res

 src/components/LayerController/logic/WasteSolid.js

@@ -1,7 +1,7 @@
/**
 * å›ºåºŸ
 */
const WasteSolidIndex = require('@components/BaseNav/WasteSolid/WasteSolidIndex').default
const WasteSolidIndex = require('../../../components/BaseNav/WasteSolid/WasteSolidIndex').default
// åŒºåˆ†ä¸åŒç±»åž‹ ä½¿ç”¨ä¸åŒimg
const defaultImg = '/assets/images/map/solidwaste/voc.png'
const setting = '/assets/images/map/solidwaste/gf_green2.png'
@@ -60,7 +60,7 @@
    const title = e.layer.options.totransferData.Name
    window.$layer.open({
      content: {
        content: WasteSolidIndex, // ç»„件
        comp: WasteSolidIndex, // ç»„件
        parent: this, // çˆ¶ç»„件
        data: { // ä¼ é€’的参数
          storagePlaceId: e.layer.options.totransferData.StoragePlaceId

 src/components/LayerController/logic/WasteWater.js

@@ -61,7 +61,7 @@
    const res = e.layer.options.totransferData
    window.$layer.open({
      content: {
        content: WasteWaterIndex, // ç»„件
        comp: WasteWaterIndex, // ç»„件
        parent: this, // çˆ¶ç»„件
        data: { // ä¼ é€’的参数
          // info: this.info

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

@@ -59,6 +59,8 @@
import { LayerEmergencySource } from '../../../../conf/layers/LayerEmergencySource'
import { LayerSurroundings } from '../../../../conf/layers/LayerSurroundings'
import { pulseEffect } from '../../../../utils/utils'
import { openPopup } from '../../../helpers/LocateHelper'
// import { fitBounds, highlight, openPopup } from '../../helpers/LocateHelper'

export default {
  name: 'ResourcesQuery',
@@ -128,16 +130,19 @@
        this.wfsHelper.addLike('name', this.form.keyword)
      }
      const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
      console.log(res)
      // console.log(res)
      if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
        this.list = res.features
      }
    },
    // æŸ¥è¯¢å®šä½åŠŸèƒ½
    handleLocation (val, index) {
      // console.log(val)
      this.activeNum = index
      window.map.setView([val.properties.y, val.properties.x], 16)
      pulseEffect([val.properties.y, val.properties.x])
      const positionArea = [val.properties.y, val.properties.x]
      window.map.setView(positionArea, 16)
      pulseEffect(positionArea)
      openPopup(positionArea, val.id)
    }
  }
}

 src/components/panel/topicSearch/GasWasteSearch.vue

@@ -169,7 +169,7 @@
      window.map.setView(pos, 15)
      window.$layer.open({
        content: {
          content: WasteWaterIndex, // ç»„件
          comp: WasteWaterIndex, // ç»„件
          parent: this, // çˆ¶ç»„件
          data: { // ä¼ é€’的参数
            storagePlaceId: val

 src/components/panel/topicSearch/SolidWasteSearch.vue

@@ -3,16 +3,25 @@
        <div class="panel-title">{{ title }}</div>
        <div class="search-panel ">
            <el-form ref="form" :model="form" label-width="90px" class="search-form">
                <el-form-item v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'：'"
                              size="mini"
                              class="search-panel-item">
                <el-form-item label="设施类型：" size="mini" class="search-panel-item">
                    <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
                               :popper-class="'select-down'">
                        <el-option
                                v-for="item in solidWasteTypeOptions.labelList"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                                v-for="item in items"
                                :key="item.code"
                                :label="item.name"
                                :value="item.name">
                        </el-option>
                    </el-select>
                </el-form-item>
                <el-form-item :label="form.pipelineType+'：'" size="mini">
                    <el-select style="width: 100%" v-model="form.dataType" value-key="code"
                               :popper-class="'select-down'" @change="handleDataType">
                        <el-option
                                v-for="item in subItems"
                                :key="item.code"
                                :label="item.name"
                                :value="item">
                        </el-option>
                    </el-select>
                </el-form-item>
@@ -28,8 +37,8 @@
            </el-form>
        </div>
        <el-scrollbar style="height:286.22px">
            <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index"
                 @click="setBounced(item)">
            <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
                 @click="setBounced(item, index)">
                <img src="../../../../public/assets/images/map/solidwaste/gf_green2.png" alt="" class="state">
                <div>
                    <h3>###炼化部</h3>
@@ -46,6 +55,7 @@
import mapApi from '@/api/mapApi'
import WasteSolidIndex from '@/components/BaseNav/WasteSolid/WasteSolidIndex'
import { pulseEffect, setPanTo } from '../../../utils/utils'
import { LayerWasteSolid } from '../../../conf/layers/LayerWasteSolid'

export default {
  name: 'SolidWasteSearch',
@@ -54,7 +64,9 @@
    return {
      judgeVisible: true,
      form: {
        keyword: '固废面板数据查询',
        pipelineType: '固废',
        dataType: '',
        keyword: '',
        // æ•°æ®çš„传递
        transferData: 1
      },
@@ -73,97 +85,42 @@
        }
      ],
      // æ•°æ®æœç´¢ä¹‹åŽï¼Œå­˜å‚¨æ•°æ®çš„
      searchDataDisplay: [],
      solidWasteTypeOptions: [{
        value: '1',
        label: '区域',
        options: [{
          value: '1',
          layerName: '固废',
          key: 'pipename',
          label: '全部固废'
        }],
        labelList: [{
          label: '输送介质',
          key: 'mediumtype'
        }, {
          label: '长度(m)',
          key: 'length'
        }]
      }, {
        value: '2',
        label: '企业名称',
        options: [{
          value: '1',
          layerName: '固废',
          key: 'pipename',
          label: '全部固废'
        }],
        labelList: [{
          label: '输送介质',
          key: 'mediumtype'
        }, {
          label: '长度(m)',
          key: 'length'
        }]
      }, {
        value: '3',
        label: '二级单位',
        options: [{
          value: '1',
          layerName: '固废',
          key: 'pipename',
          label: '全部固废'
        }],
        labelList: [{
          label: '输送介质',
          key: 'mediumtype'
        }, {
          label: '长度(m)',
          key: 'length'
        }]
      }, {
        value: '4',
        label: '企业名称',
        options: [{
          value: '1',
          layerName: '固废',
          key: 'pipename',
          label: '全部固废'
        }],
        labelList: [{
          label: '输送介质',
          key: 'mediumtype'
        }, {
          label: '长度(m)',
          key: 'length'
        }]
      }]
      items: [LayerWasteSolid],
      subItems: LayerWasteSolid.layers,
      list: []
    }
  },
  methods: {
    // select的option的数据选择
    handlePipelineType (val) {
      this.solidWasteTypeOptions.forEach(item => {
        if (val === item.value) {
          this.handleSearch(item.value)
      this.list = []
      for (let i = 0; i < this.items.length; i++) {
        const item = this.items[i]
        if (val === item.name) {
          this.subItems = item.layers
          return
        }
      })
      }
    },
    handleDataType () {
      this.list = []
    },
    // ç‚¹å‡»æœç´¢å®žçŽ°æ•°æ®çš„搜索展示
    async handleSearch (data) {
      // console.log(this.form.keyword)
      const result = await mapApi.getSolidWaste(data)
      this.searchDataDisplay = result.Result.DataInfo
      this.list = result.Result.DataInfo
    },
    // æ•°æ®å±•ç¤º,点击进行弹框及点的展示
    setBounced (val) {
      console.log(val)
    setBounced (val, index) {
      const pos = [val.Latitude, val.Longitude]
      window.map.setView(pos, 15)
      this.activeNum = index
      pulseEffect([val.Latitude, val.Longitude])
      setPanTo(pos, 200)
      window.$layer.open({
        content: {
          content: WasteSolidIndex, // ç»„件
          comp: WasteSolidIndex, // ç»„件
          parent: this, // çˆ¶ç»„件
          data: { // ä¼ é€’的参数
            storagePlaceId: val.StoragePlaceId
@@ -171,8 +128,6 @@
        },
        title: val.Name
      })
      pulseEffect([val.Latitude, val.Longitude])
      setPanTo(pos, 200)
    }
  }
}

 src/components/panel/topicSearch/WaterWasteSearch.vue

@@ -192,7 +192,7 @@
      window.map.setView(pos, 15)
      window.$layer.open({
        content: {
          content: WasteWaterIndex, // ç»„件
          comp: WasteWaterIndex, // ç»„件
          parent: this, // çˆ¶ç»„件
          data: { // ä¼ é€’的参数
            storagePlaceId: val