|
|
@ -259,10 +259,8 @@ export default { |
|
|
|
const temp = { |
|
|
|
const temp = { |
|
|
|
type: 'line', |
|
|
|
type: 'line', |
|
|
|
smooth: true, |
|
|
|
smooth: true, |
|
|
|
stack: 'a', |
|
|
|
|
|
|
|
symbol: 'circle', |
|
|
|
symbol: 'circle', |
|
|
|
symbolSize: 5, |
|
|
|
symbolSize: 5, |
|
|
|
sampling: 'average', |
|
|
|
|
|
|
|
data: item |
|
|
|
data: item |
|
|
|
} |
|
|
|
} |
|
|
|
// 三个统计量分别赋予不同颜色 |
|
|
|
// 三个统计量分别赋予不同颜色 |
|
|
@ -363,6 +361,7 @@ export default { |
|
|
|
this.listData = this.active ? result : result.slice(0,this.initShowLen) |
|
|
|
this.listData = this.active ? result : result.slice(0,this.initShowLen) |
|
|
|
this.listDataKeyword = result |
|
|
|
this.listDataKeyword = result |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
// 表格合并 |
|
|
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) { |
|
|
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) { |
|
|
|
if (!columnIndex || columnIndex == 1) { |
|
|
|
if (!columnIndex || columnIndex == 1) { |
|
|
|
if (rowIndex % 3 == 0) { |
|
|
|
if (rowIndex % 3 == 0) { |
|
|
|