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

chenyabin

2021-03-31 2596ad89b4a57d2129f0a58cbc77d364eeaf412d

 src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue

@@ -6,8 +6,8 @@
    <el-tab-pane label="月数据" name="third">月数据</el-tab-pane>
    <el-tab-pane label="人工数据" name="fourth">人工数据</el-tab-pane>
  </el-tabs>
  <EchartsTab :></EchartsTab>
  <GasECharts></GasECharts>>
<!--  <EchartsTab></EchartsTab>-->
<!--  <GasECharts></GasECharts>>-->
</div>
</template>