From ac41da710d542993b9c9fd9c680cc310e8e61832 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 09 四月 2021 17:54:48 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 84 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index d3c4ce7..077bf5f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -1,29 +1,53 @@
<template>
<div class="PublicDetailedList">
- <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="姘哀鍖栫墿">
- <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)"></el-table-column>
- </el-table-column>
- <el-table-column label="浜屾哀鍖栫～">
- <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)"></el-table-column>
- </el-table-column>
- <el-table-column label="鐑熷皹">
- <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)"></el-table-column>
- </el-table-column>
- <el-table-column label="搴熸皵娴侀噺">
- <el-table-column prop="StdValue" label="姘旈噺"></el-table-column>
- </el-table-column>
+ <el-table :data="tableData" max-height="600px" border >
+ <el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
+ <el-table-column label="姘哀鍖栫墿">
+ <el-table-column prop="MonQty" width="70">
+ <template slot="header">娴撳害 <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="OrglQty" width="70">
+ <template slot="header">鎶樼畻鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="ConvertQty" width="70">
+ <template slot="header">鏍囧噯鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="EmissQty" width="70">
+ <template slot="header">鎺掓斁閲� <i>(kg/h)</i></template>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="浜屾哀鍖栫～">
+ <el-table-column prop="MonQty" width="60">
+ <template slot="header">娴撳害 <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="OrglQty" width="60">
+ <template slot="header">鎶樼畻鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="ConvertQty" width="60">
+ <template slot="header">鏍囧噯鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="EmissQty" width="60">
+ <template slot="header">鎺掓斁閲� <i>(kg/h)</i></template>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鐑熷皹">
+ <el-table-column prop="MonQty" width="60">
+ <template slot="header">娴撳害 <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="OrglQty" width="60">
+ <template slot="header">鎶樼畻鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="ConvertQty" width="60">
+ <template slot="header">鏍囧噯鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="EmissQty" label="鎺掓斁閲�" width="60">
+ <template slot="header">鎺掓斁閲� <i>(kg/h)</i></template>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="搴熸皵娴侀噺" width="100">
+ <el-table-column prop="StdValue" label="姘旈噺"></el-table-column>
+ </el-table-column>
+ <el-table-column prop="OnLineMonEmissPointName" label="鎺掓斁鐐�"></el-table-column>
</el-table>
</div>
</template>
@@ -37,13 +61,13 @@
}
},
mounted () {
- console.log('value')
- if (this.$attrs.getWasteGasDetails) {
+ console.log(this.$attrs.value)
+ if (this.$attrs.value === 'feiqi') {
this.tableData = this.$attrs.getWasteGasDetails
- console.log(this.$attrs.getWasteGasDetails)
- } else if (this.$attrs.getWasteWaterMonitoringDetails) {
+ // console.log(this.$attrs.getWasteGasDetails)
+ } else if (this.$attrs.value === 'feishui') {
this.tableData = this.$attrs.getWasteWaterMonitoringDetails
- console.log(this.$attrs.getWasteWaterMonitoringDetails)
+ // console.log(this.$attrs.getWasteWaterMonitoringDetails)
}
}
}
@@ -53,5 +77,7 @@
<style scoped>
.PublicDetailedList{
/*height: 100%*/
+ .gutter{display: none !important;width: 0 !important}
}
+
</style>
--
Gitblit v1.8.0