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

yangdelong

2021-04-07 f3f693a10d00b75f1eafe7f029cbd99bd3c9825b

 src/components/panel/topicSearch/DischargeSearch.vue

@@ -1,5 +1,5 @@
<template>
  <div class="sewers-search" v-if="gdVisible">
  <div class="query-search" v-if="gdVisible">
    <div class="search-title">{{title}}</div>
    <div class="search-panel ">
      <el-form ref="form" :model="form" label-width="90px" class="search-form">
@@ -44,8 +44,8 @@
        </div>
      </el-form>
    </div>
    <el-scrollbar style="height:300px">
      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
    <el-scrollbar style="height:416.44px">
      <div class="environmental-risk-list hover" ><!-- v-for="(item,index) in list" :key="index" -->
        <i class="state"></i>
        <div>
          <h3>###炼化部</h3>