公共文件修改

chenzeping

2021-04-01 8b0a709a5b67eefd575cbe593b44a9ed8396804a

公共文件修改

 src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue

@@ -7,19 +7,18 @@
    <div class="border_corner border_corner_right_bottom"></div>
    <div class="main">
      <div class="main-video">
<!--        <el-table-->
<!--            tooltip-effect="dark"-->
<!--            :data="displayContentTable2"-->
<!--        >-->
<!--          <el-table-column prop="StoragePlaceId" label="序号"></el-table-column>-->
<!--          <el-table-column prop="StoragePlaceTypeName" label="类别"></el-table-column>-->
<!--          <el-table-column prop="StoragePlaceName" label="固废名称"></el-table-column>-->
<!--          <el-table-column prop="StorageZDMJ" label="代码"></el-table-column>-->
<!--          <el-table-column prop="StorageZCNL" label="产生量"></el-table-column>-->
<!--          <el-table-column prop="StorageZCL" label="储存量"></el-table-column>-->
<!--          <el-table-column prop="StorageType" label="产生装置"></el-table-column>-->
<!--        </el-table>-->
        <span>{{ displayContentTable3.StoragePlaceTypeName }}</span>
        <el-table
            tooltip-effect="dark"
            :data="displayContentTable2"
        >
          <el-table-column prop="StoragePlaceId" label="序号"></el-table-column>
          <el-table-column prop="StoragePlaceTypeName" label="类别"></el-table-column>
          <el-table-column prop="StoragePlaceName" label="固废名称"></el-table-column>
          <el-table-column prop="StorageZDMJ" label="代码"></el-table-column>
          <el-table-column prop="StorageZCNL" label="产生量"></el-table-column>
          <el-table-column prop="StorageZCL" label="储存量"></el-table-column>
          <el-table-column prop="StorageType" label="产生装置"></el-table-column>
        </el-table>
      </div>
    </div>
  </div>
@@ -45,13 +44,6 @@
      ],
      displayContentTable3: []
    }
  },
  mounted () {
    this.$nextTick(() => {
      this.displayContentTable.forEach(item => {
        this.displayContentTable3 = item
      })
    })
  }
}
</script>

 src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue

 src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -22,10 +22,10 @@
<script>

import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
// import GasTabs from './GasComponents/GasTabs'

export default {
@@ -46,7 +46,6 @@
  },
  methods: {
    setData (dataBasic, dataDetailed, value) {
      console.log(dataDetailed)
      dataBasic.forEach(item => {
        this.displayContentTitle = item.StoragePlaceName
      })

 src/components/LayerController/logic/SolidWaste.js

@@ -43,6 +43,12 @@
          iconAnchor: [25, 25]
        })
      })
      marker.bindTooltip(getSolidWasteData[i].Name, {
        permanent: true,
        offset: [0, 14],
        direction: 'bottom',
        className: 'company-bindTooltip'
      })
      layer.addLayer(marker)
    }
  }
@@ -54,8 +60,6 @@
  this.clickListener = (e) => {
    // 点击marker的pulse()光波
    this.animalService.pulseEffect(e.latlng)
    /* flyTo()弹出框平移事件 */
    // this.setPanTo(e.latlng, 200)
    /* 点击数据的接口请求 */
    this.requestSolidWasteData(e).then(e)
  }
@@ -86,14 +90,16 @@
    instance.$mount()
    document.body.appendChild(instance.$el)
    instance.setData(resultBasic.Result.DataInfo, resultDetailed, 'gufei')
    /* flyTo()弹出框平移事件 */
    this.setPanTo(e.latlng, 200)
  }

  // flayTo()
  // this.setPanTo = (pos, value) => {
  //   var position = pos
  //   position = this.map.latLngToLayerPoint(position)
  //   position.y += value
  //   position = this.map.layerPointToLatLng(position)
  //   this.map.flyTo(position)
  // }
  this.setPanTo = (pos, value) => {
    var position = pos
    position = window.map.latLngToLayerPoint(position)
    position.y += value
    position = window.map.layerPointToLatLng(position)
    window.map.flyTo(position)
  }
}

 src/components/panel/topicSearch/SolidWasteSearch.vue

