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

chenyabin

2021-03-31 97e8d550c9867f7a92c56060835db2969e6fca2e

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,5 +1,5 @@
<template>
  <div class="public-bounced" v-draw v-show="flag">
  <div class="public-bounced" v-if="flag">
    <div class="public-bounced-title">
      <span>{{ displayContent.Name }}</span>
      <i class="el-icon-circle-close" @click="closePopup"></i>
@@ -7,8 +7,10 @@
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <GasTab :displayContent="displayContent"></GasTab>
        <!--        <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
        <!--        <GasECharts v-else></GasECharts>-->
        <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
        <GasECharts v-else></GasECharts>
        <!--        <PublicTable></PublicTable>-->
        <!--        <GasECharts></GasECharts>-->
      </div>
      <div class="public-bounced-content-right">
        <GasVideo></GasVideo>
@@ -21,16 +23,16 @@

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 PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'

export default {
  name: 'PublicBounced',
  components: {
    GasTab,
    // PublicTable,
    // GasECharts,
    PublicTable,
    GasECharts,
    GasVideo
  },
  data () {
@@ -40,11 +42,19 @@
    }
  },
  methods: {
    setData (data) {
    setData (data, value) {
      console.log(data)
      console.log(value)
      this.displayContent = data
      this.flag = true
      // this.value = value
      this.value = value
      console.log(this.flag)
    },
    // setData (data) {
    //   this.displayContent = data
    //   this.flag = true
    //   // this.value = value
    // },
    closePopup () {
      this.flag = false
    }
@@ -85,19 +95,21 @@
  .public-bounced-content {
    margin: 15px auto;
    display: flex;
    align-items: center;
    //align-items: center;
    justify-content: space-around;
    padding: 10px;

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

    .public-bounced-content-right {
      width: 48%;
      flex: 2;
      //width: 48%;
      height: 100%;
    }
  }

}
</style>