修改表格echats冲突

wangqi

2021-03-31 500416123c4db839e0b6d21a10b1b58189f30ceb

 src/components/BaseNav/PublicBounced/PublicBounced.vue

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

<script>

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

export default {
  name: 'PublicBounced',
  components: {
    GasTable,
    GasTab,
    PublicTable,
    GasECharts,
    GasVideo
  },
@@ -37,10 +43,19 @@
    }
  },
  methods: {
    setData (data) {
    setData (data, value) {
      console.log(data)
      console.log(value)
      this.displayContent = data
      this.flag = true
      this.value = value
      console.log(this.flag)
    },
    // setData (data) {
    //   this.displayContent = data
    //   this.flag = true
    //   // this.value = value
    // },
    closePopup () {
      this.flag = false
    }
@@ -50,12 +65,12 @@

<style lang="less" scoped>
.public-bounced {
  width: 75%;
  z-index: 999;
  position: fixed;
  top: 50%;
  left: 50%;
  //transform: translate(-50%, -50%);
  background-color: #0f1432;
  position: absolute;
  bottom: 5%;
  left: 15%;
  background-color: #002432;
  border: 1px #9fc5c8 solid;

  .public-bounced-title {
@@ -64,7 +79,6 @@
    align-items: center;
    justify-content: space-between;
    padding: 5px 0;
    background-color: #002433;

    span {
      color: #f4f7ff;
@@ -80,21 +94,23 @@
  }

  .public-bounced-content {
    margin: 15px auto;
    display: flex;
    align-items: center;
    //align-items: center;
    justify-content: space-around;
    padding: 12px;
    padding: 10px;

    .public-bounced-content-left {
      //flex: 1;
      flex-direction: column;
      margin-right: 13px;
      flex: 3;
      height: 100%;
      margin-right: 10px;
    }

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

}
</style>