派生自 wuyushui/SewerAndRainNetwork

陈泽平
2021-05-17 22d70999e5f89ba944f27c1589bec864c57084ea
管线图片添加
17个文件已添加
8个文件已修改
109 ■■■■ 已修改文件
public/assets/images/map/sewers/事故水.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/公司.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/净化水.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/含油污水.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/含盐污水.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/含硫污水.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/含碱污水.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/循环水.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/截流闸.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/流向.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/溢流堰.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/生产污水.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/生活污水.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/管廊.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/管架.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/装置区.png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/防火堤.png 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue 69 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/SolidWasteSearch.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/conf/layers/LayerArea.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/conf/layers/LayerFsss.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/conf/layers/LayerHbss.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/conf/layers/LayerPipeLines.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
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
public/assets/images/map/sewers/¹Ü¼Ü.png
public/assets/images/map/sewers/×°ÖÃÇø.png
public/assets/images/map/sewers/·À»ðµÌ.png
src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
@@ -26,7 +26,8 @@
                </el-form-item>
                <el-form-item label="事件类型:">
                    <el-radio-group v-model="form.transferData" class="levelOfRisk">
                        <el-radio v-for="(item,index) in form.levelOfRisk" :label="item.value" :key="index">
                        <el-radio v-for="(item,index) in form.levelOfRisk" :label="item.value" :key="index"
                                  @change="redioChange(item.name)">
                            <span class="levelOfRisk-type">{{ item.name }}</span>
                        </el-radio>
                    </el-radio-group>
@@ -38,12 +39,28 @@
            </el-form>
        </el-form>
        <el-scrollbar style="height:286.22px">
            <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
                 :class="activeNum===index?'hover':''">
            <!--            <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum===index?'hover':''" @click="accordPopup(item)">-->
            <!--                &lt;!&ndash;                <i class="state"></i>&ndash;&gt;-->
            <!--                <img class="state" :src="getImgSrc(item.properties.type)" style="background: none"/>-->
            <!--                <div>-->
            <!--                    <h3 @click="handleLocation(item,index)">事件名称:XXX事件</h3>-->
            <!--                    <h5>-->
            <!--                        äº‹ä»¶äº‹ä»¶:2021å¹´3月21日-->
            <!--                        <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">删除</el-button>-->
            <!--                    </h5>-->
            <!--                    <p>-->
            <!--                        äº‹ä»¶çŠ¶æ€ï¼š<span>审批阶段</span>-->
            <!--                    </p>-->
            <!--                    <p>事件类型:<span>{{ item.properties.pipecode }}</span>-->
            <!--                        <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">事件管理-->
            <!--                        </el-button>-->
            <!--                    </p>-->
            <!--                </div>-->
            <!--            </div>-->
            <div class="environmental-risk-list">
                <!--                <i class="state"></i>-->
                <img class="state" :src="getImgSrc()" style="background: none"/>
                <div>
                    <h3 @click="handleLocation(item,index)">事件名称:XXX事件</h3>
                    <h3>事件名称:XXX事件</h3>
                    <h5>
                        äº‹ä»¶äº‹ä»¶:2021å¹´3月21日
                        <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">删除</el-button>
@@ -51,8 +68,10 @@
                    <p>
                        äº‹ä»¶çŠ¶æ€ï¼š<span>审批阶段</span>
                    </p>
                    <p>事件类型:<span>{{ item.properties.pipecode }}</span>
                        <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">事件管理
                    <p>事件类型:<span>模拟管线事件</span>
                        <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
                                   @click="accordPopup()">
                            <span>事件管理</span>
                        </el-button>
                    </p>
                </div>
