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

chenyabin

2021-04-12 23e134520785efe3bbce4e759776e360a7967b62

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,7 +1,6 @@
<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-title panel-title" ref="publicBounced">
      <span>{{ displayContentTitle }}</span>
      <i class="el-icon-circle-close" @click="closePopup"></i>
    </div>
@@ -16,7 +15,7 @@
                        :value="value"
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
>
          >
          </public-chart>
        </div>
      </div>
@@ -29,9 +28,7 @@

<script>

// import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'

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'
@@ -60,6 +57,11 @@
      getQueryOnlineMonData: []
      // getGasQueryOnlineMonData: []
    }
  },
  mounted () {
    this.$nextTick(() => {
      console.log(this.$refs.publicBounced)
    })
  },
  methods: {
    closePopup () {
@@ -107,6 +109,7 @@
  left: 20%;

  .public-bounced-title {
    cursor: move;
    height: 0.1rem;
    padding: 10px 0;
    display: flex;
@@ -120,14 +123,15 @@
    }

    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 {