From 7966904bb2c464e0a5c134e1d0df0d1e04a747f7 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 16:49:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index 0422b5f..d3c4ce7 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -37,10 +37,14 @@
}
},
mounted () {
- this.tableData = this.$attrs.getWasteGasDetails
- // console.log(this.$attrs.getWasteGasDetails)
- this.tableData = this.$attrs.getWasteWaterMonitoringDetails
- console.log(this.$attrs.getWasteWaterMonitoringDetails)
+ console.log('value')
+ 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