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

wangqi

2021-03-30 f7ba8b6aab4a763feee8938e93c97079b52baf1d

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -5,8 +5,13 @@
      <i class="el-icon-circle-close" @click="closePopup"></i>
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left"></div>
      <div class="public-bounced-content-right"></div>
      <div class="public-bounced-content-left">
        <GasTable :displayContent="displayContent"></GasTable>
        <GasECharts></GasECharts>
      </div>
      <div class="public-bounced-content-right">
        <GasVideo></GasVideo>
      </div>
    </div>
  </div>
</template>
@@ -14,9 +19,17 @@
<script>

import '@/components/BaseNav/SolidWaste/directive'
import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'

export default {
  name: 'PublicBounced',
  components: {
    GasTable,
    GasECharts,
    GasVideo
  },
  data () {
    return {
      displayContent: [],
@@ -37,23 +50,21 @@

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

  .public-bounced-title {
    width: 100%;
    border: 1px #a4c0d8 solid;
    display: flex;
    align-items: center;
    justify-content: space-between;
    padding: 5px 0;
    background-color: #002433;

    span {
      color: #f4f7ff;
@@ -69,20 +80,19 @@
  }

  .public-bounced-content {
    width: 100%;
    height: 100%;
    display: flex;
    align-items: center;
    justify-content: space-around;
    padding: 12px;

    .public-bounced-content-left {
      width: 48%;
      height: 400px;
      border: 1px red solid;
      //flex: 1;
      flex-direction: column;
      margin-right: 13px;
    }

    .public-bounced-content-right {
      width: 48%;
      height: 400px;
      border: 1px red solid;
      //flex: 1;
    }
  }