管线问题修改

陈泽平

2021-05-18 3b1b5623e44135a8e693698cb7a30adf66d86964

管线问题修改

 public/assets/images/map/sewers/ʹÊË®.png

 public/assets/images/map/sewers/¾»»¯Ë®.png

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

 public/assets/images/map/sewers/º¬ÁòÎÛË®.png

 public/assets/images/map/sewers/º¬¼îÎÛË®.png

 public/assets/images/map/sewers/Ñ­»·Ë®.png

 public/assets/images/map/sewers/½ØÁ÷Õ¢.png

Binary files differ

 public/assets/images/map/sewers/Á÷Ïò.png

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

 public/assets/images/map/sewers/¹ÜÀÈ.png

 public/assets/images/map/sewers/¹Ü¼Ü(¶Õ).png

 public/assets/images/map/sewers/¹Ü¼Ü.png

Binary files differ

 public/assets/images/map/sewers/×°ÖÃÇø.png

Binary files differ

 public/assets/images/map/sewers/·À»ðµÌ.png

Binary files differ

 src/components/LayerController/logic/EnterpriseEmergency.js

File was deleted

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

@@ -130,7 +130,7 @@
      console.log('item')
      window.$layer.open({
        content: {
          content: ReportPopup, // ç»„件
          comp: ReportPopup, // ç»„件
          parent: this, // çˆ¶ç»„件
          data: { // ä¼ é€’的参数
            // storagePlaceId: e.layer.options.totransferData.StoragePlaceId

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

@@ -55,12 +55,11 @@
<script>
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
// import { LayerEmergency } from '../../../../../conf/LayerEmergency'
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'
// import { fitBounds, highlight } from '../../../helpers/LocateHelper'

export default {
  name: 'ResourcesQuery',
@@ -140,9 +139,11 @@
      // console.log(val)
      this.activeNum = index
      const positionArea = [val.properties.y, val.properties.x]
      window.map.setView(positionArea, 16)
      window.map.setView(positionArea, 17)
      pulseEffect(positionArea)
      openPopup(positionArea, val.id)
      // fitBounds(val, this.form.dataType.code)
      // highlight(val, this.form.dataType)
    }
  }
}

 src/components/panel/topicSearch/ReportSearch.vue

@@ -35,6 +35,13 @@
  methods: {
    handleClick (tab) {
      console.log(tab)
      if (tab.label === '分析') {
        // å…³é—­å¼¹çª—
        window.layerFactory.clickSwitch = false
      } else {
        // æ‰“开弹窗
        window.layerFactory.clickSwitch = true
      }
    }
  }
}

 src/components/panel/topicSearch/SewersSearch.vue

@@ -33,13 +33,16 @@
          </el-form>
        </div>
        <el-scrollbar style="height:413px;">
          <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum==index?'hover':''">
            <img class="state" :src="getImgSrc()" style="background: none"/>
          <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum===index?'hover':''">
            <img class="state" :src="getImgSrc()" style="background: none" />
            <div>
              <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
              <p>所属企业：<span>{{ item.properties.orgcode }}</span>
              <p>设施类型：<span>{{ item.properties.teetype }}</span>
               <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" @click="btnAffiliatedFacilities(item,index)" >附属设施</el-button>
              <p>所属企业：<span>{{ item.properties.orgname }}</span>
              <p>设施类型：<span>{{ item.properties.linenumtype }}</span>
               <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
                          @click="btnAffiliatedFacilities(item,index)" >
                 é™„属设施
               </el-button>
              </p>
            </div>
          </div>
@@ -133,7 +136,6 @@
    // è®¾æ–½ç±»åž‹ç­›é€‰
    handlePipelineType (val) {
      this.list = []
      // debugger
      for (let i = 0; i < this.items.length; i++) {
        const item = this.items[i]
        if (val === item.name) {
@@ -156,6 +158,7 @@
      }
      // const _this = this
      const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
      console.log(res)
      if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
        this.total = res.totalFeatures
        this.list = res.features

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

@@ -150,7 +150,7 @@
    // åœ°å›¾ä¸Šç‚¹å‡»
    selectPipeLine () {
      window.map.on('click', this.selectClick)
      // // å…³é—­å¼¹çª—
      // å…³é—­å¼¹çª—
      window.layerFactory.clickSwitch = false
    },
    // åœ°å›¾ä¸Šç‚¹å‡»å›žè°ƒ

 src/conf/layers/LayerArea.js

@@ -30,7 +30,7 @@
      name: '装置区',
      sname: '装置区',
      checked: false, // é»˜è®¤é€‰ä¸­çŠ¶æ€
      icon: 'sewers/装置区.png',
      icon: 'sewers/.png',
      typeName: 'sewer:unitareaboundary'
    }
  ]

 src/conf/layers/LayerFsss.js

@@ -47,7 +47,7 @@
      minZoom: 16,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:piperack',
      icon: 'sewers/管架.png',
      icon: 'sewers/管架(墩).png',
      checked: false
    },
    {
@@ -58,6 +58,11 @@
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipegallery',
      icon: 'sewers/管廊.png',
      color: '#828282',
      styles: {
        COLOR: '#828282',
        FILL_COLOR: '#828282'
      },
      checked: false
    },
    {

 src/conf/layers/LayerHbss.js

@@ -35,7 +35,7 @@
      minZoom: 16,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:firedike',
      icon: 'sewers/防火堤.png',
      icon: 'sewers/.png',
      checked: false
    },
    {
@@ -54,7 +54,7 @@
      sname: '截流闸',
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:collectingbasin',
      icon: 'sewers/截流闸.png',
      icon: 'sewers/.png',
      checked: false
    },
    {

 src/conf/layers/LayerPipeLines.js

@@ -42,6 +42,12 @@
      typeName: 'sewer:pipeline',
      icon: 'sewers/事故水.png',
      minZoom: 13,
      // color: 'rgb(230, 76, 0)',
      color: '#E64C00',
      styles: {
        COLOR: '#E64C00',
        FILL_COLOR: '#E64C00'
      },
      filter: 'mediumtype = \'事故水\'',
      index: 1
    },
