gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改因为堆叠按钮导致的时间显示错误的问题

Browse Source
This commit is contained in:
zhangyu
2021-04-01 15:18:49 +08:00
parent a828bb3905
commit 7648b3868d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nezha-fronted/src/components/charts/line-chart-block.vue
View File

@@ -559,6 +559,7 @@ export default {
}, },
// chartSite用于区分是全屏显示还是局部显示 // chartSite用于区分是全屏显示还是局部显示
initChart (chartInfo, dataArg, ele, chartSite, legend) { initChart (chartInfo, dataArg, ele, chartSite, legend) {
this.legendMagicType = legend
this.chartInfo = chartInfo this.chartInfo = chartInfo
const self = this const self = this
this.chartType = '' // 图表类型 this.chartType = '' // 图表类型
@@ -566,6 +567,7 @@ export default {
this.chartType = 'line' this.chartType = 'line'
} }
const minusTime = (new Date(this.searchTime[0]).getTime() - new Date(this.$refs.pickTime.$refs.multipleTime.searchTime[0]).getTime()) const minusTime = (new Date(this.searchTime[0]).getTime() - new Date(this.$refs.pickTime.$refs.multipleTime.searchTime[0]).getTime())
this.minusTime = minusTime
let minTime = null let minTime = null
let maxTime = null let maxTime = null
if (dataArg.length > 0 && dataArg[0].data && if (dataArg.length > 0 && dataArg[0].data &&
@@ -738,7 +740,7 @@ export default {
str += '</div>' str += '</div>'
} }
if (tip.alias.indexOf('Previous ') !== -1 && minusFlag) { if (tip.alias.indexOf('Previous ') !== -1 && minusFlag) {
const value = item.data[0] - minusTime const value = item.data[0] - self.minusTime
const tData = new Date(value) const tData = new Date(value)
str += '<div style="margin-bottom: 5px;margin-top: 5px">' str += '<div style="margin-bottom: 5px;margin-top: 5px">'
str += bus.timeFormate(tData) str += bus.timeFormate(tData)
@@ -973,7 +975,7 @@ export default {
let str = '<div>' let str = '<div>'
let sum = 0 let sum = 0
params.forEach((item, i) => { params.forEach((item, i) => {
const tip = legend[item.seriesIndex] const tip = self.legendMagicType[item.seriesIndex]
const color = self.bgColorList[item.seriesIndex] const color = self.bgColorList[item.seriesIndex]
if (i === 0) { if (i === 0) {
const value = item.data[0] const value = item.data[0]
@@ -1140,8 +1142,9 @@ export default {
let str = '<div>' let str = '<div>'
let sum = 0 let sum = 0
let minusFlag = true let minusFlag = true
// console.log(params ,legend);
params.forEach((item, i) => { params.forEach((item, i) => {
const tip = legend[item.seriesIndex] const tip = self.legendMagicType[item.seriesIndex]
const color = self.bgColorList[item.seriesIndex] const color = self.bgColorList[item.seriesIndex]
if (i === 0 && tip.alias.indexOf('Previous ') === -1) { if (i === 0 && tip.alias.indexOf('Previous ') === -1) {
const value = item.data[0] const value = item.data[0]
@@ -1151,7 +1154,7 @@ export default {
str += '</div>' str += '</div>'
} }
if (tip.alias.indexOf('Previous ') !== -1 && minusFlag) { if (tip.alias.indexOf('Previous ') !== -1 && minusFlag) {
const value = item.data[0] - minusTime const value = item.data[0] - self.minusTime
const tData = new Date(value) const tData = new Date(value)
str += '<div style="margin-bottom: 5px;margin-top: 5px">' str += '<div style="margin-bottom: 5px;margin-top: 5px">'
str += bus.timeFormate(tData) str += bus.timeFormate(tData)