@@ -106,13 +125,34 @@
    this.wfsHelper = new WfsHelper()
  },
  methods: {
    // ç‚¹å‡»äº‹ä»¶ç®¡ç†
    accordPopup () {
      console.log('item')
      window.$layer.open({
        content: {
          content: ReportPopup, // ç»„ä»¶
          parent: this, // çˆ¶ç»„ä»¶
          data: { // ä¼ é€’的参数
            // storagePlaceId: e.layer.options.totransferData.StoragePlaceId
          }
        }
        // title: 'title' // æ ‡é¢˜
      })
    },
    // radio数据选择
    redioChange (item) {
      console.log(item)
    },
    // æ ¹æ®æ•°æ®è¿”回展示不同的图片
    getImgSrc () {
      const icon = this.form.dataType.icon
      return icon ? 'assets/images/map/' + icon : ''
    },
    // form 2 è¡¨å•数据选择事件
    handleDataType () {
      this.list = []
    },
    // form è¡¨å•数据选择
    handlePipelineType (val) {
      this.list = []
      for (let i = 0; i < this.items.length; i++) {
@@ -123,6 +163,7 @@
        }
      }
    },
    // æ•°æ®æœç´¢äº‹ä»¶
    async handleSearch () {
      this.list = []
      this.wfsHelper.clearFilter()
@@ -137,25 +178,13 @@
        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)
    },
    btnAffiliatedFacilities () {
      console.log('item')
      window.$layer.open({
        content: {
          content: ReportPopup, // ç»„ä»¶
          parent: this, // çˆ¶ç»„ä»¶
          data: { // ä¼ é€’的参数
            // storagePlaceId: e.layer.options.totransferData.StoragePlaceId
          }
        }
        // title: 'title' // æ ‡é¢˜
      })
    }
  }
}
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.type}}</h3>
                <h5>资源名称:{{item.properties.companyname}}</h5>
                <h3>{{changeAmount}}类型:{{item.properties.type}}</h3>
                <h5>{{changeAmount}}名称:{{item.properties.name}}</h5>
                <p>负责人:<span>{{item.properties.resperson}}</span></p>
                <p>电话:<span>{{item.properties.telephone}}</span></p>
            </div>
@@ -78,7 +78,8 @@
      list: [],
      items: [LayerEmergencySource, LayerSurroundings],
      subItems: LayerEmergencySource.layers || LayerSurroundings.layers,
      WfsHelper: null
      WfsHelper: null,
      changeAmount: '资源'
    }
  },
  mounted () {
@@ -102,8 +103,10 @@
      }
      if (this.form.pipelineType === '应急资源') {
        this.subItems = LayerEmergencySource.layers
        this.changeAmount = '资源'
      } else if (this.form.pipelineType === '周边环境') {
        this.subItems = LayerSurroundings.layers
        this.changeAmount = '环境'
      }
    },
    handleDataType (val) {
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -439,10 +439,10 @@
        this.linkPipeline.push(line)
      })
    },
    // è¿žé€šæ€§ åˆ†æžç»“æžœtable列表数据选择点击事件
    // å®šä½æ–¹æ³•事件
    linkResultSelect (e) {
      // console.log('连通性分析结果列表点击')
      // console.log(e)
      console.log(e)
      const geom = JSON.parse(e.geomText)
      if (this.currentSelectResultLine != null) {
        this.currentSelectResultLine.remove()
@@ -483,8 +483,8 @@
      this.selectPipeLine()
    },
    async bgSelect (e) {
      console.log('选择爆管管段')
      console.log(e)
      // console.log('选择爆管管段')
      // console.log(e)
      this.bgFm = []
      if (this.bgMarker != null) {
        this.bgMarker.remove()
src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -30,7 +30,6 @@
        <el-scrollbar style="height:286.22px">
            <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index"
                 @click="setBounced(item)">
                <!--        <i class="state"></i>-->
                <img src="../../../../public/assets/images/map/solidwaste/gf_green2.png" alt="" class="state">
                <div>
                    <h3>###炼化部</h3>
@@ -159,7 +158,7 @@
    },
    // æ•°æ®å±•示,点击进行弹框及点的展示
    setBounced (val) {
      // console.log(val)
      console.log(val)
      const pos = [val.Latitude, val.Longitude]
      window.map.setView(pos, 15)
      window.$layer.open({
@@ -173,7 +172,7 @@
        title: val.Name
      })
      pulseEffect([val.Latitude, val.Longitude])
      setPanTo(pos, 250)
      setPanTo(pos, 200)
    }
  }
}
src/conf/layers/LayerArea.js
@@ -13,6 +13,7 @@
      sname: '公司', // è¡¨å
      checked: true, // é»˜è®¤é€‰ä¸­çŠ¶æ€
      type: 0,
      icon: 'sewers/公司.png',
      legendImage: '../.././assets/images/map/company_refining.png'
    },
    {
@@ -21,6 +22,7 @@
      sname: '码头',
      checked: false, // é»˜è®¤é€‰ä¸­çŠ¶æ€
      type: 0,
      icon: 'sewers/码头.png',
      legendImage: '../.././assets/images/map/sewers/码头.png'
    },
    {
@@ -28,6 +30,7 @@
      name: '装置区',
      sname: '装置区',
      checked: false, // é»˜è®¤é€‰ä¸­çŠ¶æ€
      icon: 'sewers/装置区.png',
      typeName: 'sewer:unitareaboundary'
    }
  ]
