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

chenyabin

2021-04-13 dd13c9fb53fdfbfc6f908dd497b4f51d5b8d28c9

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -15,6 +15,7 @@
                        :value="value"
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
                        ref="PublicChart"
          >
          </public-chart>
        </div>
@@ -58,6 +59,12 @@
      // getGasQueryOnlineMonData: []
    }
  },
  mounted () {
    // this.$nextTick(() => {
    // console.log(this.$refs.publicBounced)
    // console.log(this.$refs.PublicChart)
    // })
  },
  methods: {
    closePopup () {
      this.flag = false
@@ -100,7 +107,7 @@
.public-bounced {
  z-index: 2000;
  position: absolute;
  top: 45%;
  top: 15%;
  left: 20%;

  .public-bounced-title {