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

NEZ-1336 fix： 修改因为value格式化后 排序不对的问题

Browse Source
This commit is contained in:
zhangyu
2021-11-24 11:05:35 +08:00
parent 483b70dbab
commit 6cdb1ae22e
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/components/charts/chart-table.vue
View File

@@ -397,6 +397,7 @@ export default {
} }
this.mapping = mapping this.mapping = mapping
item.mapping = mapping item.mapping = mapping
item.oldValue = item.value
item.value = mapping ? mapping.text.replace('{{value}}', item.value).replace('{{name}}', item.element.alias) : chartDataFormat.getUnit(chartItem.unit ? chartItem.unit : 2).compute(value, null, 2) item.value = mapping ? mapping.text.replace('{{value}}', item.value).replace('{{name}}', item.element.alias) : chartDataFormat.getUnit(chartItem.unit ? chartItem.unit : 2).compute(value, null, 2)
} }
return item return item

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

@@ -682,8 +682,7 @@ export default {
let dot = this.chartDot = maxValueCopies.dot let dot = this.chartDot = maxValueCopies.dot
const copies = maxValueCopies.copies const copies = maxValueCopies.copies
const unit = maxValueCopies.unit const unit = maxValueCopies.unit
const oldDot = maxValueCopies.oldDot // const oldDot = maxValueCopies.oldDot
console.log(maxValueCopies, chartDataFormat.Interval(maxValue, copies, unit.type, 'min'), chartDataFormat.Interval(maxValue, copies, unit.type, 'max') * Math.ceil(dataArg.length / 5))
let option = { let option = {
title: { title: {
show: false show: false

10
nezha-fronted/src/components/common/js/tools.js
View File

@@ -720,6 +720,10 @@ export const tableSet = {
return function (obj1, obj2) { return function (obj1, obj2) {
let val1 = obj1[prop] let val1 = obj1[prop]
let val2 = obj2[prop] let val2 = obj2[prop]
if (prop === 'value') {
val1 = obj1.oldValue
val2 = obj2.oldValue
}
if (!isNaN(val1) && !isNaN(val2) && prop === 'value') { if (!isNaN(val1) && !isNaN(val2) && prop === 'value') {
val1 = Number(val1) val1 = Number(val1)
val2 = Number(val2) val2 = Number(val2)
@@ -754,7 +758,11 @@ export const tableSet = {
return function (obj1, obj2) { return function (obj1, obj2) {
let val1 = obj1[prop] let val1 = obj1[prop]
let val2 = obj2[prop] let val2 = obj2[prop]
if (!isNaN(Number(val1)) && !isNaN(Number(val2)) && prop !== 'time') { if (prop === 'value') {
val1 = obj1.oldValue
val2 = obj2.oldValue
}
if (!isNaN(Number(val1)) && !isNaN(Number(val2)) && prop === 'value') {
val1 = Number(val1) val1 = Number(val1)
val2 = Number(val2) val2 = Number(val2)
} }