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

NEZ-1253 fix: Chart Previous 之前一小时对比数值有误

Browse Source
This commit is contained in:
zhangyu
2021-11-16 15:32:09 +08:00
parent 18a896d776
commit 78d56bedf1
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -790,13 +790,14 @@ export default {
} }
const val = formatScientificNotation(item.data[1], paramsDot) const val = formatScientificNotation(item.data[1], paramsDot)
sum += self.numberWithEConvent(val) sum += self.numberWithEConvent(val)
str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">' str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">'
str += `<div style="max-width: 500px;white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;"><span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${color};}'></span>${tip ? (tip.alias ? tip.alias : tip.name) : item.seriesName} </div>` str += `<div style="max-width: 500px;white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;"><span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${color};}'></span>${tip ? (tip.alias ? tip.alias : tip.name) : item.seriesName} </div>`
str += '<div style="padding-left: 10px;min-width: 75px;text-align: right">' str += '<div style="padding-left: 10px;min-width: 75px;text-align: right">'
str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, -1, paramsDot) str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, -1, paramsDot)
if (previousItem) { if (previousItem) {
str += '<span style="padding-left: 10px; display: inline-block;width: 65px;text-align: right">' str += '<span style="padding-left: 10px; display: inline-block;width: 65px;text-align: right;box-sizing: border-box;padding-right: 10px">'
const previousval = formatScientificNotation(item.data[1], paramsDot) const previousval = formatScientificNotation(previousItem.data[1], paramsDot)
let minusVal = 0 let minusVal = 0
if (previousval <= val) { if (previousval <= val) {
minusVal = val - previousval minusVal = val - previousval
@@ -1266,7 +1267,7 @@ export default {
str += '<div style="padding-left: 10px;min-width: 75px;text-align: right">' str += '<div style="padding-left: 10px;min-width: 75px;text-align: right">'
str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, self.chartDot) str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, self.chartDot)
if (previousItem) { if (previousItem) {
str += '<span style="padding-left: 10px; display: inline-block;width: 65px;text-align: right">' str += '<span style="padding-left: 10px; display: inline-block;width: 65px;text-align: right;box-sizing: border-box;padding-right: 10px">'
const previousval = formatScientificNotation(previousItem.data[1], 2) const previousval = formatScientificNotation(previousItem.data[1], 2)
let minusVal = 0 let minusVal = 0
if (previousval <= val) { if (previousval <= val) {
@@ -1578,6 +1579,7 @@ export default {
this.echartModalStore.showLoading(); this.echartModalStore.showLoading();
} }
*/ */
let self = this
let axiosArr = [] let axiosArr = []
this.$nextTick(() => { this.$nextTick(() => {
let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss') let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss')
@@ -1685,7 +1687,7 @@ export default {
label: { label: {
distance: this.computeDistance(chartDataFormat.getUnit(this.data.unit ? this.data.unit : 2).compute(this.data.param.threshold)), distance: this.computeDistance(chartDataFormat.getUnit(this.data.unit ? this.data.unit : 2).compute(this.data.param.threshold)),
formatter: function (params) { formatter: function (params) {
return chartDataFormat.getUnit(this.data.unit ? this.data.unit : 2).compute(params.value) return chartDataFormat.getUnit(self.data ? self.data.unit : 2).compute(params.value)
} }
}, },
lineStyle: { lineStyle: {

2
nezha-fronted/src/components/page/dashboard/overview/chart.vue
View File

@@ -450,7 +450,7 @@ export default {
str += chartDataFormat.getUnit(this.unit).compute(val, null, -1, dot) str += chartDataFormat.getUnit(this.unit).compute(val, null, -1, dot)
const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName) const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName)
if (previousItem) { if (previousItem) {
str += '<span style="padding-left: 10px; display: inline-block;width: 100px;text-align: right">' str += '<span style="padding-left: 10px; display: inline-block;width: 65px;text-align: right;box-sizing: border-box;padding-right: 10px">'
const previousval = formatScientificNotation(previousItem.data[1], dot) const previousval = formatScientificNotation(previousItem.data[1], dot)
let minusVal = 0 let minusVal = 0
if (previousval <= val) { if (previousval <= val) {