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

chenzeping

2021-04-12 8bb5942235c86ea771c4215a77c46b1245c30a93

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,30 +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>
    </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'
                        :getGasQueryOnlineMonData = 'getGasQueryOnlineMonData'
>
          </public-chart>
<!--    <Echarts></Echarts>-->
        <div class="public-bounced-title">
          <span>{{ displayContentTitle }}</span>
          <i class="el-icon-circle-close" @click="closePopup"></i>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <public-video></public-video>
      </div>
    </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>
          <div class="public-bounced-content-right">
            <public-video></public-video>
          </div>
        </div>
  </div>
</template>

@@ -41,7 +39,7 @@
export default {
  name: 'PublicBounced',
  components: {
    // Echarts,
    // Echarts
    PublicTabs,
    PublicTable,
    PublicChart,
@@ -58,8 +56,8 @@
      value: '',
      getWasteGasDetails: [],
      getWasteWaterMonitoringDetails: [],
      getQueryOnlineMonData: [],
      getGasQueryOnlineMonData: []
      getQueryOnlineMonData: []
      // getGasQueryOnlineMonData: []
    }
  },
  methods: {
@@ -80,13 +78,13 @@
    setGasData (data, dataDetails, GasHourData, value) {
      this.setWasteGasdata = data
      this.getWasteGasDetails = dataDetails
      this.getGasQueryOnlineMonData = GasHourData
      // console.log(dataDetails)
      this.getQueryOnlineMonData = GasHourData
      console.log(this.getQueryOnlineMonData)
      this.displayContentTitle = data.Name
      this.flag = true
      this.value = value
    },
    setWaterData (dataWater, dataDetail, hourData, value) {
    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
      this.setWasteWaterdata = dataWater
      // console.log(data)
      this.getQueryOnlineMonData = hourData