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

chenyabin

2021-04-19 c7a549da66df42d4ec5c78ddf2cc138772616941

 src/components/BaseNav/WasteSolid/WasteSolidIndex.vue

@@ -1,68 +1,46 @@
<template>
  <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>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <public-tabs :setSolidWaste="displayContentTab"></public-tabs>
        <div class="public-bounced-content-left-bottom">
          <public-table :displayContentTable="displayContentTable"></public-table>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <public-video></public-video>
      </div>
    </div>
  </div>
  <public-sector>
    <template v-slot:tabs>
      <public-tabs ref='refsTabsData'></public-tabs>
    </template>
    <template v-slot:table>
      <public-table ref="refsTableData"></public-table>
    </template>
    <template v-slot:video>
      <public-video></public-video>
    </template>
  </public-sector>
</template>

<script>

import '@/utils/dragBoxes'
import PublicTabs from '@components/BaseNav/WasteSolid/PublicTabs'
import PublicTable from '@components/BaseNav/WasteSolid/PublicTable'
import PublicVideo from '@components/BaseNav/WasteSolid/PublicVideo'
import PublicVideo from '@components/BaseNav/PublicVideo'
import PublicSector from '@components/BaseNav/PublicSector'

export default {
  name: 'WasteSolidIndex',
  props: ['storagePlaceId'],
  components: {
    PublicSector,
    PublicTabs,
    PublicTable,
    PublicVideo
  },
  mounted () {
    this.$nextTick(() => {
      this.refsData()
    })
  },
  data () {
    return {
      displayContentTitle: '',
      displayContentTab: '',
      displayContentTable: '',
      flag: false
    }
    return {}
  },
  methods: {
    closePopup () {
      this.flag = false
    },
    // async reauestData () {
    //   const dataValue = {
    //     StoragePlaceId: 0
    //   }
    //   // console.log(e.layer.options.totransferData.Name)
    //   // 弹框标题
    //   const title = e.layer.options.totransferData.Name
    //   // 基本信息 tabs
    //   const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
    //   // 详细信息展示 table
    //   const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
    // },
    // 固废相关信息设置
    setData (title, dataBasic, dataDetailed, value) {
      this.flag = true
      this.value = value
      this.displayContentTitle = title
      this.displayContentTab = dataBasic[0]
      this.displayContentTable = dataDetailed[0]
    refsData () {
      const data = this.storagePlaceId
      this.$refs.refsTabsData.refsDataTabs(data)
      this.$refs.refsTableData.refsDataTable(data)
    }
  }
}
@@ -102,7 +80,7 @@
  }

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