From 030ecd4e75b70b6cfc62be15aef75192d7c45a6d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 22 Jul 2021 14:13:38 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-860=20feat=EF=BC=9Acabinet=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=20=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/line-chart-block.vue  | 8 +++++---
 .../src/components/common/bottomBox/tabs/cabinetTab.vue   | 7 +++++++
 .../src/components/page/dashboard/overview/chart.vue      | 4 ++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 4a897498a..d275adef6 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -932,13 +932,17 @@ export default {
               let chartUnit = chartInfo.unit
               chartUnit = chartUnit || 2
               const unit = chartDataFormat.getUnit(chartUnit)
-              // const flag = JSON.stringify(value).length > JSON.stringify(chartDataFormat.Interval(maxValue, copies, unit.type)).length
               if (chartDataFormat.Interval(maxValue, copies, unit.type, 'min') < 1 && dot < 2) {
                 dot = 2
               }
               if (dot == 0) {
                 dot = 1
               }
+              dot = bus.countDecimals(value)
+              // console.log(dot,val)
+              if (dot < self.chartDot) {
+                dot = self.chartDot
+              }
               return unit.compute(value, index, -1, dot)
             }
           }
@@ -1055,8 +1059,6 @@ export default {
                       let paramsDot = bus.countDecimals(item.data[1])
                       if (paramsDot < self.chartDot) {
                         paramsDot = self.chartDot
-                      } else if (paramsDot > 6) {
-                        paramsDot = 6
                       }
                       if (i === 0) {
                         const value = bus.computeTimezone(item.data[0])
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index 7da11be48..578832f6f 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -44,6 +44,13 @@
           import-url="/dc/cabinet/import"
           @afterImport="getTableData"
         >
+          <template v-slot:before>
+            <div>
+              <el-dropdown-item>
+                <delete-button :type="'link'" :title="$t('overall.batchDel')" id="asset-model-batch-delete" v-has="'dc_delete'" :api="url" :delete-objs="batchDeleteObjs" @after="getTableData" @before="delFlag=true"></delete-button>
+              </el-dropdown-item>
+            </div>
+          </template>
         </top-tool-more-options>
       </template>
       <template v-slot:pagination>
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
index f4af3ca00..4fdb07cf5 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -495,6 +495,10 @@ export default {
         dot = 1
       }
       this.chartDot = dot
+      dot = bus.countDecimals(value)
+      if (dot < this.chartDot) {
+        dot = this.chartDot
+      }
       return unit.compute(value, index, -1, dot)
     },
     setRandomColors: function (num) { // 当线条过多，默认颜色数量不够时须使用此方法,num 颜色的数量，通常传递series的length即可