From 564d0ab88c6ddf0b3d56a9eeba5ee72d6fff01b9 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 15:33:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index 4510bc3..b8958bf 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -37,8 +37,13 @@
}
},
mounted () {
- this.tableData = this.$attrs.getWasteGasDetails
- console.log(this.$attrs.getWasteGasDetails)
+ if (this.$attrs.getWasteGasDetails) {
+ this.tableData = this.$attrs.getWasteGasDetails
+ console.log(this.$attrs.getWasteGasDetails)
+ } else if (this.$attrs.getWasteWaterMonitoringDetails) {
+ this.tableData = this.$attrs.getWasteWaterMonitoringDetails
+ console.log(this.$attrs.getWasteWaterMonitoringDetails)
+ }
}
}
--
Gitblit v1.8.0