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

chenyabin

2021-04-13 1bf1ebe9830b985185c19a4de442e9596c1d1f29

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

@@ -5,7 +5,7 @@
        <div class="border_corner border_corner_left_bottom"></div>
        <div class="border_corner border_corner_right_bottom"></div>
        <ul class="tab">
            <li :class="active==0?'hover':''" @click='tabTaggle("Echarts",0)'>实时数据</li>
            <li :class="active==0?'hover':''" @click='tabTaggle("EChartsHour",0)'>实时数据</li>
            <li :class="active==1?'hover':''" @click='tabTaggle("EChartsHour",1)'>小时数据</li>
            <li :class="active==2?'hover':''" @click='tabTaggle("EChartsHourWasteWater",2)'>日数据</li>
            <li :class="active==3?'hover':''" @click='tabTaggle("ECharts",3)'>人工数据</li>
@@ -18,7 +18,7 @@
            <span >超标</span>
            <i style=" background: orange;"></i>
        </div>
        <component :is="currentTab" v-bind="$attrs"></component>
        <component :is="currentTab"></component>
    </div>
</template>