From ec4d5c1827487f4c901b69bd9eae58e111e82b32 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 20 五月 2021 18:05:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteSolid/WasteSolidIndex.vue | 78 ++++++++++++--------------------------
1 files changed, 25 insertions(+), 53 deletions(-)
diff --git a/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue b/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
index 09b2ace..86befe3 100644
--- a/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
+++ b/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
@@ -1,74 +1,46 @@
<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:publicPart>
+ <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 {
- displayContentTabs: [{
- StoragePlaceId: 0,
- StoragePlaceName: '鍙栨按鍗曞厓骞叉偿鏆傚瓨搴�',
- DesignFloorArea: 0.024,
- StorageQty: 0.016,
- SurplusFloorArea: 0.018,
- StorageDate: '2021-01-17'
- }],
- 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)
}
}
}
@@ -108,7 +80,7 @@
}
.public-bounced-content {
- padding: 0.1rem;
+ //padding: 0.1rem;
display: flex;
//align-items: center;
//justify-content: space-around;
--
Gitblit v1.8.0