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

chenyabin

2021-05-10 204b8af237555feb1af83250dfdc28a5dc0a467c

 src/components/BaseNav/WasteGas/WasteGasRealChart.vue

@@ -22,7 +22,6 @@
        <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="echarts"></div>