Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

wangqi

2021-04-01 087cfed8ff5af06f5686b9d772bb71471102abe3

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -8,8 +8,8 @@
      <div class="public-bounced-content-left">
        <GasTab :displayContentTab="displayContentTab"></GasTab>
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
          <GasECharts v-else></GasECharts>
          <PublicTable v-if="value === 'gufei'"></PublicTable>
          <GasTabs v-else></GasTabs>
        </div>
      </div>
      <div class="public-bounced-content-right">
@@ -24,16 +24,15 @@
import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
// import GasTabs from './GasComponents/GasTabs'
import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'

export default {
  name: 'PublicBounced',
  components: {
    GasTabs,
    GasTab,
    PublicTable,
    GasECharts,
    GasVideo
  },
  data () {
@@ -46,7 +45,6 @@
  },
  methods: {
    setData (dataBasic, dataDetailed, value) {
      console.log(dataDetailed)
      dataBasic.forEach(item => {
        this.displayContentTitle = item.StoragePlaceName
      })