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

chenzeping

2021-04-09 9248255437aa54571da2ff80e8ca9b9e6152c61b

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,27 +1,28 @@
<template>
  <div class="public-bounced" v-drag v-if="flag">
<!--    <Echarts></Echarts>-->
        <div class="public-bounced-title">
          <span>{{ displayContentTitle }}</span>
          <i class="el-icon-circle-close" @click="closePopup"></i>
    <!--    <Echarts></Echarts>-->
    <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"
                        :value="value"
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
          </public-chart>
        </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"
                            :value="value"
                            :getWasteWaterMonitoring="getWasteWaterMonitoring"
                            :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"></public-chart>
            </div>
          </div>
          <div class="public-bounced-content-right">
            <public-video></public-video>
          </div>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <public-video></public-video>
      </div>
    </div>
  </div>
</template>

@@ -55,7 +56,7 @@
      value: '',
      getWasteGasDetails: [],
      getWasteWaterMonitoringDetails: [],
      getWasteWaterMonitoring: []
      getQueryOnlineMonData: []
    }
  },
  methods: {
@@ -81,10 +82,10 @@
      this.flag = true
      this.value = value
    },
    setWaterData (dataWater, dataDetail, drawData, value) {
    setWaterData (dataWater, dataDetail, hourData, value) {
      this.setWasteWaterdata = dataWater
      // console.log(data)
      this.getWasteWaterMonitoring = drawData
      this.getQueryOnlineMonData = hourData
      // console.log(drawData)
      this.getWasteWaterMonitoringDetails = dataDetail
      this.displayContentTitle = dataWater.Name
@@ -99,7 +100,6 @@
.public-bounced {
  z-index: 999;
  position: absolute;
  //width: 6rem;
  top: 15%;
  left: 20%;
  background-color: #002432;