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

wangqi

2021-03-31 e0eb378045eb18117fcf0a1eac6dad57ce6f743b

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

@@ -6,14 +6,17 @@
    <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>

<script>
// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
export default {
  name: 'GasTabs'
  name: 'GasTabs',
  components: {}
  // GasECharts
}
</script>