echarts功能完善

zhangshuaibao

2021-04-09 375d6a7318aeac9b3e11dc65b96c9b50abd3686c

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,5 +1,6 @@
<template>
  <div class="public-bounced" v-drag v-if="flag">
    <!--    <Echarts></Echarts>-->
    <div class="public-bounced-title">
      <span>{{ displayContentTitle }}</span>
      <i class="el-icon-circle-close" @click="closePopup"></i>
@@ -13,44 +14,22 @@
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                        :value="value"
                        :getWasteWaterMonitoring="getWasteWaterMonitoring"
                        :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails
"></public-chart>
                        :getQueryOnlineMonHourData="getQueryOnlineMonHourData"
                        :getQueryOnlineMonDateData="getQueryOnlineMonDateData"
                        :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
          </public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <public-video></public-video>
      </div>
    </div>
<!--    <el-dialog-->
<!--        :visible.sync="flag"-->
<!--        width="70%"-->
<!--        v-drag-->
<!--        :modal="false">-->
<!--      <div class="public-bounced-title">-->
<!--        <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"-->
<!--                       :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
<!--          <div class="public-bounced-content-left-bottom">-->
<!--            <public-table v-if="value === 'gufei'"-->
<!--                          :displayContentTable="displayContentTable"></public-table>-->
<!--            <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
<!--                          :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
<!--          </div>-->
<!--        </div>-->
<!--        <div class="public-bounced-content-right">-->
<!--          <public-video></public-video>-->
<!--        </div>-->
<!--      </div>-->
<!--    </el-dialog>-->
  </div>
</template>

<script>

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

import '@/components/BaseNav/SolidWaste/directive/dir'
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
@@ -61,6 +40,7 @@
export default {
  name: 'PublicBounced',
  components: {
    // Echarts
    PublicTabs,
    PublicTable,
    PublicChart,
@@ -77,7 +57,8 @@
      value: '',
      getWasteGasDetails: [],
      getWasteWaterMonitoringDetails: [],
      getWasteWaterMonitoring: []
      getQueryOnlineMonHourData: [],
      getQueryOnlineMonDateData: []
    }
  },
  methods: {
@@ -103,12 +84,15 @@
      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
      console.log(drawData)
      this.getWasteWaterMonitoringDetails = dataDetail
      this.getWasteWaterMonitoringDetails = dataDetail // 明细表数据
      // console.log(dataDetail)
      this.getQueryOnlineMonHourData = hourData // 小时数据
      // console.log(drawData)
      this.getQueryOnlineMonDateData = dateData // 日数据
      // console.log(dateData)
      this.displayContentTitle = dataWater.Name
      this.flag = true
      this.value = value
@@ -119,22 +103,20 @@

<style lang="less" scoped>
.public-bounced {
  width: 75%;
  //height: 520px;
  height: 40%;
  z-index: 999;
  position: absolute;
  bottom: 5%;
  left: 15%;
  top: 15%;
  left: 20%;
  background-color: #002432;
  border: 1px #9fc5c8 solid;

  .public-bounced-title {
    height: 0.1rem;
    border: 1px #a4c0d8 solid;
    padding: 10px 0;
    display: flex;
    align-items: center;
    justify-content: space-between;
    padding: 5px 0;

    span {
      color: #f4f7ff;
@@ -151,22 +133,18 @@
  }

  .public-bounced-content {
    margin: 15px 0;
    padding: 0.1rem;
    display: flex;
    //align-items: center;
    justify-content: space-around;
    padding: 10px;
    //justify-content: space-around;

    .public-bounced-content-left {
      flex: 3;
      height: 100%;
      margin-right: 10px;
      //width: 4.8rem;
    }

    .public-bounced-content-right {
      flex: 2;
      //width: 48%;
      height: 100%;
      //width: 3rem;
      margin-left: 0.1rem;
    }
  }
}