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

zhangshuaibao

2021-04-12 188abb2598a9253b19762d0cf4c4b36db64bfe8b

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

@@ -5,10 +5,10 @@
        <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("EChartsHour")'>小时数据</li>
            <li @click='tabTaggle("EChartsDate")'>日数据</li>
            <li @click='tabTaggle("ECharts")'>人工数据</li>
            <li :class="active==0?'hover':''" @click='tabTaggle("Echarts",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>
        </ul>
        <div class="legend" >
            <span >正常</span>
@@ -24,22 +24,26 @@

<script>
import EChartsHour from './EChartsHour'
import EChartsDate from './EChartsDate'
// import EChartsDate from './EChartsDate'
import EChartsHourWasteWater from './EChartsHourWasteWater'

export default {
  name: 'PublicChart',
  components: {
    EChartsHour,
    EChartsDate
    // EChartsDate
    EChartsHourWasteWater
  },
  data () {
    return {
      currentTab: 'EChartsHour'
      currentTab: 'EChartsHour',
      active: '0'
    }
  },
  methods: {
    tabTaggle (taggleMenu) {
    tabTaggle (taggleMenu, num) {
      this.currentTab = taggleMenu
      this.active = num
      // debugger
    }
  }
@@ -107,10 +111,10 @@
    margin-right: 10px;
    padding:0 15px
}

.tab li.hover,
.tab li:hover {
  background-color: #0e639e;
  color: #682000;
  color: #fff;
  cursor: pointer;
}
.legend{