From def7b22807fa8e81bff4a92429f039d6e2bb2ce2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 15:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index efdfd77..0422b5f 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="姘哀鍖栫墿">
@@ -38,7 +38,9 @@
},
mounted () {
this.tableData = this.$attrs.getWasteGasDetails
- console.log(this.$attrs.getWasteGasDetails)
+ // console.log(this.$attrs.getWasteGasDetails)
+ this.tableData = this.$attrs.getWasteWaterMonitoringDetails
+ console.log(this.$attrs.getWasteWaterMonitoringDetails)
}
}
--
Gitblit v1.8.0