Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-05-14 de32f49313e2c7534009758193c41be61517f1d5

Merge remote-tracking branch 'origin/develop' into develop

 public/assets/images/map/sewers/Ó¦¼±Îï×Ê.png

 public/assets/images/map/sewers/¾ÈÔ®Îï×Ê.png

Binary files differ

 src/assets/airQuality.json

@@ -1,10 +1,157 @@
{"type":"FeatureCollection", "features": [
  {"type":"Feature","geometry":{"type":"Point","coordinates":["38.8381779195697","117.410229850655"]},"properties":{"name":"水务站","ID":2,"cameraIds":"12010254001310000010","online":"8ae64ac4638cbf3e016439d4a6ad0006","addr":"位于公司西北厂界水务部化工厂院内","desc":"","dept":"水务部"}},
  {"type":"Feature","geometry":{"type":"Point","coordinates":["38.82248319987435","117.43366062641144"]},"properties":{"name":"烯烃北站","ID":3,"cameraIds":"12010254001310000015","online":"8ae64ac4638cbf3e016439dc12490009","addr":"位于烯烃部北厂界","desc":"","dept":"烯烃部"}},
  {"type":"Feature","geometry":{"type":"Point","coordinates":["38.84116530418396","117.42481470108032"]},"properties":{"name":"物装站","ID":4,"cameraIds":"12010254001310000012","online":"8ae64ac4638cbf3e016439d45f5a0005","addr":"位于公司东北厂界物装部正门外","desc":"","dept":"物装部"}},
  {"type":"Feature","geometry":{"type":"Point","coordinates":["38.80886547541369","117.42767179031944"]},"properties":{"name":"烯烃南站","ID":5,"cameraIds":"12010254001310000011","online":"8ae64ac4638cbf3e016439d560ea0008","addr":"位于烯烃部南厂界","desc":"","dept":"烯烃部"}},
  {"type":"Feature","geometry":{"type":"Point","coordinates":["38.8332098722457","117.447918949615"]},"properties":{"name":"生活区站","ID":6,"cameraIds":"12010254001310000013","online":"8ae64ac4638cbf3e016439dd4963000a","addr":"位于公司培训中心院内","desc":"","dept":"生活区"}},
  {"type":"Feature","geometry":{"type":"Point","coordinates":["38.8314127922058","117.427905955039"]},"properties":{"name":"安环站","ID":7,"cameraIds":"12010254001310000014","online":"8ae64ac4638cbf3e016439de9875000c","addr":"位于公司东厂界原培训中心院内","desc":"","dept":"安全环保部"}},
  {"type":"Feature","geometry":{"type":"Point","coordinates":["38.82397315436005","117.39679098129272"]},"properties":{"name":"炼油站","ID":8,"cameraIds":"12010254001310000009","online":"8ae64ac4638cbf3e016439de2af2000b","addr":"位于公司西南厂界炼油部西南侧","desc":"","dept":"炼油部"}},
  {"type":"Feature","geometry":{"type":"Point","coordinates":["38.82355982342607","117.421976923697"]},"properties":{"name":"热电站","ID":9,"cameraIds":"12010254001310000016","online":"8ae64ac4638cbf3e016439d4f1080007","addr":"位于公司东南厂界热电部北门","desc":"","dept":"热电部"}}
]}
{
  "type": "FeatureCollection",
  "features": [
    {
      "type": "Feature",
      "geometry": {
        "type": "Point",
        "coordinates": [
          "38.8381779195697",
          "117.410229850655"
        ]
      },
      "properties": {
        "name": "水务站",
        "ID": 2,
        "cameraIds": "12010254001310000010",
        "online": "8ae64ac4638cbf3e016439d4a6ad0006",
        "addr": "位于公司西北厂界水务部化工厂院内",
        "desc": "",
        "dept": "水务部"
      }
    },
    {
      "type": "Feature",
      "geometry": {
        "type": "Point",
        "coordinates": [
          "38.82248319987435",
          "117.43366062641144"
        ]
      },
      "properties": {
        "name": "烯烃北站",
        "ID": 3,
        "cameraIds": "12010254001310000015",
        "online": "8ae64ac4638cbf3e016439dc12490009",
        "addr": "位于烯烃部北厂界",
        "desc": "",
        "dept": "烯烃部"
      }
    },
    {
      "type": "Feature",
      "geometry": {
        "type": "Point",
        "coordinates": [
          "38.84116530418396",
          "117.42481470108032"
        ]
      },
      "properties": {
        "name": "物装站",
        "ID": 4,
        "cameraIds": "12010254001310000012",
        "online": "8ae64ac4638cbf3e016439d45f5a0005",
        "addr": "位于公司东北厂界物装部正门外",
        "desc": "",
        "dept": "物装部"
      }
    },
    {
      "type": "Feature",
      "geometry": {
        "type": "Point",
        "coordinates": [
          "38.80886547541369",
          "117.42767179031944"
        ]
      },
      "properties": {
        "name": "烯烃南站",
        "ID": 5,
        "cameraIds": "12010254001310000011",
        "online": "8ae64ac4638cbf3e016439d560ea0008",
        "addr": "位于烯烃部南厂界",
        "desc": "",
        "dept": "烯烃部"
      }
    },
    {
      "type": "Feature",
      "geometry": {
        "type": "Point",
        "coordinates": [
          "38.8332098722457",
          "117.447918949615"
        ]
      },
      "properties": {
        "name": "生活区站",
        "ID": 6,
        "cameraIds": "12010254001310000013",
        "online": "8ae64ac4638cbf3e016439dd4963000a",
        "addr": "位于公司培训中心院内",
        "desc": "",
        "dept": "生活区"
      }
    },
    {
      "type": "Feature",
      "geometry": {
        "type": "Point",
        "coordinates": [
          "38.8314127922058",
          "117.427905955039"
        ]
      },
      "properties": {
        "name": "安环站",
        "ID": 7,
        "cameraIds": "12010254001310000014",
        "online": "8ae64ac4638cbf3e016439de9875000c",
        "addr": "位于公司东厂界原培训中心院内",
        "desc": "",
        "dept": "安全环保部"
      }
    },
    {
      "type": "Feature",
      "geometry": {
        "type": "Point",
        "coordinates": [
          "38.82397315436005",
          "117.39679098129272"
        ]
      },
      "properties": {
        "name": "炼油站",
        "ID": 8,
        "cameraIds": "12010254001310000009",
        "online": "8ae64ac4638cbf3e016439de2af2000b",
        "addr": "位于公司西南厂界炼油部西南侧",
        "desc": "",
        "dept": "炼油部"
      }
    },
    {
      "type": "Feature",
      "geometry": {
        "type": "Point",
        "coordinates": [
          "38.82355982342607",
          "117.421976923697"
        ]
      },
      "properties": {
        "name": "热电站",
        "ID": 9,
        "cameraIds": "12010254001310000016",
        "online": "8ae64ac4638cbf3e016439d4f1080007",
        "addr": "位于公司东南厂界热电部北门",
        "desc": "",
        "dept": "热电部"
      }
    }
  ]
}

 src/components/BaseNav/PublicBounced/PublicBounced.vue

