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

徐旺旺

2021-03-30 eb6674449920c5452811feee3d82f6c6b965089d

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -6,8 +6,9 @@
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <GasTable :displayContent="displayContent"></GasTable>
        <GasECharts></GasECharts>
        <GasTab :displayContent="displayContent"></GasTab>
        <PublicTable v-if="value === 'gufei'"></PublicTable>
        <GasECharts v-else></GasECharts>
      </div>
      <div class="public-bounced-content-right">
        <GasVideo></GasVideo>
@@ -19,14 +20,16 @@
<script>

import '@/components/BaseNav/SolidWaste/directive'
import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
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'

export default {
  name: 'PublicBounced',
  components: {
    GasTable,
    GasTab,
    PublicTable,
    GasECharts,
    GasVideo
  },
@@ -37,9 +40,10 @@
    }
  },
  methods: {
    setData (data) {
    setData (data, value) {
      this.displayContent = data
      this.flag = true
      this.value = value
    },
    closePopup () {
      this.flag = false
@@ -51,7 +55,7 @@
<style lang="less" scoped>
.public-bounced {
  z-index: 999;
  position: fixed;
  position: absolute;
  top: 50%;
  left: 50%;
  background-color: #002432;