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

wangqi

2021-04-07 866f47aee553c4eadb3d29987d2d0b09b4d2114e

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,5 +1,5 @@
<template>
    <div class="public-bounced" v-draw v-if="flag">
  <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>
@@ -12,10 +12,7 @@
                    <public-table v-if="value === 'gufei'"
                                  :displayContentTable="displayContentTable"></public-table>
                    <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                                  :value="value"
                                  :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"
                                  :getWasteWaterMonitoring="getWasteWaterMonitoring">
                    </public-chart>
                        :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>
                </div>
            </div>
            <div class="public-bounced-content-right">
@@ -23,6 +20,31 @@
            </div>
        </div>
    </div>
<!--  <el-dialog-->
<!--      :visible.sync="flag"-->
<!--      width="70%"-->
<!--      class="public-bounced"-->
<!--      :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>-->
</template>

<script>
@@ -56,6 +78,9 @@
    }
  },
  methods: {
    closePopup () {
      this.flag = false
    },
    setData (dataBasic, dataDetailed, value) {
      this.flag = true
      this.value = value
@@ -84,9 +109,6 @@
      this.displayContentTitle = dataWater.Name
      this.flag = true
      this.value = value
    },
    closePopup () {
      this.flag = false
    }
  }
}
@@ -95,6 +117,8 @@
<style lang="less" scoped>
    .public-bounced {
        width: 75%;
  //height: 540px;
  height: 65%;
        z-index: 999;
        position: absolute;
        bottom: 5%;
@@ -119,11 +143,12 @@
                color: white;
                margin: 0 15px;
                font-size: 22px;
      cursor: pointer;
            }
        }

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