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

chenyabin

2021-04-19 c7a549da66df42d4ec5c78ddf2cc138772616941

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,15 +1,12 @@
<template>
  <div class="public-bounced map-background" v-drag v-if="flag">
    <!--    <Echarts></Echarts>-->
    <div class="public-bounced-title panel-title">
  <div class="public-bounced" v-if="flag">
    <div class="public-bounced-title" draggable="true" @dragstart="drag($event)">
  <div class="public-bounced map-background" v-drag v-show="flag">
    <div class="public-bounced-title panel-title" ref="publicBounced">
      <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"
        <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'"
@@ -17,7 +14,10 @@
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                        :value="value"
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
                        :ManualData="ManualData"
                        ref="PublicChart"
          >
          </public-chart>
        </div>
      </div>
@@ -29,16 +29,16 @@
</template>

<script>
import '@/components/BaseNav/SolidWaste/directive/dir'
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
import PublicChart from './GasComponents/PublicChart'

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'

export default {
  name: 'PublicBounced',
  components: {
    // Echarts
    PublicTabs,
    PublicTable,
    PublicChart,
@@ -46,52 +46,50 @@
  },
  data () {
    return {
      setWasteGasdata: '',
      setWasteWaterdata: '',
      displayContentTitle: '',
      displayContentTab: '',
      displayContentTable: '',
      flag: false,
      value: '',
      setWasteGasdata: '',
      setWasteWaterdata: '',
      getWasteGasDetails: [],
      getWasteWaterMonitoringDetails: [],
      getQueryOnlineMonData: []
      // getGasQueryOnlineMonData: []
      getQueryOnlineMonData: [],
      ManualData: []
    }
  },
  destoryed () {
    this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
    this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
  },
  methods: {
    drag (event) {
      console.log(event)
    },
    closePopup () {
      this.flag = false
    },
    setData (dataBasic, dataDetailed, value) {
    // 固废相关信息设置
    setData (title, dataBasic, dataDetailed, value) {
      this.flag = true
      this.value = value
      dataBasic.forEach(item => {
        this.displayContentTitle = item.StoragePlaceName
      })
      this.displayContentTab = dataBasic
      this.displayContentTable = dataDetailed
      this.flag = true
      this.value = value
      this.displayContentTitle = title
      this.displayContentTab = dataBasic[0]
      this.displayContentTable = dataDetailed[0]
    },
    setGasData (data, dataDetails, GasHourData, value) {
    setGasData (data, dataDetails, GasHourData, ManualData, value) {
      // console.log(data, dataDetails, GasHourData, ManualData, value)
      this.setWasteGasdata = data
      this.displayContentTitle = data.Name
      this.getWasteGasDetails = dataDetails
      this.getQueryOnlineMonData = GasHourData
      console.log(this.getQueryOnlineMonData)
      this.displayContentTitle = data.Name
      this.ManualData = ManualData
      // console.log(this.getQueryOnlineMonData)
      this.flag = true
      this.value = value
    },
    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
    setWaterData (dataWater, detailData, hourData, dateData, value) {
      this.setWasteWaterdata = dataWater
      // console.log(data)
      this.getQueryOnlineMonData = hourData
      // console.log(drawData)
      this.getWasteWaterMonitoringDetails = dataDetail
      this.getWasteWaterMonitoringDetails = detailData
      this.displayContentTitle = dataWater.Name
      this.flag = true
      this.value = value
@@ -104,11 +102,10 @@
.public-bounced {
  z-index: 2000;
  position: absolute;
  top: 15%;
  top: 35%;
  left: 20%;

  .public-bounced-title {
    //cursor: pointer;
    cursor: move;
    height: 0.1rem;
    padding: 10px 0;
@@ -123,18 +120,19 @@
    }

    i {
        color: #C0C4CC;
        margin: 0 15px;
        font-size: 22px;
        cursor: pointer;
      color: #C0C4CC;
      margin: 0 15px;
      font-size: 22px;
      cursor: pointer;
    }
      i:hover{
          color: #00fff6;
      }

    i:hover {
      color: #00fff6;
    }
  }

  .public-bounced-content {
    padding: 0.1rem;
    padding: 0.05rem;
    display: flex;
    //align-items: center;
    //justify-content: space-around;