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

chenyabin

2021-04-13 3c93d885a3bc6a84079cc347bb30888d5fb98f11

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,6 +1,6 @@
<template>
  <div class="public-bounced" v-drag v-if="flag">
    <div class="public-bounced-title">
  <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>
@@ -13,8 +13,12 @@
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                        :value="value"
                        :getWasteWaterMonitoring="getWasteWaterMonitoring"
                        :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"></public-chart>
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
                        :ManualData="ManualData"
                        ref="PublicChart"
          >
          </public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">
@@ -26,7 +30,7 @@

<script>

import '@/components/BaseNav/SolidWaste/directive/dir'
import '@/utils/dragBoxes'
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
@@ -51,8 +55,16 @@
      value: '',
      getWasteGasDetails: [],
      getWasteWaterMonitoringDetails: [],
      getWasteWaterMonitoring: []
      getQueryOnlineMonData: [],
      ManualData: []
      // getGasQueryOnlineMonData: []
    }
  },
  mounted () {
    // this.$nextTick(() => {
    // console.log(this.$refs.publicBounced)
    // console.log(this.$refs.PublicChart)
    // })
  },
  methods: {
    closePopup () {
@@ -69,18 +81,20 @@
      this.flag = true
      this.value = value
    },
    setGasData (data, dataDetails, value) {
    setGasData (data, dataDetails, GasHourData, ManualData, value) {
      this.setWasteGasdata = data
      this.getWasteGasDetails = dataDetails
      // console.log(dataDetails)
      this.getQueryOnlineMonData = GasHourData
      this.ManualData = ManualData
      console.log(this.getQueryOnlineMonData)
      this.displayContentTitle = data.Name
      this.flag = true
      this.value = value
    },
    setWaterData (dataWater, dataDetail, drawData, value) {
    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
      this.setWasteWaterdata = dataWater
      // console.log(data)
      this.getWasteWaterMonitoring = drawData
      this.getQueryOnlineMonData = hourData
      // console.log(drawData)
      this.getWasteWaterMonitoringDetails = dataDetail
      this.displayContentTitle = dataWater.Name
@@ -93,22 +107,14 @@

<style lang="less" scoped>
.public-bounced {
  width: 8rem;
  //height: 2.6rem;
  //width: 70vw;
  //height: 30vh;
  z-index: 999;
  z-index: 2000;
  position: absolute;
  //bottom: 2rem;
  //left: 5rem;
  top: 15%;
  left: 15%;
  background-color: #002432;
  border: 1px #9fc5c8 solid;
  left: 20%;

  .public-bounced-title {
    cursor: move;
    height: 0.1rem;
    border: 1px #a4c0d8 solid;
    padding: 10px 0;
    display: flex;
    align-items: center;
@@ -121,25 +127,30 @@
    }

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

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

  .public-bounced-content {
    margin: 0.2rem auto !important;
    padding: 0.1rem;
    display: flex;
    //align-items: center;
    justify-content: space-around;
    //justify-content: space-around;

    .public-bounced-content-left {
      width: 4.8rem;
      //width: 4.8rem;
    }

    .public-bounced-content-right {
      width: 3rem;
      //width: 3rem;
      margin-left: 0.1rem;
    }
  }
}