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

徐旺旺

2021-04-01 896634d49ec0991b3859e7e4813ff95d9dac352c

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -6,9 +6,9 @@
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <GasTab :displayContentTab="displayContentTab" ></GasTab>
        <GasTab :displayContentTab="displayContentTab"></GasTab>
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'"></PublicTable>
          <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
          <GasECharts v-else></GasECharts>
        </div>
      </div>
@@ -22,10 +22,10 @@
<script>

import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
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 GasVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
// import GasTabs from './GasComponents/GasTabs'

export default {
@@ -40,16 +40,17 @@
    return {
      displayContentTitle: '',
      displayContentTab: '',
      displayContentTable: '',
      flag: false
    }
  },
  methods: {
    setData (data, value) {
      // data.forEach((item, index) => {
      //   // console.log(item.StoragePlaceName)
      //   // this.displayContentTitle = item.StoragePlaceName
      // })
      this.displayContentTab = data
    setData (dataBasic, dataDetailed, value) {
      dataBasic.forEach(item => {
        this.displayContentTitle = item.StoragePlaceName
      })
      this.displayContentTab = dataBasic
      this.displayContentTable = dataDetailed
      this.flag = true
      this.value = value
    },