src/conf/layers/LayerFsss.js
@@ -47,6 +47,7 @@
      minZoom: 16,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:piperack',
      icon: 'sewers/管架.png',
      checked: false
    },
    {
@@ -56,6 +57,7 @@
      minZoom: 16,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipegallery',
      icon: 'sewers/管廊.png',
      checked: false
    },
    {
@@ -63,6 +65,7 @@
      name: '流向',
      sname: 'ywslx',
      type: SERVICE_TYPE.WMS,
      icon: 'sewers/流向.png',
      checked: false
    },
    {
src/conf/layers/LayerHbss.js
@@ -35,6 +35,7 @@
      minZoom: 16,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:firedike',
      icon: 'sewers/防火堤.png',
      checked: false
    },
    {
@@ -53,6 +54,7 @@
      sname: '截流闸',
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:collectingbasin',
      icon: 'sewers/截流闸.png',
      checked: false
    },
    {
@@ -62,6 +64,7 @@
      minZoom: 16,
      type: SERVICE_TYPE.WMS,
      typeName: 'ewer:overflowweir',
      icon: 'sewers/溢流堰.png',
      checked: false
    },
    {
src/conf/layers/LayerPipeLines.js
@@ -40,6 +40,7 @@
      type: SERVICE_TYPE.WMS,
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/事故水.png',
      minZoom: 13,
      filter: 'mediumtype = \'事故水\'',
      index: 1
@@ -52,6 +53,7 @@
      type: SERVICE_TYPE.WMS,
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/含油污水.png',
      minZoom: 13,
      color: '#ffaa00',
      filter: 'mediumtype = \'含油污水\'',
@@ -69,6 +71,7 @@
      type: SERVICE_TYPE.WMS,
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/含盐污水.png',
      minZoom: 13,
      filter: 'mediumtype = \'含盐污水\'',
      index: 1
@@ -81,6 +84,7 @@
      type: SERVICE_TYPE.WMS,
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/含碱污水.png',
      filter: 'mediumtype = \'含碱污水\'',
      minZoom: 10,
      index: 1
@@ -93,6 +97,7 @@
      type: SERVICE_TYPE.WMS,
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/含硫污水.png',
      filter: 'mediumtype = \'含硫污水\'',
      minZoom: 10,
      index: 1
@@ -105,6 +110,7 @@
      type: SERVICE_TYPE.WMS,
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/生活污水.png',
      filter: 'mediumtype = \'生活污水\'',
      minZoom: 13,
      index: 1
@@ -117,6 +123,7 @@
      type: SERVICE_TYPE.WMS,
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/净化水.png',
      filter: 'mediumtype = \'净化水\'',
      minZoom: 13,
      index: 1
@@ -128,6 +135,7 @@
      type: SERVICE_TYPE.WMS,
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/循环水.png',
      filter: 'mediumtype = \'循环水\'',
      checked: false,
      minZoom: 13,
@@ -141,6 +149,7 @@
      type: SERVICE_TYPE.WMS,
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/生产污水.png',
      filter: 'mediumtype = \'生产污水\'',
      minZoom: 13,
      color: '#a8a800',