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

chenzeping

2021-04-06 6f6696463e911e92c9fa9f4e27bfb788768c5f3f

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -6,14 +6,16 @@
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <GasTab :displayContentTab="displayContentTab"></GasTab>
        <public-tabs :displayContentTab="displayContentTab" :value="value"
                     :setWasteGasdata="setWasteGasdata"></public-tabs>
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
          <GasECharts v-else></GasECharts>
          <public-table v-if="value === 'gufei'"
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else></public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <GasVideo></GasVideo>
        <public-video></public-video>
      </div>
    </div>
  </div>
@@ -22,35 +24,42 @@
<script>

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

export default {
  name: 'PublicBounced',
  components: {
    GasTab,
    PublicTabs,
    PublicTable,
    GasECharts,
    GasVideo
    PublicChart,
    PublicVideo
  },
  data () {
    return {
      setWasteGasdata: '',
      displayContentTitle: '',
      displayContentTab: '',
      displayContentTable: '',
      flag: false
      flag: false,
      value: ''
    }
  },
  methods: {
    setData (dataBasic, dataDetailed, value) {
      this.flag = true
      this.value = value
      dataBasic.forEach(item => {
        this.displayContentTitle = item.StoragePlaceName
      })
      this.displayContentTab = dataBasic
      this.displayContentTable = dataDetailed
    },
    setGasData (data, value) {
      this.setWasteGasdata = data
      this.displayContentTitle = data.Name
      this.flag = true
      this.value = value
    },
@@ -94,20 +103,22 @@
  .public-bounced-content {
    margin: 15px auto;
    display: flex;
    //align-items: center;
    align-items: center;
    justify-content: space-around;
    padding: 10px;

    .public-bounced-content-left {
      flex: 3;
      height: 100%;
      margin-right: 10px;
      //width: 64%;
      //height: 100%;
      //margin-right: 10px;
    }

    .public-bounced-content-right {
      flex: 2;
      //width: 48%;
      height: 100%;
      margin-left: 10px;
      //width: 34%;
      //height: 100%;
    }
  }
}