|
|
@ -154,7 +154,7 @@
|
|
|
|
width="180">
|
|
|
|
width="180">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<div v-if="historyTh[i] === '时间'">{{ parseTime(scope.row['ts']) }}</div>
|
|
|
|
<div v-if="historyTh[i] === '时间'">{{ parseTime(scope.row['ts']) }}</div>
|
|
|
|
<div v-else>{{ scope.row[historyTh[i]] }}</div>
|
|
|
|
<div v-else>{{ scope.row[i] }}</div>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
@ -495,14 +495,15 @@ export default {
|
|
|
|
}]
|
|
|
|
}]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
console.log(chartData)
|
|
|
|
let series = Object.keys(chartData).map(e => {
|
|
|
|
let series = Object.keys(chartData).map(e => {
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
name: (this.propArr.find(item => item.id === parseFloat(e)) || {}).name,
|
|
|
|
name: (this.propArr.find(item => item.id === parseFloat(e)) || {}).name,
|
|
|
|
type: 'line',
|
|
|
|
type: 'line',
|
|
|
|
stack: 'Total',
|
|
|
|
|
|
|
|
data: chartData[e]
|
|
|
|
data: chartData[e]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
console.log(series)
|
|
|
|
this.$refs.chart.setData({
|
|
|
|
this.$refs.chart.setData({
|
|
|
|
tooltip: {
|
|
|
|
tooltip: {
|
|
|
|
trigger: 'axis'
|
|
|
|
trigger: 'axis'
|
|
|
|