From e25ff993695e7a4b394a5d1aa102f113dbe5316b Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 18 四月 2021 22:40:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/WasteSolid/WasteSolidIndex.vue | 59 ++++++++++++++++++++++++-----------------------------------
1 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue b/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
index 09b2ace..89c6c51 100644
--- a/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
+++ b/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
@@ -1,36 +1,37 @@
<template>
- <div class="public-bounced-content">
- <div class="public-bounced-content-left">
- <slot name='WasteSolidTabs'>
- <PublicTabs></PublicTabs>
- </slot>
- <div class="public-bounced-content-left-bottom">
- <slot name='WasteSolidTable'>
- <PublicTable></PublicTable>
- </slot>
- </div>
- </div>
- <div class="public-bounced-content-right">
- <slot name='WasteSolidVideo'>
- <PublicVideo></PublicVideo>
- </slot>
- </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/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 {
@@ -41,27 +42,15 @@
StorageQty: 0.016,
SurplusFloorArea: 0.018,
StorageDate: '2021-01-17'
- }],
- displayContentTable: '',
- flag: false
+ }]
}
},
methods: {
- closePopup () {
- this.flag = false
+ refsData () {
+ const data = this.storagePlaceId
+ this.$refs.refsTabsData.refsDataTabs(data)
+ this.$refs.refsTableData.refsDataTable(data)
},
- // 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
--
Gitblit v1.8.0