@@ -0,0 +1,183 @@
<template>
  <div class="sewers-search" v-if="judgeVisible">
    <div class="search-title">
      <span>固废</span>
    </div>
    <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 SolidWasteTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item :label="form.pipelineType+'：'" size="mini">
          <el-select style="width: 100%" v-model="form.dataType" @change="handleDataType" :popper-class="'select-down'">
            <el-option
                v-for="item in dataTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-input v-model="form.keyword" size="mini"
                  placeholder="在此输入关键字搜索">
          <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i>
        </el-input>
      </el-form>
    </div>
    <el-scrollbar style="height:100%">
      <div class="B-TMD-table-list" v-for="(item,index) in list" :key="index">
        <div class="B-TMD-table-list-title">
          <div class="B-TMD-table-list-head">
            <div class="B-TMD-table-list-title-y"
                 :class="['B-TMD-table-list-title-y-nam', { 'warning': item.vehicleStatus==='910003' }, { 'offline': item.vehicleStatus==='910001' }]">
              <span id="waybillNumber" class="" :title="item.properties.pipename">
                <span class="location-btn" @click="handleLocation(item)">{{ item.properties.pipename }}</span>
               </span>
            </div>
          </div>
        </div>
        <div class="B-TMD-table-list-content">

          <div v-for="itm in labelList" :key="itm.label">
            <span>{{ itm.label }}：</span>
            <span id="b_twe_loan" :title="item.properties[itm.key] ">{{ item.properties[itm.key] }}</span>
          </div>
        </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
          :current-page=current
          class="warnPagination"
      >
      </el-pagination>
    </el-card>
  </div>
</template>

<script>
// 引入可选择数据
import { SolidWasteTypeOptions } from '@/conf/layers/LayerSolidWaste'

import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'

export default {
  name: 'SolidWasteSearch',
  data () {
    return {
      judgeVisible: true,
      list: [],
      labelList: SolidWasteTypeOptions[0].labelList,
      total: 0,
      SolidWasteTypeOptions: SolidWasteTypeOptions,
      dataTypeOptions: SolidWasteTypeOptions[0].options,
      form: {
        pipelineType: SolidWasteTypeOptions[0].label,
        dataType: SolidWasteTypeOptions[0].options[0].label,
        query: SolidWasteTypeOptions[0].options[0],
        keyword: '固废面板数据查询'
      },
      isWaybillHover: true,
      isRouteHover: false
    }
  },
  props: ['title'],
  methods: {
    handlePipelineType (val) {
      this.SolidWasteTypeOptions.forEach((itm) => {
        if (val === itm.value) {
          this.dataTypeOptions = itm.options
          this.form.pipelineType = itm.label
          this.form.labelList = itm.labelList
        }
      })
      this.form.dataType = this.dataTypeOptions[0].label
      this.form.key = this.dataTypeOptions[0].key
    },
    handleDataType (val) {
      this.dataTypeOptions.forEach((itm) => {
        if (val === itm.value) {
          this.form.query = itm
        }
      })
    },
    async handleSearch () {
      const param = {
        pipelineType: this.form.pipelineType,
        dataType: this.form.dataType
      }
      console.log(param)
      var wfsHelper = new WfsHelper()
      wfsHelper.addTypeName(this.form.query.layerName)
      wfsHelper.addLike(this.form.query.key, this.form.keyword)
      const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
      if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
        this.list = res.data.features
      }
    },
    handleLocation (val) {
      console.log(val)
      const bound = this.L.geoJSON([val], {}).getBounds()
      var layer = window.serviceLayerHelper.getByLayerId(val.id)
      layer && layer.openPopup()
      this.$store.state.map.map.flyToBounds(bound)
    }
  }
}
</script>

<style lang="less" scoped>

