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

# Conflicts: # nezha-fronted/src/components/charts/chart-alert-list.vue # nezha-fronted/src/components/charts/chart-single-stat.vue # nezha-fronted/src/components/charts/chart-table.vue # nezha-fronted/src/components/charts/chart-url.vue # nezha-fronted/src/components/charts/line-chart-block.vue # nezha-fronted/src/components/charts/text-chart.vue
2020-12-15 21:21:35 +08:00
parent b7b238bb1e 935d37e611
commit 7f00a1483f
35 changed files with 1323 additions and 180 deletions
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -335,8 +335,8 @@ const en = {
        ruleNum:'Rule num',
        alertNum:'Alert num',
        alertRuleTopN: 'Top10 alert message',
-        assetTopN: 'Top10 alert message by Asset',
-        moduleTopN: 'Top10 alert message by Module',
+        assetTopN: 'Top alert message by Asset',
+        moduleTopN: 'Top alert message by Module',
        top:'Top',
        chart:{
          chartTitle:'Alert Trend'