From 6cdb1ae22e547a63e90b7af4fddd1ea3b141e518 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 24 Nov 2021 11:05:35 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1336=20fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BAvalue=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=90=8E=20?=
 =?UTF-8?q?=20=E6=8E=92=E5=BA=8F=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-table.vue    |  1 +
 .../src/components/charts/line-chart-block.vue         |  3 +--
 nezha-fronted/src/components/common/js/tools.js        | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue
index 2c6dac3ac..2e7e9db64 100644
--- a/nezha-fronted/src/components/charts/chart-table.vue
+++ b/nezha-fronted/src/components/charts/chart-table.vue
@@ -397,6 +397,7 @@ export default {
           }
           this.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)
         }
         return item
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index a2c734f6b..876c572a9 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -682,8 +682,7 @@ export default {
       let dot = this.chartDot = maxValueCopies.dot
       const copies = maxValueCopies.copies
       const unit = maxValueCopies.unit
-      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))
+      // const oldDot = maxValueCopies.oldDot
       let option = {
         title: {
           show: false
diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index 4fe669962..4d6eddc74 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -720,6 +720,10 @@ export const tableSet = {
     return function (obj1, obj2) {
       let val1 = obj1[prop]
       let val2 = obj2[prop]
+      if (prop === 'value') {
+        val1 = obj1.oldValue
+        val2 = obj2.oldValue
+      }
       if (!isNaN(val1) && !isNaN(val2) && prop === 'value') {
         val1 = Number(val1)
         val2 = Number(val2)
@@ -754,7 +758,11 @@ export const tableSet = {
     return function (obj1, obj2) {
       let val1 = obj1[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)
         val2 = Number(val2)
       }