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

chenyabin

2021-04-14 faadb3a39e89b2cb7a00e81e3778f480f1f09998

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

@@ -4,15 +4,17 @@
        <div class="border_corner border_corner_right_top"></div>
        <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("EChartsDate")'>人工数据</li>-->
        <ul class="tab" v-if="this.$attrs.value === 'feiqi'">
            <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("EChartsDate",2)'>日数据</li>
            <li :class="active==3?'hover':''" @click='tabTaggle("EChartsTable",3)'>人工数据</li>
        </ul>
        <ul class="tab" v-else>
            <li :class="active==0?'hover':''" @click='tabTaggle("EChartsRealWasteWater",0)'>实时数据</li>
            <li :class="active==1?'hover':''" @click='tabTaggle("EChartsHourWasteWater",1)'>小时数据</li>
            <li :class="active==2?'hover':''" @click='tabTaggle("EChartsDateWasteWater",2)'>日数据</li>
            <li :class="active==3?'hover':''" @click='tabTaggle("EChartsWasteWaterTable",3)'>人工数据</li>
        </ul>
        <div class="legend" >
            <span >正常</span>
@@ -27,12 +29,15 @@
</template>

<script>
import ECharts from './echarts/Echarts'
import EChartsHour from './echarts/EChartsHour'
import EChartsDate from './echarts/EChartsDate'
import ECharts from './echarts/Echarts'
// import EChartsDate from './EChartsDate'
import EChartsTable from './echarts/EChartsTable'

import EChartsRealWasteWater from './echarts/EChartsRealWasteWater'
import EChartsHourWasteWater from './echarts/EChartsHourWasteWater'
import EChartsTable from '@components/BaseNav/PublicBounced/common/echarts/EChartsTable'
import EChartsDateWasteWater from './echarts/EChartsDateWasteWater'
import EChartsWasteWaterTable from './echarts/EChartsWasteWaterTable'

export default {
  name: 'PublicChart',
@@ -40,16 +45,19 @@
    EChartsHour,
    EChartsDate,
    ECharts,
    // EChartsDate
    EChartsTable,
    EChartsRealWasteWater,
    EChartsHourWasteWater,
    EChartsTable
    EChartsDateWasteWater,
    EChartsWasteWaterTable
  },
  mounted () {
    this.$refs.Echatrs.CreateChart()
    this.$refs.Echatrs.effChartShow()
  },
  data () {
    return {
      currentTab: 'EChartsHour',
      currentTab: this.current(),
      active: '1'
    }
  },
@@ -58,6 +66,14 @@
      this.currentTab = taggleMenu
      this.active = num
      // debugger
    },
    current (currentTab) {
      if (this.$attrs.value === 'feishui') {
        currentTab = 'EChartsHourWasteWater'
      } else {
        currentTab = 'EChartsHour'
      }
      return currentTab
    }
  }
}