From f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 14 五月 2021 11:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue | 97 +++++++++---------------------------------------
1 files changed, 18 insertions(+), 79 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
index 90d24e1..bb57e74 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
@@ -1,59 +1,52 @@
<template>
-<!-- <el-table :data="tableData" style="width:730px" height="200px">-->
-<!-- <el-table-column v-for="(item, index) in tableLabel" :key="index" :prop="item.prop"-->
-<!-- :label="item.label">-->
-<!-- <el-table-column v-for="(item1, index1) in item.label" :key="index1" :prop="item1.prop" :label="item1.label">-->
-<!-- </el-table-column>-->
-<!-- </el-table-column>-->
-<!-- </el-table>-->
<el-table
:data="tableData"
style="width: 100%;height: 100%">
<el-table-column
- prop="tableData.LabMonTime"
+ prop="LabMonTime"
label="妫�娴嬫椂闂�">
</el-table-column>
<el-table-column
label="姘哀鍖栫墿">
<el-table-column
- prop="tableData.MonItemId"
+ prop="NOMonTime"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="NOEndTime"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
<el-table-column
label="浜屾哀鍖栫～">
<el-table-column
- prop="tableData.MonItemId"
+ prop="SOMontime"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="SoEndTime"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
<el-table-column
label="鐑熷皹">
<el-table-column
- prop="tableData.MonItemId"
+ prop="DataTypeName"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="EndMonTime"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
<el-table-column
- label="榛戝害">
+ label="闈炵敳鐑锋�荤儍">
<el-table-column
- prop="tableData.MonItemId"
+ prop="DataTypeName"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="DataTypeName"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
@@ -61,74 +54,18 @@
</template>
<script>
+// import dayjs from 'dayjs'
export default {
name: 'EChartsTable',
data () {
return {
- // tableLabel: [
- // {
- // label: '妫�娴嬫椂闂�',
- // prop: 'StoragePlaceId'
- // },
- // {
- // label: '浜屾哀鍖栫～',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '姘哀鍖栫墿',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '鐑熷皹',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '榛戝害',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // }
- // ],
- tableData: ''
+ tableData: []
}
},
created () {
- this.$nextTick(() => {
- // this.$attrs.ManualData.forEach(item => {
- this.tableData = [...this.$attrs.ManualData]
- // })
- // this.tableData.LabMonTime = 100
- console.log(this.tableData)
+ this.$attrs.ManualData.forEach((item, index) => {
+ this.tableData.push(item)
+ this.tableData[index].LabMonTime = this.tableData[index].LabMonTime.replaceAll('T', ' ')
})
}
}
@@ -136,5 +73,7 @@
</script>
<style scoped>
-
+.el-table--border::after, .el-table--group::after, .el-table::before{
+ background: none;
+}
</style>
--
Gitblit v1.8.0