From 4e343d71371d3e551010ae8ab090f70d69c380a6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 25 Mar 2022 16:37:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=20=E5=80=BC?=
 =?UTF-8?q?=E4=B8=BA=20=E2=80=9C0=E2=80=9D=20=20=E5=AF=B9=E5=8F=96?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC=E7=9A=84=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartTimeSeries.vue   | 12 +++++++++---
 .../src/components/charts/chartDataFormat.js         |  3 +++
 .../components/common/bottomBox/tabs/panelTabNew.vue |  6 +++---
 .../components/common/popBox/topToolMoreOptions.vue  |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index e247619c8..39da13cb5 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -133,9 +133,14 @@ export default {
       })
       minTime = timeSorted.length ? timeSorted[0][0] : ''
       maxTime = timeSorted.length ? timeSorted[timeSorted.length - 1][0] : ''
-      minValue = valueSorted.length ? valueSorted[0][1] : ''
-      maxValue = valueSorted.length ? valueSorted[valueSorted.length - 1][1] : ''
+      minValue = valueSorted.length ? valueSorted[0][1] : 0
+      maxValue = valueSorted.length ? valueSorted[valueSorted.length - 1][1] : 0
       const unit = chartDataFormat.getUnit(chartUnit)
+      if (!isNaN(maxValue)) {
+        maxValue = Number(maxValue)
+      } else {
+        maxValue = 0
+      }
       maxValue = chartDataFormat.formatDatas(maxValue, unit.type, 'ceil', unit.ascii) // 取最大值后 需要对其进行取整
       let oldValue = maxValue
       let dot = 0
@@ -154,7 +159,8 @@ export default {
         maxValue = Math.floor(oldValue) / Math.pow(10, dot)
         dot++
       }
-      const copies = chartDataFormat.copies(oldValue, unit.type)
+      console.log(oldValue)
+      const copies = chartDataFormat.copies(Number(oldValue), unit.type)
       return { minTime, maxTime, minValue, maxValue, copies, unit, dot }
     },
     xAxisLabelFormatter (minTime, maxTime) {
diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js
index 9d307364b..a380cc174 100644
--- a/nezha-fronted/src/components/charts/chartDataFormat.js
+++ b/nezha-fronted/src/components/charts/chartDataFormat.js
@@ -790,6 +790,9 @@ export default {
     }
   },
   Interval: function (value, copies, type, interValType) {
+    if (!copies) {
+      copies = 1
+    }
     if (interValType === 'max' && value < 1) {
       if (value < 1) {
         value = 1
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index 98cec42fa..f68914d65 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -23,7 +23,7 @@
             id="asset-list"
             :params="filter"
             :params-type="paramsType"
-            :permissions="{import: 'main_add', export: 'panel_edit'}"
+            :permissions="{import: 'main_add', export: 'main_edit'}"
             class="top-tool-export margin-r-10"
             export-file-name="asset-charts"
             export-url="visual/panel/export"
@@ -60,8 +60,8 @@
             :showLock="from === fromRoute.endpoint"
             class="top-tool-export margin-r-10"
             export-file-name="endpoint-charts"
-            export-url="visual/panel/export"
-            import-url="visual/panel/import"
+            :export-url="'visual/panel/export'"
+            :import-url="'visual/panel/import'"
             @afterImport="getTableData"
             @panelLockChange="panelLockChange"
           >
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index 84829587e..e0cefbae5 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -13,7 +13,7 @@
         <div id="chart-import" @click="showImportBox(1)"><i class="nz-icon nz-icon-upload"></i>{{$t('overall.importExcel')}}</div>
       </el-dropdown-item>
       <el-dropdown-item v-has="permissions.export" v-if="exportUrl">
-        <div id="chart-export"@click="showImportBox(2)"><i class="nz-icon nz-icon-download1"></i>{{$t('overall.exportExcel')}}</div>
+        <div id="chart-export" @click="showImportBox(2)"><i class="nz-icon nz-icon-download1"></i>{{$t('overall.exportExcel')}}</div>
       </el-dropdown-item>
       <!-- import、export之后的内容 -->
       <slot name="after"></slot>

From 252f03f59f23f8330adf4b64c6c60c33340447e3 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 25 Mar 2022 16:55:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DalertRule=20?=
 =?UTF-8?q?=E5=88=AB=E8=A1=A8=E9=A1=B5=E9=9D=A2=E9=98=88=E5=80=BC=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chartDataFormat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js
index a380cc174..f34e8179a 100644
--- a/nezha-fronted/src/components/charts/chartDataFormat.js
+++ b/nezha-fronted/src/components/charts/chartDataFormat.js
@@ -6,7 +6,7 @@
 import bus from '../../libs/bus'
 import { formatScientificNotation } from '@/components/common/js/tools'
 function none (value, index) {
-  const scientificNotationValue = formatScientificNotation(num, dot)
+  const scientificNotationValue = formatScientificNotation(value, 2)
   if (!numberWithEConvent(scientificNotationValue)) {
     return scientificNotationValue
   }