From 0cbf795f21d787db7d6b29a59d81579a7a736ab8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 14:40:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
index 649ac41..bb57e74 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
@@ -31,7 +31,7 @@
<el-table-column
label="鐑熷皹">
<el-table-column
- prop="MonItemId"
+ prop="DataTypeName"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
@@ -42,11 +42,11 @@
<el-table-column
label="闈炵敳鐑锋�荤儍">
<el-table-column
- prop="MonItemId"
+ prop="DataTypeName"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="MonItemId"
+ prop="DataTypeName"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
@@ -54,32 +54,19 @@
</template>
<script>
+// import dayjs from 'dayjs'
export default {
name: 'EChartsTable',
data () {
return {
- tableData: [{
- LabMonTime: '2021-02-05 09:54',
- MonItemId: '---',
- EndMonTime: '30',
- NOMonTime: '44',
- NOEndTime: '100',
- SOMontime: '9',
- SoEndTime: '50'
- }, {
- LabMonTime: '2021-01-14 10:15',
- MonItemId: '---',
- EndMonTime: '30',
- NOMonTime: '70',
- NOEndTime: '100',
- SOMontime: '---',
- SoEndTime: '50'
- }]
+ tableData: []
}
},
created () {
- // this.tableData = [...this.$attrs.ManualData]
- // console.log(this.tableData)
+ this.$attrs.ManualData.forEach((item, index) => {
+ this.tableData.push(item)
+ this.tableData[index].LabMonTime = this.tableData[index].LabMonTime.replaceAll('T', ' ')
+ })
}
}
--
Gitblit v1.8.0