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

chenyabin

2021-04-12 de01693a063433610388fab33cd4927f2f663e60

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,7 +1,6 @@
<template>
  <div class="public-bounced" v-drag v-if="flag">
    <!--    <Echarts></Echarts>-->
    <div class="public-bounced-title">
  <div class="public-bounced map-background" v-drag v-if="flag">
    <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'
@@ -101,16 +98,14 @@

<style lang="less" scoped>
.public-bounced {
  z-index: 999;
  z-index: 2000;
  position: absolute;
  top: 15%;
  top: 45%;
  left: 20%;
  background-color: #002432;
  border: 1px #9fc5c8 solid;

  .public-bounced-title {
    cursor: move;
    height: 0.1rem;
    border: 1px #a4c0d8 solid;
    padding: 10px 0;
    display: flex;
    align-items: center;
@@ -123,11 +118,15 @@
    }

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

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

  .public-bounced-content {