diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index aad43b80c..542b49cd8 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -829,6 +829,7 @@ export default { // chartSite用于区分是全屏显示还是局部显示 initChart (chartInfo, dataArg, ele, legend) { const self = this + self.isStackArea = false let minTime = null let maxTime = null if (dataArg.length > 0 && dataArg[0].data && @@ -936,31 +937,30 @@ export default { str += '
' } showFlag = showFlag || item.data[1] - if (isNaN(item.data[1] + '')) { - return + if (!isNaN(item.data[1] + '')) { + const val = formatScientificNotation(item.data[1], 2) + sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val)) + str += '
' + str += `
${tip ? (tip.alias ? tip.alias : tip.name) : item.seriesName}
` + str += '
' + str += (function () { + if (chartInfo.from == 'endpoint') { + return val == 1 ? 'up' : 'down' + } + return chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, 2) + }()) + str += '
' + str += '
' } - const val = formatScientificNotation(item.data[1], 2) - sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val)) - str += '
' - str += `
${tip ? (tip.alias ? tip.alias : tip.name) : item.seriesName}
` - str += '
' - str += (function () { - if (chartInfo.from == 'endpoint') { - return val == 1 ? 'up' : 'down' - } - return chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, 2) - }()) - str += '
' - str += '
' }) if (chartInfo.type === 'stackArea' || self.isStackArea) { - sum = parseFloat(Number(sum).toFixed(2)) + sum = parseFloat(Number(sum).toFixed(6)) str += '
' str += '
' str += self.$t('dashboard.panel.chartTotal') str += '
' str += '
' - str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(sum, null, 2) + str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(sum, null, 6) str += '
' str += '
' } @@ -1088,6 +1088,7 @@ export default { this.$refs.loadingPreview.endLoading() }) + this.echartModalStore.off('magictypechanged') this.echartModalStore.on('magictypechanged', function (params) { self.isStackArea = !self.isStackArea if (self.isStackArea) { diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index e53b2c8b1..28777baad 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -647,6 +647,7 @@ export default { this.legendMagicType = legend this.chartInfo = chartInfo const self = this + self.isStackArea = false this.chartType = '' // 图表类型 if (chartInfo.type === 4) { // line,bar this.chartType = 'line' @@ -837,49 +838,48 @@ export default { minusFlag = false } showFlag = showFlag || item.data[1] - if (isNaN(item.data[1] + '')) { - return - } - const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName) - let paramsDot = bus.countDecimals(item.data[1]) - if (paramsDot < self.chartDot) { - paramsDot = self.chartDot - } else if (paramsDot > 6) { - paramsDot = 6 - } - const val = formatScientificNotation(item.data[1], paramsDot) - sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val)) - - str += '
' - str += `
${tip ? (tip.alias ? tip.alias : tip.name) : item.seriesName}
` - str += '
' - str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, -1, paramsDot) - if (previousItem) { - str += '' - const previousval = formatScientificNotation(previousItem.data[1], paramsDot) - let minusVal = 0 - if (previousval <= val) { - minusVal = val - previousval - str += '+' - } else { - minusVal = previousval - val - str += '-' + if (!isNaN(item.data[1] + '')) { + const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName) + let paramsDot = bus.countDecimals(item.data[1]) + if (paramsDot < self.chartDot) { + paramsDot = self.chartDot + } else if (paramsDot > 6) { + paramsDot = 6 } + const val = formatScientificNotation(item.data[1], paramsDot) + sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val)) - str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(minusVal, null, -1, paramsDot) - str += '' - } else if (tip.alias.indexOf('Previous ') !== -1) { - str += '' - str += '' + str += '
' + str += `
${tip ? (tip.alias ? tip.alias : tip.name) : item.seriesName}
` + str += '
' + str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, -1, paramsDot) + if (previousItem) { + str += '' + const previousval = formatScientificNotation(previousItem.data[1], paramsDot) + let minusVal = 0 + if (previousval <= val) { + minusVal = val - previousval + str += '+' + } else { + minusVal = previousval - val + str += '-' + } + + str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(minusVal, null, -1, paramsDot) + str += '' + } else if (tip.alias.indexOf('Previous ') !== -1) { + str += '' + str += '' + } + str += '
' + str += '
' } - str += '
' - str += '
' }) if (self.data.type === 'stackArea' || self.isStackArea) { if (!self.stackTotalColor || self.stackTotalColor == '') { self.stackTotalColor = randomcolor() } - sum = parseFloat(Number(sum).toFixed(2)) + sum = parseFloat(Number(sum).toFixed(6)) str += '
' str += '
' str += `` @@ -1101,6 +1101,7 @@ export default { }, 800) window.addEventListener('resize', this.chartResize) + getChart(this.chartIndex).off('magictypechanged') getChart(this.chartIndex).on('magictypechanged', function (params) { self.isStackArea = !self.isStackArea if (self.isStackArea) { @@ -1152,26 +1153,25 @@ export default { str += '
' } showFlag = showFlag || item.data[1] - if (isNaN(item.data[1] + '')) { - return + if (!isNaN(item.data[1] + '')) { + const val = formatScientificNotation(item.data[1], 2) + sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val)) + str += '
' + str += `
${tip ? (tip.alias ? tip.alias : tip.name) : item.seriesName}
` + str += '
' + str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, -1, paramsDot) + str += '
' + str += '
' } - const val = formatScientificNotation(item.data[1], 2) - sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val)) - str += '
' - str += `
${tip ? (tip.alias ? tip.alias : tip.name) : item.seriesName}
` - str += '
' - str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, -1, paramsDot) - str += '
' - str += '
' }) if (self.data.type === 'stackArea' || self.isStackArea) { - sum = parseFloat(Number(sum).toFixed(2)) + sum = parseFloat(Number(sum).toFixed(6)) str += '
' str += '
' str += self.$t('dashboard.panel.chartTotal') str += '
' str += '
' - str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(sum, null, 2) + str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(sum, null, self.chartDot) str += '
' str += '
' } @@ -1276,7 +1276,7 @@ export default { self.echartModalStore.off('finished') }) }, 100) - + this.echartModalStore.off('magictypechanged') this.echartModalStore.on('magictypechanged', function (params) { self.isStackArea = !self.isStackArea if (self.isStackArea) { @@ -1337,54 +1337,53 @@ export default { minusFlag = false } showFlag = showFlag || item.data[1] - if (isNaN(item.data[1] + '')) { - return - } - const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName) - const val = formatScientificNotation(item.data[1], 2) - sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val)) - str += '
' - str += `
${tip ? (tip.alias ? tip.alias : tip.name) : item.seriesName}
` - str += '
' - str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, self.chartDot) - if (previousItem) { - str += '' - const previousval = formatScientificNotation(previousItem.data[1], 2) - let minusVal = 0 - if (previousval <= val) { - minusVal = val - previousval - str += '+' - } else { - minusVal = previousval - val - str += '-' - } + if (!isNaN(item.data[1] + '')) { + const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName) + const val = formatScientificNotation(item.data[1], 2) + sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val)) + str += '
' + str += `
${tip ? (tip.alias ? tip.alias : tip.name) : item.seriesName}
` + str += '
' + str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(val, null, self.chartDot) + if (previousItem) { + str += '' + const previousval = formatScientificNotation(previousItem.data[1], 2) + let minusVal = 0 + if (previousval <= val) { + minusVal = val - previousval + str += '+' + } else { + minusVal = previousval - val + str += '-' + } - str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(minusVal, null, self.chartDot) - str += '' - } else if (tip.alias.indexOf('Previous ') !== -1) { - str += '' - str += '' - } - str += '
' - if (previousItem) { - str += '
' - const previousval = formatScientificNotation(previousItem.data[1], 2) - let minusVal = 0 - if (previousval <= val) { - minusVal = val - previousval - str += '+' - } else { - minusVal = previousval - val - str += '-' + str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(minusVal, null, self.chartDot) + str += '' + } else if (tip.alias.indexOf('Previous ') !== -1) { + str += '' + str += '' } + str += '
' + if (previousItem) { + str += '
' + const previousval = formatScientificNotation(previousItem.data[1], 2) + let minusVal = 0 + if (previousval <= val) { + minusVal = val - previousval + str += '+' + } else { + minusVal = previousval - val + str += '-' + } - str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(minusVal, null, self.chartDot) + str += chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(minusVal, null, self.chartDot) + str += '
' + } str += '
' } - str += '
' }) if (self.data.type === 'stackArea' || self.isStackArea) { - sum = parseFloat(Number(sum).toFixed(2)) + sum = parseFloat(Number(sum).toFixed(6)) str += '
' str += '
' str += self.$t('dashboard.panel.chartTotal') diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index 366ca35f1..dc3562b7e 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -438,43 +438,42 @@ export default { minusFlag = false } showFlag = showFlag || item.data[1] - if (isNaN(item.data[1] + '')) { - return - } - const val = Number(item.data[1]) - str += '
' - str += `
${alias || item.seriesName}:
` - str += '
' - let dot = bus.countDecimals(val) - // console.log(dot,val) - if (dot < this.chartDot) { - dot = this.chartDot - } else if (dot > 6) { - dot = 6 - } - str += chartDataFormat.getUnit(this.unit).compute(val, null, -1, dot) - const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName) - if (previousItem) { - str += '' - const previousval = formatScientificNotation(previousItem.data[1], dot) - let minusVal = 0 - if (previousval <= val) { - minusVal = val - previousval - str += '+' - } else { - minusVal = previousval - val - str += '-' + if (!isNaN(item.data[1] + '')) { + const val = Number(item.data[1]) + str += '
' + str += `
${alias || item.seriesName}:
` + str += '
' + let dot = bus.countDecimals(val) + // console.log(dot,val) + if (dot < this.chartDot) { + dot = this.chartDot + } else if (dot > 6) { + dot = 6 } + str += chartDataFormat.getUnit(this.unit).compute(val, null, -1, dot) + const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName) + if (previousItem) { + str += '' + const previousval = formatScientificNotation(previousItem.data[1], dot) + let minusVal = 0 + if (previousval <= val) { + minusVal = val - previousval + str += '+' + } else { + minusVal = previousval - val + str += '-' + } - str += chartDataFormat.getUnit(this.unit).compute(minusVal, null, -1, dot) - str += '' - } else if (alias.indexOf('Previous ') !== -1) { - str += '' - str += '' + str += chartDataFormat.getUnit(this.unit).compute(minusVal, null, -1, dot) + str += '' + } else if (alias.indexOf('Previous ') !== -1) { + str += '' + str += '' + } + str += '
' + + str += '
' } - str += '
' - - str += '
' }) str += '
' if (!showFlag) {