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

yangdelong

2021-04-07 c6d73ab9748dcafb3977f3e7acfaf4257b270408

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

@@ -10,7 +10,7 @@
            <li @click='tabTaggle("ECharts")'>月数据</li>
            <li @click='tabTaggle("ECharts")'>人工数据</li>
        </ul>
        <component :is="currentTab"></component>
        <component :is="currentTab" v-bind="$attrs"></component>
    </div>
</template>