From b0cb4ea7d287fffe598b42f189e6d6e6f06f3d40 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 16 四月 2021 10:41:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/common/PublicTabs.vue | 34 +++++++++-------------------------
1 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicTabs.vue b/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
index 314cb97..ba844dd 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
@@ -18,14 +18,14 @@
<li>鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</li>
</ul>
</div>
- <div v-else-if="value === 'gufei'">
+ <div v-if="value === 'gufei'">
<ul>
- <li>鍦烘墍鍚嶇О:{{ tabData.StoragePlaceName }}</li>
- <li>璐瓨鑳藉姏:{{ tabData.StorageQty }}(鍚�)</li>
- <li>鍓╀綑璐瓨鑳藉姏:{{ tabData.SurplusFloorArea }}(鍚�)</li>
- <li>鍗犲湴闈㈢Н(銕�):{{ tabData.DesignFloorArea }}(銕�)</li>
- <li>鏈�杩戣串瀛樻棩鏈�:{{ tabData.StorageDate }}</li>
- <li></li>
+ <li>鍦烘墍鍚嶇О:{{ setSolidWaste.StoragePlaceName }}</li>
+ <li>璐瓨鑳藉姏:{{ setSolidWaste.StorageQty }}(鍚�)</li>
+ <li>鍓╀綑璐瓨鑳藉姏:{{ setSolidWaste.SurplusFloorArea }}(鍚�)</li>
+ <li>鍗犲湴闈㈢Н(銕�):{{ setSolidWaste.DesignFloorArea }}(銕�)</li>
+ <li>鏈�杩戣串瀛樻棩鏈�:{{ setSolidWaste.StorageDate }}</li>
+ <li class="lastli"></li>
</ul>
</div>
<div v-else-if="value === 'feishui'">
@@ -46,23 +46,7 @@
<script>
export default {
name: 'GasTable',
- props: ['displayContentTab', 'value', 'setWasteGasdata', 'setWasteWaterdata'],
- data () {
- return {
- tabData: []
- }
- },
- mounted () {
- this.processingData()
- },
- methods: {
- processingData () {
- for (var i = 0; i < this.displayContentTab.length; i++) {
- // console.log(this.displayContentTab[i])
- this.tabData = this.displayContentTab[i]
- }
- }
- }
+ props: ['setSolidWaste', 'value', 'setWasteGasdata', 'setWasteWaterdata']
}
</script>
@@ -104,7 +88,7 @@
line-height: 0.09rem;
padding: 0.03rem .5%;
}
- li:last-child {
+ .lastli {
visibility: hidden
}
}
--
Gitblit v1.8.0