From cb59b61953181889c6b1479a75c23de9e061d788 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 15:39:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index efdfd77..b8958bf 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -1,6 +1,6 @@
<template>
<div class="PublicDetailedList">
- <el-table :data="tableData" max-height="600px">
+ <el-table :data="tableData" max-height="500px">
<el-table-column prop="OnLineMonEmissPointName" label="鎺掓斁鐐�"></el-table-column>
<el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
<el-table-column label="姘哀鍖栫墿">
@@ -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