Merge remote-tracking branch 'origin/codeCheck' into codeCheck

# Conflicts: # nezha-fronted/src/components/charts/chart-alert-list.vue
2020-06-04 18:36:18 +08:00
parent 5f7c5f2731 06d33dbf80
commit 7d91ae1568
22 changed files with 89 additions and 32 deletions
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -1120,6 +1120,10 @@
                          showSymbol:false,
                          data: [],
                          type:this.data.type,
+                          lineStyle: {
+                            width: 1,
+                            opacity: 0.9
+                          },
                          //visible: true,
                          //threshold: null,
                        },