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

chenyabin

2021-04-13 3c93d885a3bc6a84079cc347bb30888d5fb98f11

 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("ECharts")'>实时数据</li>
            <li @click='tabTaggle("EChartsHour")'>小时数据</li>
            <li @click='tabTaggle("EChartsHourWasteWater")'>日数据</li>
            <li @click='tabTaggle("ECharts")'>人工数据</li>
            <li @click='tabTaggle("EChartsDate")'>日数据</li>
            <li @click='tabTaggle("EChartsTable")'>人工数据</li>
        </ul>
        <div class="legend" >
            <span >正常</span>
@@ -24,15 +24,21 @@

<script>
import EChartsHour from './EChartsHour'
import EChartsDate from './EChartsDate'
import ECharts from './Echarts'
// import EChartsDate from './EChartsDate'
import EChartsHourWasteWater from './EChartsHourWasteWater'
import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'

export default {
  name: 'PublicChart',
  components: {
    EChartsHour,
    EChartsDate,
    ECharts,
    // EChartsDate
    EChartsHourWasteWater
    EChartsHourWasteWater,
    EChartsTable
  },
  data () {
    return {
@@ -42,6 +48,7 @@
  methods: {
    tabTaggle (taggleMenu) {
      this.currentTab = taggleMenu
      // debugger
    }
  }
}
@@ -108,10 +115,10 @@
    margin-right: 10px;
    padding:0 15px
}

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