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

chenzeping

2021-04-16 0cbf795f21d787db7d6b29a59d81579a7a736ab8

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -4,45 +4,49 @@
      <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 :setSolidWaste="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'
                        :ManualData="ManualData"
                        ref="PublicChart"
          >
          </public-chart>
        </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 :setSolidWaste="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'-->
<!--                        :ManualData="ManualData"-->
<!--                        ref="PublicChart"-->
<!--          >-->
<!--          </public-chart>-->
<!--        </div>-->
<!--      </div>-->
<!--      <div class="public-bounced-content-right">-->
<!--        <public-video></public-video>-->
<!--      </div>-->
<!--    </div>-->
    <PublicSector></PublicSector>
  </div>
</template>

<script>

import '@/utils/dragBoxes'
import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
import PublicChart from './common/PublicChart'
// import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
// import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
// import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
// import PublicChart from './common/PublicChart'

import PublicSector from '@components/BaseNav/PublicSector'

export default {
  name: 'PublicBounced',
  components: {
    PublicTabs,
    PublicTable,
    PublicChart,
    PublicVideo
    PublicSector
    // PublicTabs,
    // PublicTable,
    // PublicChart,
    // PublicVideo
  },
  data () {
    return {
@@ -59,8 +63,9 @@
      ManualData: []
    }
  },
  beforeUpdate () {
    this.$refs.PublicChart.$refs.Echats.CreateChart()
  destoryed () {
    this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
    this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
  },
  methods: {
    closePopup () {
@@ -75,13 +80,13 @@
      this.displayContentTable = dataDetailed[0]
    },
    setGasData (data, dataDetails, GasHourData, ManualData, value) {
      // console.log(this.$refs)
      // console.log(data, dataDetails, GasHourData, ManualData, value)
      this.setWasteGasdata = data
      this.displayContentTitle = data.Name
      this.getWasteGasDetails = dataDetails
      this.getQueryOnlineMonData = GasHourData
      this.ManualData = ManualData
      // console.log(this.getQueryOnlineMonData)
      this.displayContentTitle = data.Name
      this.flag = true
      this.value = value
    },
@@ -101,7 +106,7 @@
.public-bounced {
  z-index: 2000;
  position: absolute;
  top: 15%;
  top: 35%;
  left: 20%;

  .public-bounced-title {