Merge branch 'dev-2.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1

# Conflicts: # nezha-fronted/src/components/common/ChartDiagram/diagram.vue # nezha-fronted/src/components/common/project/L5/CanvasProps.vue # nezha-fronted/src/components/layout/header.vue
2021-10-14 14:52:52 +08:00
parent d387aa0288 4b4994f59c
commit 0558619ad6
6 changed files with 51 additions and 15 deletions
--- a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
@@ -451,10 +451,10 @@ const overviewLine = {
 const noDataOption = {
  grid: {
    top: 30,
-    left: 0,
+    left: 20,
    right: 30,
    containLabel: true,
-    bottom: 20// 156
+    bottom: 0// 156
  },
  xAxis: {
    type: 'category',