diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 2fc798ce7..ca4042eb1 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -137,7 +137,7 @@ const cn = { unit: "单位", legend: "图例", legendTip: "使用名称或表达式控制时间序列的名称。例如{{hostname}将替换为标签主机名的标签值。", - option: "操作" + option: "操作", }, chartTableColumn: { metric: "指标", @@ -209,6 +209,7 @@ const cn = { overview: { title: "系统总览", contentTitle: "Nezha 管理系统", + traffic: '流量', asset: { title: "资产", assetType: "资产类型", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 3ddb8156f..b580dc17d 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -214,6 +214,7 @@ const en = { overview:{ title:'Overview', contentTitle:'Nezha Management System', + traffic: 'Traffic', asset:{ title:'Asset', assetType:'Asset type', diff --git a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue index 1bf2fa4f4..18e0f3f59 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue @@ -234,6 +234,10 @@ trigger: 'axis', confine: false, extraCssText:'z-index:1000;', + formatter: function(v, i) { + console.info(v) + return v; + } }, grid: { left: 6, @@ -287,7 +291,20 @@ show: false }, axisLabel: { - fontSize: 13*window.devicePixelRatio + fontSize: 13*window.devicePixelRatio, + formatter: function(value, i) { + let y; + if (value < 1000) { + y = value + " Bs"; + } else if (value < 1000000) { + y = value/1000 + " KBs"; + } else if (value >= 1000000) { + y = value/1000000 + " MBs"; + } else { + y = value/1000000000 + " GBs"; + } + return y; + } } }, useUTC: false,//使用本地时间 diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue index f59f5610e..4a64c7ab0 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue @@ -66,7 +66,7 @@