.sewers-search {
  position: relative;
  overflow: hidden;

  .search-panel {
    background-color: transparent;
    border: 1px solid @background-color-split;
    padding: 10px;

    /deep/ input {
      border-radius: 0;
      background-color: @background-color-split;
      border: solid 1px @color;
      color: @color-gray;
      font-size: 0.01rem;

      .el-select .el-input.is-focus .el-input__inner {
        border-color: @color;
      }
    }

    /deep/ input:focus {
      border-color: @color;
    }
  }

  .search-btn {

  }

  //location-btn{
  //
  //}
  .location-btn:hover, .el-input__icon:hover {
    color: @color;
    cursor: pointer;
  }
}
</style>

 src/conf/layers/LayerSolidWaste.js

@@ -2,6 +2,8 @@
 * 固废图层
 * @type {string}
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
// const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
export const LayerSolidWaste = {
  code: 'solidWaste',
  name: '固废',
@@ -25,3 +27,341 @@
    }
  ]
}

// 固废设施类型
export const LayerSolisWastePoint = [
  {
    code: 'fsss',
    name: '附属设施',
    checked: false, // 默认选中状态
    type: 'geojson',
    url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
    layers: [
      {
        code: 'fourlink',
        name: '四通',
        sname: '四通',
        checked: true,
        minZoom: 10,
        icon: 'sewers/四通.png'
      },
      {
        code: 'tee',
        name: '三通',
        sname: '三通',
        checked: false,
        minZoom: 10,
        icon: 'sewers/三通.png'
      },
      {
        code: 'piperack',
        name: '管架(墩)',
        sname: 'PipeRack',
        minZoom: 10,
        checked: false
      },
      {
        code: 'pipegallery',
        name: '管廊(带)',
        sname: 'PipeGallery',
        minZoom: 10,
        checked: false
      },
      {
        code: 'pipesegment',
        name: '流向',
        sname: 'ywslx',
        checked: false
      },
      {
        code: 'pipeline',
        name: '管网',
        minZoom: 10,
        sname: 'pipeline',
        checked: false
      },
      {
        code: 'valve',
        name: '阀门',
        minZoom: 10,
        sname: 'valve',
        checked: false,
        icon: 'sewers/阀门.png'
      },
      {
        code: 'elbow',
        name: '弯头',
        sname: 'Elbow',
        minZoom: 10,
        checked: false,
        icon: 'sewers/弯头.png'
      }
    ]
  },
  {
    code: 'hbss',
    name: '环保设施',
    checked: false, // 默认选中状态
    type: 'geojson',
    url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
    layers: [
      {
        code: 'manhole',
        name: '窨井',
        minZoom: 10,
        sname: '窨井',
        checked: false,
        icon: 'sewers/窨井.png'
      },
      {
        code: 'firedike',
        name: '防火堤',
        sname: '防火堤',
        minZoom: 10,
        checked: false
      },
      {
        code: 'raingate',
        name: '雨篦子',
        sname: '雨篦子',
        checked: false,
        minZoom: 10,
        icon: 'sewers/雨篦子.png'
      },
      {
        code: 'overflowweir',
        name: '溢流堰',
        sname: '溢流堰',
        minZoom: 10,
        checked: false
      },
      {
        code: 'chokevalve',
        name: '截流闸',
        sname: '截流闸',
        minZoom: 10,
        checked: false
      },
      {
        code: 'collectingbasin',
        name: '集水池(罐)',
        sname: '集水池',
        minZoom: 10,
        checked: false,
        icon: 'sewers/集水池.png'
      },
      {
        code: 'oilseparator',
        name: '隔油池',
        sname: '隔油池',
        minZoom: 10,
        checked: false,
        icon: 'sewers/隔油池.png'
      }
    ]
  },
  {
    code: 'pk',
    name: '排口',
    checked: false, // 默认选中状态
    type: 'geojson',
    url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
    layers: [
      {
        code: 'dischargeport',
        name: '排放口',
        minZoom: 10,
        sname: '排放口',
        checked: false
      }
    ]
  },
  {
    code: 'qyxx',
    name: '区域信息',
    checked: false, // 默认选中状态
    type: 'geojson',
    url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
    layers: [
      {
        code: 'thirdpartypipe',
        name: '第三方管道',
        minZoom: 10,
        sname: '第三方管道',
        checked: false
      },
      {
        code: 'firefightingunit',
        name: '消防单位',
        sname: '消防单位',
        minZoom: 10,
        checked: false,
        icon: 'sewers/消防单位.png'
      },
      {
        code: 'emergencyesources',
        name: '应急物资',
        sname: '应急物资',
        minZoom: 10,
        checked: false
      },
      {
        code: 'emergencyres',
        name: '社会专业应急救援队伍',
        sname: '专业应急救援',
        checked: false,
        minZoom: 10,
        icon: 'sewers/社会专业应急救援.png'
      },
      {
        code: 'maintenanceteam',
        name: '维抢修队伍',
        sname: '维抢修队伍',
        checked: false,
        minZoom: 10,
        icon: 'sewers/社会专业应急救援.png'
      },
      {
        code: 'hospital',
        name: '医院',
        sname: '医院',
        checked: false,
        minZoom: 10,
        icon: 'sewers/医院.png'
      },
      {
        code: 'pointpreservationzone',
        name: '自然保护区',
        sname: '自然保护区',
        checked: false,
        minZoom: 10,
        icon: 'sewers/自然保护区.png'
      },
      {
        code: 'pointhydrology',
        name: '水体',
        sname: '水体',
        checked: false,
        minZoom: 10,
        icon: 'sewers/水体.png'
      },
      {
        code: 'sensitivetarget',
        name: '敏感目标',
        sname: '敏感目标',
        checked: false,
        minZoom: 10,
        icon: 'sewers/敏感目标.png'
      },
      {
        code: 'envmonunit',
        name: '环境监测单位',
        sname: '环境监测单位',
        checked: false,
        minZoom: 10,
        icon: 'sewers/环境监测单位.png'
      },
      {
        code: 'pointcontaminants',
        name: '监测点污染物指标信息',
        sname: '污染物指标',
        minZoom: 10,
        checked: false
      },
      {
        code: 'dischargeportaround',
        name: '排放口周边环境敏感信息',
        sname: '排放口周边环境',
        minZoom: 10,
        checked: false,
        iconN: 'sewers/排放口周边敏感信息.png'
      },
      {
        code: 'pump',
        name: '泵',
        sname: '泵',
        minZoom: 10,
        checked: false,
        icon: 'sewers/泵.png'
      },
      {
        code: 'liquidlevelmeter',
        name: '液位计',
        sname: '液位计',
        checked: false,
        minZoom: 10,
        icon: 'sewers/液位计.png'
      },
      {
        code: 'flowmeter',
        name: '流量计',
        sname: '流量计',
        minZoom: 10,
        checked: false,
        icon: 'sewers/流量计.png'
      },
      {
        code: 'video',
        name: '视频监控配置',
        sname: '视频监控',
        minZoom: 10,
        checked: false
      },
      {
        code: 'onlinemonitoring',
        name: '在线监测设备配置',
        sname: '在线监测',
        minZoom: 10,
        checked: false
      },
      {
        code: 'combustiblegas',
        name: '可燃气体报警设备配置',
        sname: '可燃气体报警',
        minZoom: 10,
        checked: false
      },
      {
        code: 'hydrogensulfide',
        name: 'H2S浓度报警设备配置',
        sname: 'H2S浓度报警',
        minZoom: 10,
        checked: false
      },
      {
        code: 'controlpoint',
        name: '管线点',
        sname: '管线点',
        minZoom: 10,
        checked: false,
        icon: 'sewers/管线点.png'
      },
      {
        code: 'pipesegment',
        name: '管段',
        sname: '管段',
        minZoom: 10,
        checked: false
      }
    ]
  }
]

// 固废本体
export const SolidWasteTypeOptions = [{
  value: '1',
  label: '固废本体',
  options: [{
    value: '1',
    layerName: '固废',
    key: 'pipename',
    label: '全部固废'
  }],
  labelList: [{
    label: '输送介质',
    key: 'mediumtype'
  }, {
    label: '长度(m)',
    key: 'length'
  }]
}]