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

chenyabin

2021-04-07 7966904bb2c464e0a5c134e1d0df0d1e04a747f7

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,27 +1,50 @@
<template>
    <div class="public-bounced" v-draw v-if="flag">
        <div class="public-bounced-title">
            <span>{{ displayContentTitle }}</span>
            <i class="el-icon-circle-close" @click="closePopup"></i>
        </div>
        <div class="public-bounced-content">
            <div class="public-bounced-content-left">
                <public-tabs :displayContentTab="displayContentTab" :value="value"
                             :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
                <div class="public-bounced-content-left-bottom">
                    <public-table v-if="value === 'gufei'"
                                  :displayContentTable="displayContentTable"></public-table>
                    <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                                  :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"
                                  :getWasteWaterMonitoring="getWasteWaterMonitoring">
                    </public-chart>
                </div>
            </div>
            <div class="public-bounced-content-right">
                <public-video></public-video>
            </div>
        </div>
  <div class="public-bounced" v-drag v-if="flag">
    <div class="public-bounced-title">
      <span>{{ displayContentTitle }}</span>
      <i class="el-icon-circle-close" @click="closePopup"></i>
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <public-tabs :displayContentTab="displayContentTab" :value="value"
                     :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
        <div class="public-bounced-content-left-bottom">
          <public-table v-if="value === 'gufei'"
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                        :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <public-video></public-video>
      </div>
    </div>
<!--    <el-dialog-->
<!--        :visible.sync="flag"-->
<!--        width="70%"-->
<!--        v-drag-->
<!--        :modal="false">-->
<!--      <div class="public-bounced-title">-->
<!--        <span>{{ displayContentTitle }}</span>-->
<!--        <i class="el-icon-circle-close" @click="closePopup"></i>-->
<!--      </div>-->
<!--      <div class="public-bounced-content">-->
<!--        <div class="public-bounced-content-left">-->
<!--          <public-tabs :displayContentTab="displayContentTab" :value="value"-->
<!--                       :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
<!--          <div class="public-bounced-content-left-bottom">-->
<!--            <public-table v-if="value === 'gufei'"-->
<!--                          :displayContentTable="displayContentTable"></public-table>-->
<!--            <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
<!--                          :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
<!--          </div>-->
<!--        </div>-->
<!--        <div class="public-bounced-content-right">-->
<!--          <public-video></public-video>-->
<!--        </div>-->
<!--      </div>-->
<!--    </el-dialog>-->
  </div>
</template>

<script>
@@ -55,6 +78,9 @@
    }
  },
  methods: {
    closePopup () {
      this.flag = false
    },
    setData (dataBasic, dataDetailed, value) {
      this.flag = true
      this.value = value
@@ -83,62 +109,62 @@
      this.displayContentTitle = dataWater.Name
      this.flag = true
      this.value = value
    },
    closePopup () {
      this.flag = false
    }
  }
}
</script>

<style lang="less" scoped>
    .public-bounced {
        width: 75%;
        z-index: 999;
        position: absolute;
        bottom: 5%;
        left: 15%;
        background-color: #002432;
        border: 1px #9fc5c8 solid;
.public-bounced {
  width: 75%;
  //height: 520px;
  height: 40%;
  z-index: 999;
  position: absolute;
  bottom: 5%;
  left: 15%;
  background-color: #002432;
  border: 1px #9fc5c8 solid;

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

            span {
                color: #f4f7ff;
                margin: 0 15px;
                font-size: 14px;
            }

            i {
                color: white;
                margin: 0 15px;
                font-size: 22px;
            }
        }

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

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

            .public-bounced-content-right {
                flex: 2;
                //width: 48%;
                height: 100%;
            }
        }
    span {
      color: #f4f7ff;
      margin: 0 15px;
      font-size: 14px;
    }

    i {
      color: white;
      margin: 0 15px;
      font-size: 22px;
      cursor: pointer;
    }
  }

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

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

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