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

wangqi

2021-03-29 7cb769fa01008d3ad0d5ec3cf3ad56c0156f9153

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -6,7 +6,7 @@
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <GasTable></GasTable>
        <GasTable :displayContent="displayContent"></GasTable>
        <GasECharts></GasECharts>
      </div>
      <div class="public-bounced-content-right">
@@ -22,10 +22,12 @@
import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
// import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'

export default {
  name: 'PublicBounced',
  components: {
    // GasTabs,
    GasTable,
    GasECharts,
    GasVideo
@@ -50,18 +52,14 @@

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

  .public-bounced-title {
    width: 100%;
    border: 1px #a4c0d8 solid;
    display: flex;
    align-items: center;
@@ -82,20 +80,14 @@
  }

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

    .public-bounced-content-left {
      width: 48%;
      height: 400px;
    }

    .public-bounced-content-right {
      width: 48%;
      height: 400px;
    }
  }