Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev

# Conflicts:
#	src/views/charts/PanelChart.vue

src/views/charts/PanelChart.vue

@@ -75,7 +75,7 @@ import {
   isAppRelatedDomain,
   isBlock
 } from './charts/tools'
-import { tableTitleMapping } from '@/components/charts/chart-table-title'
+import { tableTitleMapping, legendMapping } from '@/components/charts/chart-table-title'
 import { replaceUrlPlaceholder } from '@/utils/tools'
 import { getNowTime, getSecond } from '@/utils/date-util'
 import { chartPieTableTopOptions, chartTableDefaultPageSize, chartTableTopOptions } from '@/utils/constants'
@@ -166,6 +166,7 @@ export default {
   methods: {
     /* 参数 extraParams 额外请求参数，isRefresh 是否是刷新 */
     getChartData (url, extraParams = {}, isRefresh) {
+      const vm = this
       this.loading = true
       this.standaloneTimeRange.use = !!isRefresh
       try {
@@ -194,6 +195,13 @@ export default {
               response = testData.data2
             }
             if (response.code === 200) {
+              if (Array.isArray(response.data.result)) {
+                response.data.result.forEach(item => {
+                  if (item.legend && legendMapping[`${this.entity && this.entity.ip ? 'ip_' : ''}${item.legend}`]) {
+                    item.legend = vm.$t(legendMapping[`${this.entity && this.entity.ip ? 'ip_' : ''}${item.legend}`])
+                  }
+                })
+              }
               this.chartData = response.data.result
               this.table.tableData = response.data.result
               this.table.tableColumns = this.getTableTitle(response.data.result)