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
This commit is contained in:
chenjinsong
2020-12-15 21:21:35 +08:00
35 changed files with 1323 additions and 180 deletions

View File

@@ -329,12 +329,12 @@ const cn = {
ruleNum: "告警规则总数",
alertNum: "告警数量",
alertRuleTopN: "根据告警规则统计告警消息数量TOP10",
assetTopN: "根据资产统计告警消息数量TOP10",
assetTopN: "根据资产统计告警消息数量TOP",
top: "Top",
chart: {
chartTitle: "告警趋势"
},
moduleTopN: "根据模块列出Top10告警信息"
moduleTopN: "根据模块列出Top告警信息"
},
mapTooltip: {
asset: "资产",