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

chenyabin

2021-05-13 c074d3bf22a735722b5e1b6659863393f2fb1e41

 src/components/panel/topicSearch/DischargeSearch.vue

@@ -4,7 +4,8 @@
    <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-select style="width: 100%" v-model="form.areaVal" @change="areaType"
                               :popper-class="'select-down'">
            <el-option
                v-for="item in areaTypeOptions"
                :key="item.value"
@@ -48,7 +49,7 @@
      <div class="environmental-risk-list hover" ><!-- v-for="(item,index) in list" :key="index" -->
        <i class="state"></i>
        <div>
          <h3>###炼化部</h3>
                    <h3 @click="flyto">###炼化部</h3>
          <p>所属部门：<span>炼化部</span></p>
          <p>风险级别：<span>三级</span></p>
        </div>
@@ -119,6 +120,7 @@
<script>
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'

export default {
  name: 'DischargeSearch',
  data () {
@@ -140,16 +142,36 @@
      isWaybillHover: true,
      isRouteHover: false,
      levelOfRisk: [
        { name: '重大风险', value: '1', color: 'red' },
        { name: '一级风险', value: '2', color: 'sandybrown' },
        { name: '二级风险', value: '3', color: 'yellow' },
        { name: '三级风险', value: '4', color: 'green' }
        {
          name: '重大风险',
          value: '1',
          color: 'red'
        },
        {
          name: '一级风险',
          value: '2',
          color: 'sandybrown'
        },
        {
          name: '二级风险',
          value: '3',
          color: 'yellow'
        },
        {
          name: '三级风险',
          value: '4',
          color: 'green'
        }
      ],
      areaTypeOptions: []
    }
  },
  props: ['title'],
  methods: {
    flyto () {
      const pos = [39.90751504898071, 116.38927817344666]
      window.map.flyTo(pos, 15)
    },
    // 区域筛选
    areaType (val) {
      this.pipelineTypeOptions.forEach((itm) => {