File was deleted

 src/components/BaseNav/PublicBounced/common/PublicChart.vue

File was deleted

 src/components/BaseNav/PublicBounced/common/PublicDataStandard.vue

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue

File was deleted

 src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue

File was deleted

 src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue

File was deleted

 src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue

File was deleted

 src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue

File was deleted

 src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue

File was deleted

 src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue

File was deleted

 src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue

File was deleted

 src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue

File was deleted

 src/components/BaseNav/WasteGas/DayData.vue

@@ -12,7 +12,7 @@
      <el-select v-model="formData.region" placeholder="请选择" size="mini">
        <el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
      </el-select>
      <el-button>查询</el-button>
      <el-button @click="querySearch">查询</el-button>
      <el-button>明细表</el-button>
    </div>
    <div class="echarts-chart">
@@ -99,6 +99,9 @@
    })
  },
  methods: {
    querySearch () {
      this.initnData()
    },
    async initnData () {
      const data = {
        onLineMonEmissPointId: 23,

 src/components/BaseNav/WasteGas/HourData.vue

@@ -112,6 +112,7 @@
    },
    querySearch () {
      console.log('查询')
      this.initnData()
    },
    async initnData () {
      const data = {
@@ -342,6 +343,7 @@
    },
    CreateChart (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
      this.myChart = this.$echarts.init(this.$refs.wastegashour)
      this.myChart.clear()
      // this.myChart .clear()
      let dataUnit = ''
      if (datatype === 1) {

 src/components/BaseNav/WasteWater/WasteWaterDayChart.vue

@@ -1,25 +1,34 @@
<template>
  <div class="echarts-box">
    <div class="tab-scroll">
      <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
    <div class="echarts-box">
        <div class="tab-scroll">
            <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
            <span class="time-select">{{ formData.timeStart }}日—{{ formData.timeEnd }}日</span>
        </div>
        <div class="echarts-form">
            <span class="demonstration">开始时间：</span>
            <el-date-picker
                    v-model="formData.timeStart"
                    value-format="yyyy-MM-dd"
                    type="datetime">
            </el-date-picker>
            <span class="demonstration">结束时间：</span>
            <el-date-picker
                    v-model="formData.timeEnd"
                    value-format="yyyy-MM-dd"
                    type="datetime">
            </el-date-picker>
            <span class="demonstration">采样点数：</span>
            <el-select v-model="formData.region" placeholder="请选择" style="width: 80px">
                <el-option v-for="(item,index) in formData.regionList" :key="index" :label="item"
                           :value="item"></el-option>
            </el-select>
            <el-button @click="querySearch()">查询</el-button>
            <el-button>明细表</el-button>
        </div>
        <div class="echarts-chart">
            <div style="width:5rem;height:1.5rem;" ref="echartsDay"></div>
        </div>
    </div>
    <div class="echarts-form">
      <span class="demonstration">开始时间：</span>
      <el-date-picker v-model="formData.timeStart" value-format="yyyy-MM-dd" type="datetime" size="mini"></el-date-picker>
      <span class="demonstration">结束时间：</span>
      <el-date-picker v-model="formData.timeEnd" value-format="yyyy-MM-dd" type="datetime" size="mini"></el-date-picker>
      <span class="demonstration">采样点数：</span>
      <el-select v-model="formData.region" placeholder="请选择" size="mini">
        <el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
      </el-select>
      <el-button @click="querySearch()">查询</el-button>
      <el-button>明细表</el-button>
    </div>
    <div class="echarts-chart">
      <div ref="echartsDay"></div>
    </div>
    <span class="time-select">{{ formData.timeStart }}日—{{ formData.timeEnd }}日</span>
  </div>
</template>

<script>
@@ -96,7 +105,7 @@
  },
  methods: {
    querySearch () {

      this.draw24Chart()
    },
    async draw24Chart () {
      const data = {
@@ -381,8 +390,8 @@
      }
      const option = {
        /*  title: {
          text: title,
      }, */
            text: title,
        }, */
        tooltip: { // æç¤ºæ¡†
          trigger: 'axis',
          axisPointer: {

 src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue

@@ -96,7 +96,7 @@
  methods: {
    // ç‚¹å‡»æŸ¥è¯¢åŠŸèƒ½
    querySearch () {

      this.draw24Chart()
    },
    // åˆå§‹åŒ–数据请求
    async draw24Chart () {

 src/components/BaseNav/pipeline/AffiliatedFacilities.vue

@@ -7,26 +7,29 @@
                :visible.sync="dialogVisible"
                :append-to-body="true"
                :modal="false"
                 v-dialogDragBottom
                >
                v-dialogDragBottom
        >
            <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">
                       <div class="el-select el-select--mini">8888</div>
                    </el-form-item> -->
                    <el-form-item label="设施类型：" size="mini" class="search-panel-item">
                        <el-select style="width: 100%"  v-model="dataType" value-key="code" @change="handleDataType" :popper-class="'select-down'">
                            <el-option v-for="(item,index) in classification" :key="index" :label="item.name" :value="item"></el-option>
                        <el-select style="width: 100%" v-model="dataType" value-key="code" @change="handleDataType"
                                   :popper-class="'select-down'">
                            <el-option v-for="(item,index) in classification" :key="index" :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-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:300px;">
                <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':''">
                    <img class="state" :src="getImgSrc()" style="background: none"/>
                    <div>
                        <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
@@ -52,7 +55,7 @@
import AjaxUtils from '@utils/AjaxUtils'
import { LayerFsss } from '@src/conf/layers/LayerFsss'

console.log(LayerFsss, 8888888888)
// console.log(LayerFsss, 8888888888)
export default {
  name: 'AffiliatedFacilities',
  data () {
@@ -123,91 +126,101 @@
}
</script>

<style  lang="less">
.affiliatedFacilities-dialog{
    width: calc(20% - 60px) !important; // calc(30% - 15px);
    left: 60%;
    .el-dialog__body{
        padding: 0.04rem;
        .search-panel {
            background-color: transparent;
            padding: 10px;
            border-bottom: 1px solid @background-color-split;
            // .el-input{width:calc(100% - 40px);position: relative}
            /deep/ input {
                border-radius: 0;
                background-color: @background-color-split;
                border: solid 1px @color;
                color: @color-gray;
                font-size: 0.01rem;
                padding: 0 15px;
<style lang="less">
    .affiliatedFacilities-dialog {
        width: calc(20% - 60px) !important; // calc(30% - 15px);
        left: 60%;

                .el-select .el-input.is-focus .el-input__inner {
        .el-dialog__body {
            padding: 0.04rem;

            .search-panel {
                background-color: transparent;
                padding: 10px;
                border-bottom: 1px solid @background-color-split;
                // .el-input{width:calc(100% - 40px);position: relative}
                /deep/ input {
                    border-radius: 0;
                    background-color: @background-color-split;
                    border: solid 1px @color;
                    color: @color-gray;
                    font-size: 0.01rem;
                    padding: 0 15px;

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

                .el-form-item__label {
                    color: #00fff6
                }

                .el-input__inner {
                    background: none;
                    color: #fff;
                    font-size: 14px;
                    border-radius: 0;
                    border-color: @color;
                    background: rgba(0, 16, 30, .5);
                }
            }
            .el-form-item__label{
                color:#00fff6
            }
            .el-input__inner {
                background: none;
                color: #fff;
                font-size: 14px;
                border-radius: 0;
                border-color: @color;
                background: rgba(0, 16, 30, .5);
            }
        }
        /*input ç‚¹å‡»æœç´¢æ ·å¼*/

        .rightButtonSearch {
            display: flex;
            justify-content: space-between;
            align-items: center;
            /*input ç‚¹å‡»æœç´¢æ ·å¼*/

            .el-input {
                margin-right: 10px
            .rightButtonSearch {
                display: flex;
                justify-content: space-between;
                align-items: center;

                .el-input {
                    margin-right: 10px
                }

                .el-icon-search {
                    width: 40px;
                    border: 1px solid @color;
                    height: 28px;
                    line-height: 28px;
                    text-align: center;
                    color: #fff;
                    border-radius: 2px;
                    cursor: pointer;
                    background: rgba(0, 16, 30, .5);
                    padding: 0;
                }
            }

            .el-icon-search {
                width: 40px;
                border: 1px solid @color;
                height: 28px;
                line-height: 28px;
                text-align: center;
                color: #fff;
                border-radius: 2px;
                cursor: pointer;
                background: rgba(0, 16, 30, .5);
                padding: 0;
            }
        }
        .environmental-risk-list {
            position: relative;
            padding-left: 50px;
            padding-top: 5px;
            padding-bottom: 5px;
            color: @color-shadow;
            border-bottom: 1px solid @background-color-split;
            h3{ cursor: pointer;}
            .state {
                width: 30px;
                height: 30px;
                position: absolute;
                top: 50%;
                left: 10px;
                margin-top: -15px;
                border-radius: 50%;
                box-shadow: 0 0 3px #000;
                background: #0B3B6D;
            }
        }
            .environmental-risk-list {
                position: relative;
                padding-left: 50px;
                padding-top: 5px;
                padding-bottom: 5px;
                color: @color-shadow;
                border-bottom: 1px solid @background-color-split;

        .environmental-risk-list.hover,
        .environmental-risk-list:hover {
            color: @color-highlight;
            background: @background-color;
                h3 {
                    cursor: pointer;
                }

                .state {
                    width: 30px;
                    height: 30px;
                    position: absolute;
                    top: 50%;
                    left: 10px;
                    margin-top: -15px;
                    border-radius: 50%;
                    box-shadow: 0 0 3px #000;
                    background: #0B3B6D;
                }
            }

            .environmental-risk-list.hover,
            .environmental-risk-list:hover {
                color: @color-highlight;
                background: @background-color;
            }
        }
    }
}
</style >
</style>

 src/components/LayerController/logic/EnterpriseEmergency.js

@@ -2,6 +2,28 @@
 * ä¼ä¸šåº”急
 */

module.exports = function () {
// ä½¿ç”¨å°è£…方法
const AnimalService = require('../service/AnimalService').default

module.exports = function () {
  this.init = async (layer, L) => {
    this.animalService = new AnimalService({
      L: L,
      layer: layer
    })
  }
  this.bindTooltip = (layer) => {
    return 'layer'
  }
  this.click = () => {
    window.$layer.open({
      content: {
        content: 'Popup', // ç»„件
        data: { // ä¼ é€’的参数
          datas: 'popupDatas'
        }
      },
      title: ''
    })
  }
}

 src/components/LayerController/logic/WasteGasChats.js

File was deleted

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

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

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

File was renamed from src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -55,10 +55,10 @@
<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 { LayerEmergencySource } from '../../../../conf/layers/LayerEmergencySource'
import { LayerSurroundings } from '../../../../conf/layers/LayerSurroundings'
import { pulseEffect } from '../../../../utils/utils'

export default {
  name: 'ResourcesQuery',
@@ -66,7 +66,7 @@
    return {
      form: {
        eventName: '',
        pipelineType: '应急资源',
        pipelineType: LayerEmergencySource.name,
        dataType: '',
        keyword: '',
        eventNameList: [
@@ -107,7 +107,7 @@
      }
    },
    handleDataType (val) {
      console.log(val)
      // console.log(val)
      this.list = []
    },
    async handleSearch () {
@@ -129,9 +129,11 @@
        this.list = res.features
      }
    },
    // æŸ¥è¯¢å®šä½åŠŸèƒ½
    handleLocation (val, index) {
      this.activeNum = index
      window.map.flyTo([val.properties.y, val.properties.x], 15)
      window.map.setView([val.properties.y, val.properties.x], 16)
      pulseEffect([val.properties.y, val.properties.x])
    }
  }
}

 src/components/panel/topicSearch/GasWasteSearch.vue

@@ -99,6 +99,7 @@
<script>
import mapApi from '@/api/mapApi'
import WasteWaterIndex from '../../BaseNav/WasteWater/WasteWaterIndex'
import { pulseEffect, setPanTo } from '../../../utils/utils'

export default {
  name: 'GasWasteSearch',
@@ -165,7 +166,7 @@
    async handleLocation (val) {
      console.log(val)
      const pos = [val.Latitude, val.Longitude]
      window.map.flyTo(pos, 15)
      window.map.setView(pos, 15)
      window.$layer.open({
        content: {
          content: WasteWaterIndex, // ç»„件
@@ -176,6 +177,8 @@
        },
        title: '天津石化  ' + val.Name
      })
      pulseEffect([val.Latitude, val.Longitude])
      setPanTo(pos, 250)
    }
  }
}

 src/components/panel/topicSearch/ReportSearch.vue

@@ -14,8 +14,8 @@
</template>

<script>
import EventQuery from './SewersSelect/EnterpriseEmergency/EventQuery'
import ResourcesQuery from './SewersSelect/EnterpriseEmergency/ResourcesQuery'
import EventQuery from './EnterpriseEmergency/EventQuery'
import ResourcesQuery from './EnterpriseEmergency/ResourcesQuery'
// import ReportPopup from './SewersSelect/EnterpriseEmergency/ReportPopup'

export default {

 src/components/panel/topicSearch/SolidWasteSearch.vue

@@ -1,50 +1,52 @@
<template>
  <div class="sewers-search" v-if="judgeVisible">
    <div class="panel-title">{{ title }}</div>
    <div class="search-panel ">
      <el-form ref="form" :model="form" label-width="90px" class="search-form">
        <el-form-item v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="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.labelList"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-radio-group v-model="form.transferData" class="levelOfRisk">
          <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
            <span class="levelOfRisk-type">{{ item.name }}</span>
          </el-radio>
        </el-radio-group>
        <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 class="sewers-search" v-if="judgeVisible">
        <div class="panel-title">{{ title }}</div>
        <div class="search-panel ">
            <el-form ref="form" :model="form" label-width="90px" class="search-form">
                <el-form-item v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="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.labelList"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                        </el-option>
                    </el-select>
                </el-form-item>
                <el-radio-group v-model="form.transferData" class="levelOfRisk">
                    <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
                        <span class="levelOfRisk-type">{{ item.name }}</span>
                    </el-radio>
                </el-radio-group>
                <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-form>
        <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>
                    <p>所属部门：<span>{{ item.Name }}</span></p>
                    <p>风险级别：<span>三级</span></p>
                </div>
            </div>
        </el-scrollbar>
    </div>
    <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>
          <p>所属部门：<span>{{ item.Name }}</span></p>
          <p>风险级别：<span>三级</span></p>
        </div>
      </div>
    </el-scrollbar>
  </div>
</template>

<script>

import mapApi from '@/api/mapApi'
import WasteSolidIndex from '@/components/BaseNav/WasteSolid/WasteSolidIndex'
import { pulseEffect, setPanTo } from '../../../utils/utils'

export default {
  name: 'SolidWasteSearch',
@@ -159,7 +161,7 @@
    setBounced (val) {
      // console.log(val)
      const pos = [val.Latitude, val.Longitude]
      window.map.flyTo(pos, 15)
      window.map.setView(pos, 15)
      window.$layer.open({
        content: {
          content: WasteSolidIndex, // ç»„件
@@ -170,6 +172,8 @@
        },
        title: val.Name
      })
      pulseEffect([val.Latitude, val.Longitude])
      setPanTo(pos, 250)
    }
  }
}

 src/components/panel/topicSearch/WaterWasteSearch.vue

@@ -1,104 +1,111 @@
<template>
  <div class="sewers-search" v-if="gdVisible">
    <div class="panel-title">{{title}}</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.areaVal" @change="areaType"  :popper-class="'select-down'">
            <el-option
                v-for="item in inareaTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="企业名称：" size="mini">
          <el-select style="width: 100%"  v-model="form.enterpriseVal"  @change="enterpriseType" :popper-class="'select-down'">
            <el-option
                v-for="item in enterpriseTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="二级单位：" size="mini">
          <el-select style="width: 100%"  v-model="form.enterpriseSubunitsVal"  @change="enterpriseSubunitsType" :popper-class="'select-down'">
            <el-option
                v-for="item in enterpriseSubunitsTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="三级单位：" size="mini">
          <el-select style="width: 100%"  v-model="form.enterpriseSubunitsVal"  @change="enterpriseSubunitsType" :popper-class="'select-down'">
            <el-option
                v-for="item in enterpriseSubunitsTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <!--        <el-form-item label="风险级别" size="mini"></el-form-item>-->
        <el-radio-group v-model="form.type" class="levelOfRisk">
          <el-radio  v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}</span></el-radio>
        </el-radio-group>
        <!--              <el-form-item >-->
        <div class="rightButtonSearch">
          <el-input  v-model="form.keyword" size="mini"  placeholder="在此输入关键字搜索">
            <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
            <!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
            <!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
          </el-input>
          <el-button class="el-icon-search" @click="handleSearch"></el-button>
    <div class="sewers-search" v-if="gdVisible">
        <div class="panel-title">{{title}}</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.areaVal" @change="areaType"
                               :popper-class="'select-down'">
                        <el-option
                                v-for="item in inareaTypeOptions"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                        </el-option>
                    </el-select>
                </el-form-item>
                <el-form-item label="企业名称：" size="mini">
                    <el-select style="width: 100%" v-model="form.enterpriseVal" @change="enterpriseType"
                               :popper-class="'select-down'">
                        <el-option
                                v-for="item in enterpriseTypeOptions"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                        </el-option>
                    </el-select>
                </el-form-item>
                <el-form-item label="二级单位：" size="mini">
                    <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType"
                               :popper-class="'select-down'">
                        <el-option
                                v-for="item in enterpriseSubunitsTypeOptions"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                        </el-option>
                    </el-select>
                </el-form-item>
                <el-form-item label="三级单位：" size="mini">
                    <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType"
                               :popper-class="'select-down'">
                        <el-option
                                v-for="item in enterpriseSubunitsTypeOptions"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                        </el-option>
                    </el-select>
                </el-form-item>
                <!--        <el-form-item label="风险级别" size="mini"></el-form-item>-->
                <el-radio-group v-model="form.type" class="levelOfRisk">
                    <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span
                            class="levelOfRisk-type">{{item.name}}</span></el-radio>
                </el-radio-group>
                <!--              <el-form-item >-->
                <div class="rightButtonSearch">
                    <el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索">
                        <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
                        <!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
                        <!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
                    </el-input>
                    <el-button class="el-icon-search" @click="handleSearch"></el-button>
                </div>
                <!--              </el-form-item>-->
                <!--              <el-form-item>-->
                <!--                <input type="button" class="btn-ok" @click="handleSearch" value="查询">-->
                <!--                <input type="button" class="btn-reset" @click="handleSearch" value="重置">-->
                <!--              </el-form-item>-->
            </el-form>
        </div>
        <!--              </el-form-item>-->
        <!--              <el-form-item>-->
        <!--                <input type="button" class="btn-ok" @click="handleSearch" value="查询">-->
        <!--                <input type="button" class="btn-reset" @click="handleSearch" value="重置">-->
        <!--              </el-form-item>-->
      </el-form>
    </div>
    <el-scrollbar style="height:264px">
      <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" @click="handleLocation(item)"><!--  -->
        <img src="../../../../public/assets/images/map/exhaust/fq_green2.png" alt="" class="state"/>
        <div>
          <h3>{{ item.Name }}</h3>
          <p>所属部门：<span>{{ item.porltName }}</span></p>
          <p>风险级别：<span>三级</span></p>
        </div>
      </div>
        <el-scrollbar style="height:264px">
            <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
                 @click="handleLocation(item)"><!--  -->
                <img src="../../../../public/assets/images/map/exhaust/fq_green2.png" alt="" class="state"/>
                <div>
                    <h3>{{ item.Name }}</h3>
                    <p>所属部门：<span>{{ item.porltName }}</span></p>
                    <p>风险级别：<span>三级</span></p>
                </div>
            </div>

    </el-scrollbar>
    <!--   <span class="location-btn" @click="handleLocation(item)">588</span> -->
    <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>
  <!--        <div class="monitor2" v-if="hbVisible">-->
  <!--          <env-protect-search></env-protect-search>-->
  <!--        </div>-->
  <!--        <div class="monitor2" v-if="pkVisible">-->
  <!--          <discharge-search></discharge-search>-->
  <!--        </div>-->
        </el-scrollbar>
        <!--   <span class="location-btn" @click="handleLocation(item)">588</span> -->
        <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>
    <!--        <div class="monitor2" v-if="hbVisible">-->
    <!--          <env-protect-search></env-protect-search>-->
    <!--        </div>-->
    <!--        <div class="monitor2" v-if="pkVisible">-->
    <!--          <discharge-search></discharge-search>-->
    <!--        </div>-->
</template>
<script>

import mapApi from '@/api/mapApi'
import WasteWaterIndex from '../../BaseNav/WasteWater/WasteWaterIndex'
import { pulseEffect, setPanTo } from '../../../utils/utils'

export default {
  name: 'WaterWasteSearch',
@@ -122,11 +129,26 @@
      isWaybillHover: true,
      isRouteHover: false,
      levelOfRisk: [
        { name: '全部', value: '1' },
        { name: '正常', value: '2' },
        { name: '超标', value: '3' },
        { name: '异常', value: '4' },
        { name: '停产', value: '5' }
        {
          name: '全部',
          value: '1'
        },
        {
          name: '正常',
          value: '2'
        },
        {
          name: '超标',
          value: '3'
        },
        {
          name: '异常',
          value: '4'
        },
        {
          name: '停产',
          value: '5'
        }
      ]
    }
  },
@@ -164,10 +186,10 @@
      console.log(this.list)
    },
    // å¼¹çª—展示
    async handleLocation (val) {
    handleLocation (val) {
      console.log(val)
      const pos = [val.Latitude, val.Longitude]
      window.map.flyTo(pos, 15)
      window.map.setView(pos, 15)
      window.$layer.open({
        content: {
          content: WasteWaterIndex, // ç»„件
@@ -178,6 +200,8 @@
        },
        title: '天津石化  ' + val.Name
      })
      pulseEffect([val.Latitude, val.Longitude])
      setPanTo(pos, 250)
    }
  }
}

 src/views/MapTemplate.vue

@@ -16,7 +16,7 @@
        <!--    <el-button type="primary" @click="ChangeState" class="solid-waste">固废</el-button>-->
        <!--    <el-button type="primary" @click="ChangeWaterState" class="Waste-water">废水</el-button>-->
        <!--    <el-button type="primary" @click="AddGasHelper" class="flue-gas">废气</el-button>-->
        <PublicBounced ref="PublicBounced"></PublicBounced>
<!--        <PublicBounced ref="PublicBounced"></PublicBounced>-->
<!--            <ReportPopup></ReportPopup>-->
        <Emergency ref="Emergency"></Emergency>
    </div>
@@ -36,7 +36,7 @@
import LegendPanel from '@components/panel/LegendPanel'
// import Enterprise from '../components/table/enterprise'
// // å…¬å…±å±•ç¤ºæ•°æ®
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
import EventHandler from '../components/LayerController/event/EventHandler'
// import ReportPopup from '../components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup'
@@ -54,7 +54,7 @@
    MonitorPanel,
    // summarySheets,
    SummarySheet,
    PublicBounced,
    // PublicBounced,
    Emergency
    // ReportPopup
  },

 src/views/Temp.vue

@@ -15,7 +15,7 @@
    <!--    <el-button type="primary" @click="ChangeState" class="solid-waste">固废</el-button>-->
    <!--    <el-button type="primary" @click="ChangeWaterState" class="Waste-water">废水</el-button>-->
    <!--    <el-button type="primary" @click="AddGasHelper" class="flue-gas">废气</el-button>-->
    <PublicBounced ref="PublicBounced"></PublicBounced>
<!--    <PublicBounced ref="PublicBounced"></PublicBounced>-->
  </div>
</template>

@@ -33,7 +33,7 @@
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
// // å…¬å…±å±•ç¤ºæ•°æ®
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
// import '../components/plugin/Leaflet.TileLayer.ProjWMTS'
// import * as L from 'leaflet'
@@ -54,8 +54,8 @@
    SgisLayerController,
    MonitorPanel,
    Popup,
    summarySheets,
    PublicBounced
    summarySheets
    // PublicBounced
  },
  data () {
    return {

 src/views/popup/Popup.vue

@@ -42,7 +42,7 @@
          obj[this.props[key]] = content[key]
        }
      }
      console.log(obj)
      // console.log(obj)
      return obj
    },
    setDatas (layer) {