派生自 wuyushui/SewerAndRainNetwork

陈泽平
2021-05-18 58fe00c41f4c499b604d2c504542dbb1272382f2
管线问题修改
1个文件已添加
5个文件已修改
200 ■■■■ 已修改文件
public/assets/images/map/sewers/管架(墩).png 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/防火堤.png 补丁 | 查看 | 原始文档 | blame | 历史
src/components/layer/src/layer.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/SewersSearch.vue 194 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/conf/layers/LayerHbss.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/sewers/¹Ü¼Ü(¶Õ).png

public/assets/images/map/sewers/·À»ðµÌ.png
src/components/layer/src/layer.vue
@@ -10,6 +10,7 @@
<script>
import helper from './helper/helper.js'
import '../../../utils/dragBoxes'
export default {
  data () {
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -58,9 +58,8 @@
import { LayerEmergencySource } from '../../../../conf/layers/LayerEmergencySource'
import { LayerSurroundings } from '../../../../conf/layers/LayerSurroundings'
// import { pulseEffect } from '../../../../utils/utils'
// import { locate, openPropsPopup } from '../../../helpers/LocateHelper'
import { locate } from '../../../helpers/LocateHelper'
// import { fitBounds, highlight, locate } from '../../../helpers/LocateHelper'
// import { fitBounds, highlight, locate, openPropsPopup } from '../../../helpers/LocateHelper'
export default {
  name: 'ResourcesQuery',
src/components/panel/topicSearch/SewersSearch.vue
@@ -1,95 +1,102 @@
<template>
  <div class="sewers-search" v-if="gdVisible">
    <div class="panel-title">{{ title }}</div>
    <el-tabs v-model="activeName" @tab-click="handleClick">
      <el-tab-pane label="查询" name="first">
        <div class="search-panel ">
          <el-form ref="form" :model="form" label-width="90px" class="search-form">
            <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 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>
            <div class="rightButtonSearch">
              <el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索"></el-input>
              <el-button class="el-icon-search" @click="handleSearch"></el-button>
            </div>
          </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>
              <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
              <p>所属企业:<span>{{ item.properties.orgname }}</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)" >
                 é™„属设施
               </el-button>
              </p>
            </div>
          </div>
        </el-scrollbar>
        <el-card class="footer-page" v-if="total > 10">
          <el-pagination
              small
              @current-change="handlePage"
              :page-size=pageSize
              layout="prev, pager, next"
              :total=total
              class="warnPagination"
          >
          </el-pagination>
        </el-card>
      </el-tab-pane>
      <el-tab-pane label="分析" name="second">
        <SewersAnalysis></SewersAnalysis>
      </el-tab-pane>
      <el-tab-pane label="历史" name="third">
        <SewersHistory></SewersHistory>
      </el-tab-pane>
    </el-tabs>
    <!-- é™„属设施面板 -->
    <affiliated-facilities :facilitiesParameter="facilitiesParameter"  v-if="fuShuSheShiShow" ></affiliated-facilities>
  </div>
    <div class="sewers-search" v-if="gdVisible">
        <div class="panel-title">{{ title }}</div>
        <el-tabs v-model="activeName" @tab-click="handleClick">
            <el-tab-pane label="查询" name="first">
                <div class="search-panel ">
                    <el-form ref="form" :model="form" label-width="90px" class="search-form">
                        <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 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>
                        <div class="rightButtonSearch">
                            <el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索"></el-input>
                            <el-button class="el-icon-search" @click="handleSearch"></el-button>
                        </div>
                    </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>
                            <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}
                                {{item.properties.companyname }}</h3>
                            <p>所属企业:<span>{{ item.properties.orgname }}</span>
                            <p>设施类型:<span>{{form.pipelineType}}</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>
                </el-scrollbar>
                <el-card class="footer-page" v-if="total > 10">
                    <el-pagination
                            small
                            @current-change="handlePage"
                            :page-size=pageSize
                            layout="prev, pager, next"
                            :total=total
                            class="warnPagination"
                    >
                    </el-pagination>
                </el-card>
            </el-tab-pane>
            <el-tab-pane label="分析" name="second">
                <SewersAnalysis></SewersAnalysis>
            </el-tab-pane>
            <el-tab-pane label="历史" name="third">
                <SewersHistory></SewersHistory>
            </el-tab-pane>
        </el-tabs>
        <!-- é™„属设施面板 -->
        <affiliated-facilities :facilitiesParameter="facilitiesParameter"
                               v-if="fuShuSheShiShow"></affiliated-facilities>
    </div>
</template>
<script>
// å¼•入组件内容 =》 é™„属设施
import AffiliatedFacilities from '@components/BaseNav/pipeline/AffiliatedFacilities'
// ç®¡çº¿åˆ†æžåŠŸèƒ½
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
// ç®¡çº¿æŸ¥è¯¢åŽ†å²åŠŸèƒ½
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
// form类型可选择数据 å›¾å±‚控制
import { LayerPipeLines } from '@src/conf/layers/LayerPipeLines'
import { LayerFsss } from '@src/conf/layers/LayerFsss'
import { LayerHbss } from '@src/conf/layers/LayerHbss'
import { LayerPk } from '@src/conf/layers/LayerPk'
import { LayerArea } from '@src/conf/layers/LayerArea'
// æ–¹æ³•
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
import AffiliatedFacilities from '@components/BaseNav/pipeline/AffiliatedFacilities'
// å¼•入组件内容
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
import { fitBounds, highlight, locate } from '../../helpers/LocateHelper'
export default {
  name: 'SewersSearch',
  props: ['title'],
  components: {
    SewersAnalysis,
    SewersHistory,
@@ -97,38 +104,44 @@
  },
  data () {
    return {
      activeName: 'first',
      // åˆ¤æ–­æ˜¾ç¤º/隐藏
      gdVisible: true,
      // tab切换 ç»‘定当前值
      activeName: 'first',
      // æœç´¢æ•°æ® ç”¨äºŽå±•示数据存储
      list: [],
      // å›¾å±‚控制
      items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
      subItems: LayerPipeLines.layers,
      // åˆ†é¡µ
      pageSize: 10,
      total: 0,
      // form表单绑定数据
      form: {
        pipelineType: '管线',
        dataType: '',
        keyword: ''
      },
      // pageSize: 10,
      // current: 1,
      isWaybillHover: true,
      isRouteHover: false,
      facilitiesParameter: null,
      fuShuSheShiShow: true,
      fuShuSheShiPanelShow: true,
      activeNum: -1,
      wfsHelper: null
    }
  },
  props: ['title'],
  mounted () {
    this.wfsHelper = new WfsHelper()
  },
  methods: {
    // tab切换
    handleClick (tab, event) {
      console.log(tab, event)
    },
    // æ ¹æ®è¿”回数据 ç¡®è®¤å±•示图片
    getImgSrc () {
      const icon = this.form.dataType.icon
      return icon ? 'assets/images/map/' + icon : ''
    },
    handleClick (tab, event) {
      console.log(tab, event)
    },
    // é¡µé¢åˆ‡æ¢ åˆ†é¡µåŠŸèƒ½
    handlePage (page) {
      this.wfsHelper.setPage(page)
      this.handleSearch()
@@ -144,9 +157,11 @@
        }
      }
    },
    // äºŒçº§form表单切换选择清空已选择数据
    handleDataType () {
      this.list = []
    },
    // æœç´¢åŠŸèƒ½
    async handleSearch () {
      // console.log(this.form.dataType.sname, this.form.keyword)
      this.list = []
@@ -164,6 +179,7 @@
        this.list = res.features
      }
    },
    // ç‚¹å‡»æœç´¢åˆ°çš„æ•°æ® å®žçŽ°åŠŸèƒ½ = å®šä½ é«˜äº® å¼¹æ¡†
    handleLocation (val, index) {
      // console.log(val)
      this.activeNum = index
@@ -171,6 +187,7 @@
      const config = this.form.dataType
      locate(val, config)
    },
    // é™„属设施功能组件
    btnAffiliatedFacilities (val, index) {
      this.activeNum = index
      this.facilitiesParameter = val
@@ -183,9 +200,6 @@
      fitBounds(val, this.form.dataType.code)
      highlight(val)
    }
  },
  mounted () {
    this.wfsHelper = new WfsHelper()
  }
}
</script>
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
    },
    {