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

chenyabin

2021-04-13 dd13c9fb53fdfbfc6f908dd497b4f51d5b8d28c9

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,6 +1,6 @@
<template>
  <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-if="flag">
    <div class="public-bounced-title panel-title" ref="publicBounced">
      <span>{{ displayContentTitle }}</span>
      <i class="el-icon-circle-close" @click="closePopup"></i>
    </div>
@@ -14,7 +14,9 @@
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                        :value="value"
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
                        ref="PublicChart"
          >
          </public-chart>
        </div>
      </div>
@@ -26,7 +28,8 @@
</template>

<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'
@@ -35,7 +38,7 @@
export default {
  name: 'PublicBounced',
  components: {
    // Echarts
    // Echarts,
    PublicTabs,
    PublicTable,
    PublicChart,
@@ -56,10 +59,13 @@
      // getGasQueryOnlineMonData: []
    }
  },
  mounted () {
    // this.$nextTick(() => {
    // console.log(this.$refs.publicBounced)
    // console.log(this.$refs.PublicChart)
    // })
  },
  methods: {
    drag (event) {
      console.log(event)
    },
    closePopup () {
      this.flag = false
    },
@@ -99,18 +105,14 @@

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

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

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

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

  .public-bounced-content {