派生自 wuyushui/SewerAndRainNetwork

陈泽平
2021-05-18 a4a4db4d04174541e4b44b83583be515f77b10b4
应急问题修改
2个文件已删除
5个文件已修改
62 ■■■■ 已修改文件
public/assets/images/map/sewers/公司.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/溢流堰.png 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/SewersSearch.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/conf/layers/LayerArea.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/conf/layers/LayerHbss.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/¹«Ë¾.png
Binary files differ
public/assets/images/map/sewers/ÒçÁ÷Ñß.png
Binary files differ
src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
@@ -81,14 +81,9 @@
</template>
<script>
// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
// import { LayerEvent } from '../../../../../conf/layers/LayerEvent'
// import { LayerResources } from '../../../../../conf/layers/LayerResources'
import ReportPopup from './ReportPopup'
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
// import AjaxUtils from '@utils/AjaxUtils'
export default {
  name: 'EventQuery',
@@ -128,16 +123,6 @@
    // ç‚¹å‡»äº‹ä»¶ç®¡ç†
    accordPopup () {
      console.log('item')
      window.$layer.open({
        content: {
          comp: ReportPopup, // ç»„ä»¶
          parent: this, // çˆ¶ç»„ä»¶
          data: { // ä¼ é€’的参数
            // storagePlaceId: e.layer.options.totransferData.StoragePlaceId
          }
        }
        // title: 'title' // æ ‡é¢˜
      })
    },
    // radio数据选择
    redioChange (item) {
@@ -165,26 +150,11 @@
    },
    // æ•°æ®æœç´¢äº‹ä»¶
    async handleSearch () {
      this.list = []
      this.wfsHelper.clearFilter()
      // todo çŽ°åœ¨ä¼ä¸šåº”æ€¥è¿˜æ²¡åŒºåˆ†å¼€ç±»åž‹ï¼ŒåŽé¢æ”¹
      // this.wfsHelper.setTypeName([this.form.dataType.typeName])
      this.wfsHelper.setTypeName(['sewer:emergency'])
      if (this.form.keyword) {
        this.wfsHelper.addLike('name', this.form.keyword)
      }
      const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
      if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
        this.list = res.features
      }
    },
    // æœç´¢çš„æ•°æ®ç‚¹å‡»äº‹ä»¶
    handleLocation (val, index) {
      console.log(val)
      this.activeNum = index
      // layer && layer.openPopup()
      // window.layerFactory.flyByFeature(val, this.form.dataType.code)
      window.map.flyTo([val.properties.y, val.properties.x], 15)
    handleLocation () {
      console.log('val')
    }
  }
}
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -57,9 +57,10 @@
import AjaxUtils from '@utils/AjaxUtils'
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 } from '../../../helpers/LocateHelper'
// import { pulseEffect } from '../../../../utils/utils'
// import { locate, openPropsPopup } from '../../../helpers/LocateHelper'
import { locate } from '../../../helpers/LocateHelper'
// import { fitBounds, highlight, locate } from '../../../helpers/LocateHelper'
export default {
  name: 'ResourcesQuery',
@@ -136,12 +137,13 @@
    },
    // æŸ¥è¯¢å®šä½åŠŸèƒ½
    handleLocation (val, index) {
      // console.log(val)
      console.log(val)
      this.activeNum = index
      const positionArea = [val.properties.y, val.properties.x]
      window.map.setView(positionArea, 17)
      pulseEffect(positionArea)
      openPopup(positionArea, val.id)
      const config = this.form.dataType
      locate(val, config)
      // const positionArea = [val.properties.y, val.properties.x]
      // window.map.setView(positionArea, 17)
      // pulseEffect(positionArea)
      // fitBounds(val, this.form.dataType.code)
      // highlight(val, this.form.dataType)
    }
src/components/panel/topicSearch/SewersSearch.vue
@@ -38,7 +38,7 @@
            <div>
              <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
              <p>所属企业:<span>{{ item.properties.orgname }}</span>
              <p>设施类型:<span>{{ item.properties.linenumtype }}</span>
              <p>设施类型:<span>{{ item.properties.linenumtype }}{{ item.properties.fourtype }}{{ item.properties.teetype }}</span>
               <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
                          @click="btnAffiliatedFacilities(item,index)" >
                 é™„属设施
src/conf/layers/LayerArea.js
@@ -13,7 +13,7 @@
      sname: '公司', // è¡¨å
      checked: true, // é»˜è®¤é€‰ä¸­çŠ¶æ€
      type: 0,
      icon: 'sewers/公司.png',
      icon: 'sewers/.png',
      legendImage: '../.././assets/images/map/company_refining.png'
    },
    {
src/conf/layers/LayerHbss.js
@@ -64,7 +64,7 @@
      minZoom: 16,
      type: SERVICE_TYPE.WMS,
      typeName: 'ewer:overflowweir',
      icon: 'sewers/溢流堰.png',
      icon: 'sewers/.png',
      checked: false
    },
    {