Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

chenzeping

2021-04-14 e904d8923e3bd070682dd8279001a8732016b82e

Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop


 Conflicts:

	src/components/panel/topicSearch/GasWasteSearch.vue

 src/components/panel/topicSearch/GasWasteSearch.vue

@@ -1,10 +1,10 @@
<template>
  <div class="sewers-search" v-if="gdVisible">
    <div class="panel-title">{{ title }}</div>
    <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-select style="width: 100%"  v-model="form.areaVal" @change="areaType"  :popper-class="'select-down'">
            <el-option
                v-for="item in inareaTypeOptions"
                :key="item.value"
@@ -14,8 +14,7 @@
          </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-select style="width: 100%"  v-model="form.enterpriseVal"  @change="enterpriseType" :popper-class="'select-down'">
            <el-option
                v-for="item in enterpriseTypeOptions"
                :key="item.value"
@@ -25,8 +24,7 @@
          </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-select style="width: 100%"  v-model="form.enterpriseSubunitsVal"  @change="enterpriseSubunitsType" :popper-class="'select-down'">
            <el-option
                v-for="item in enterpriseSubunitsTypeOptions"
                :key="item.value"
@@ -36,8 +34,7 @@
          </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-select style="width: 100%"  v-model="form.enterpriseSubunitsVal"  @change="enterpriseSubunitsType" :popper-class="'select-down'">
            <el-option
                v-for="item in enterpriseSubunitsTypeOptions"
                :key="item.value"
@@ -46,14 +43,13 @@
            </el-option>
          </el-select>
        </el-form-item>
        <!--        <el-form-item label="风险级别" size="mini"></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  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-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> -->
@@ -68,7 +64,7 @@
      </el-form>
    </div>
    <el-scrollbar style="height:264px">
      <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
        <i class="state"></i>
        <div>
          <h3>###炼化部</h3>
@@ -101,10 +97,6 @@
</template>

<script>

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

import mapApi from '@/api/mapApi'

// import WfsHelper from '@components/helpers/WfsHelper'
@@ -114,7 +106,6 @@
    return {
      gdVisible: true,
      list: [],
      // labelList: PipelineTypeOptions[0].labelList,
      total: 0,
      inareaTypeOptions: [],
      enterpriseTypeOptions: [],
@@ -130,26 +121,11 @@
      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' }
      ]
    }
  },