From 724f7ffe496cca442d73b5bd39d9949178974032 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 02 四月 2021 11:40:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 26 +++++++++++---------------
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 2 +-
src/components/BaseNav/PublicBounced/PublicBounced.vue | 5 +++--
src/components/LayerController/logic/SolidWaste.js | 2 +-
4 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index a35207d..56cd627 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -9,7 +9,7 @@
<div class="main-video">
<el-table
tooltip-effect="dark"
- :data="displayContentTable2"
+ :data="displayContentTableData"
>
<el-table-column prop="StoragePlaceId" label="搴忓彿"></el-table-column>
<el-table-column prop="StoragePlaceTypeName" label="绫诲埆"></el-table-column>
@@ -30,20 +30,16 @@
props: ['displayContentTable'],
data () {
return {
- displayContentTable2: [
- {
- CompanyName: '涓煩鐭冲寲',
- StoragePlaceId: 3,
- StoragePlaceName: '鐏版福鍦�',
- StoragePlaceTypeName: '涓�鑸浐搴熷～鍩嬪満',
- StorageType: '绮夌叅鐏般�佺伆娓�',
- StorageZCL: '38',
- StorageZCNL: '40.7',
- StorageZDMJ: '10.60798'
- }
- ],
- displayContentTable3: []
+ displayContentTableData: []
}
+ },
+ mounted () {
+ this.$nextTick(() => {
+ this.displayContentTable.forEach(item => {
+ this.displayContentTableData = item
+ // console.log(item[0])
+ })
+ })
}
}
</script>
@@ -60,7 +56,7 @@
.main-video {
width: 100%;
- min-height: 164px;
+ min-height: 195px;
video {
width: 100%;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index b8ea76b..29723b3 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -62,7 +62,7 @@
this.$nextTick(() => {
this.displayContentTab.forEach(item => {
this.displayContentTab2 = item
- console.log(item)
+ // console.log(item)
})
})
}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 7ef971b..9a379d9 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,9 +6,10 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <PublicTabs :displayContentTab="displayContentTab" :value="value" :setWasteGasdata="setWasteGasdata"></PublicTabs>
+ <PublicTabs :displayContentTab="displayContentTab" :value="value"
+ :setWasteGasdata="setWasteGasdata"></PublicTabs>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'"></PublicTable>
+ <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
<PublicChart v-else></PublicChart>
</div>
</div>
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index 1459bb9..3ea18d7 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -89,7 +89,7 @@
const instance = new PublicBounced()
instance.$mount()
document.body.appendChild(instance.$el)
- instance.setData(resultBasic.Result.DataInfo, resultDetailed, 'gufei')
+ instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
/* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
this.setPanTo(e.latlng, 200)
}
--
Gitblit v1.8.0