diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 31286586a..7aaa32002 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -433,6 +433,7 @@ const en = { asset: { title: 'Asset', assetType: 'Asset type', + assetState: 'Asset state', modelStat: 'Model', dcStat: 'Data center', num: 'Num', diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index a5538c7b7..efaabe119 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -111,7 +111,7 @@ export default { const type = legendData.find(item => { return item[0] == name }) - return type ? `${name} (${type[1]}%)` : null + return type ? `${name} (${type[1]})` : null } this.$set(this.option, 'legend', legend) } diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview.vue b/nezha-fronted/src/components/page/dashboard/overview/overview.vue index 2275226f7..a73750f59 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/overview.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/overview.vue @@ -137,10 +137,10 @@
- {{$t("dashboard.overview.asset.assetType")}} + {{$t("dashboard.overview.asset.assetState")}}
- +
No Data
@@ -461,7 +461,7 @@ export default { queryAssetTypeData () { return new Promise(resolve => { this.assetTypeLoading = true - this.$get('stat/asset/type').then(response => { + this.$get('stat/asset/state').then(response => { this.assetTypeLoading = false if (response.code === 200) { this.assetTypeData = response.data.list @@ -470,15 +470,15 @@ export default { const typeSeriesData = [] const vm = this - const assetTotalCount = (function () { + /* const assetTotalCount = (function () { let count = 0 vm.assetTypeData.forEach(item => { count += item.num }) return count - }()) + }()) */ this.assetTypeData.forEach(item => { - legendData.push([item.name, (item.num * 100 / assetTotalCount).toFixed(2)]) + legendData.push([item.name, item.num]) typeSeriesData.push({ name: item.name, value: item.num }) }) const series = [{ @@ -1045,7 +1045,7 @@ export default { simpleFormatter (params) { return `
${params.value}
` }, - assetTypeFormatter (params) { + assetStateFormatter (params) { return `
${params.name}: ${params.value}
` }, switchFullScreen () {