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

wangqi

2021-04-07 564d0ab88c6ddf0b3d56a9eeba5ee72d6fff01b9

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

@@ -5,9 +5,9 @@
        <div class="border_corner border_corner_left_bottom"></div>
        <div class="border_corner border_corner_right_bottom"></div>
        <ul class="tab">
            <li @click='tabTaggle("ECharts")'>实试数据</li>
            <li @click='tabTaggle("ECharts")'>实时数据</li>
            <li @click='tabTaggle("ECharts")'>小时数据</li>
            <li @click='tabTaggle("ECharts")'>日数据</li>
            <li @click='tabTaggle("ECharts")'>月数据</li>
            <li @click='tabTaggle("ECharts")'>人工数据</li>
        </ul>
        <component :is="currentTab" v-bind="$attrs"></component>
@@ -30,6 +30,7 @@
  methods: {
    tabTaggle (taggleMenu) {
      this.currentTab = taggleMenu
      debugger
    }
  }
}