@@ -73,7 +79,12 @@
      typeName: 'sewer:pipeline',
      icon: 'sewers/含盐污水.png',
      minZoom: 13,
      color: '#FF7F7F',
      filter: 'mediumtype = \'含盐污水\'',
      styles: {
        COLOR: '#FF7F7F',
        FILL_COLOR: '#FF7F7F'
      },
      index: 1
    },
    {
@@ -87,6 +98,11 @@
      icon: 'sewers/含碱污水.png',
      filter: 'mediumtype = \'含碱污水\'',
      minZoom: 10,
      color: '#E8BEFF',
      styles: {
        COLOR: '#E8BEFF',
        FILL_COLOR: '#E8BEFF'
      },
      index: 1
    },
    {
@@ -100,6 +116,11 @@
      icon: 'sewers/含硫污水.png',
      filter: 'mediumtype = \'含硫污水\'',
      minZoom: 10,
      color: '',
      styles: {
        COLOR: '',
        FILL_COLOR: ''
      },
      index: 1
    },
    {
@@ -113,6 +134,11 @@
      icon: 'sewers/生活污水.png',
      filter: 'mediumtype = \'生活污水\'',
      minZoom: 13,
      color: '#A8A800',
      styles: {
        COLOR: '#A8A800',
        FILL_COLOR: '#A8A800'
      },
      index: 1
    },
    {
@@ -126,6 +152,11 @@
      icon: 'sewers/净化水.png',
      filter: 'mediumtype = \'净化水\'',
      minZoom: 13,
      color: '#55FF00',
      styles: {
        COLOR: '#55FF00',
        FILL_COLOR: '#55FF00'
      },
      index: 1
    },
    {
@@ -139,6 +170,11 @@
      filter: 'mediumtype = \'循环水\'',
      checked: false,
      minZoom: 13,
      color: '#73FFDF',
      styles: {
        COLOR: '#73FFDF',
        FILL_COLOR: '#73FFDF'
      },
      index: 1
    },
    {