From 0248e7b5df85205a732828710385081afa5be971 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 26 Jan 2022 16:04:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=83=A8?=
 =?UTF-8?q?=E5=88=86legend=20=E6=9C=AA=E5=9B=BD=E9=99=85=E5=8C=96=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charts/PanelChart.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue
index e2a6cf85..6a0a4111 100644
--- a/src/views/charts/PanelChart.vue
+++ b/src/views/charts/PanelChart.vue
@@ -72,7 +72,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'
@@ -163,6 +163,7 @@ export default {
   methods: {
     /* 参数 extraParams 额外请求参数，isRefresh 是否是刷新 */
     getChartData (url, extraParams = {}, isRefresh) {
+      const vm = this
       this.loading = true
       this.standaloneTimeRange.use = !!isRefresh
       try {
@@ -184,7 +185,7 @@ export default {
         }
         if (this.isSingleValue) {
           if (chartParams && chartParams.dataKey) {
-            get(replaceUrlPlaceholder(chartParams.url), this.queryParams).then(response =>{
+            get(replaceUrlPlaceholder(chartParams.url), this.queryParams).then(response => {
               if (response.code === 200) {
                 if (response.data.result && (response.data.result[chartParams.dataKey] || response.data.result[chartParams.dataKey] === 0)) {
                   this.chartData = response.data.result[chartParams.dataKey]
@@ -208,6 +209,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)
@@ -322,8 +330,8 @@ export default {
       return this.$_.slice(tableData, (pageNum - 1) * pageSize, pageNum * pageSize)
     },
     groupShow (chartInfo) {
-      this.$emit('groupShow',chartInfo)
-    },
+      this.$emit('groupShow', chartInfo)
+    }
   },
   mounted () {
     this.showLoading(true)

From b3249ed8a3696ea718e737225c95a688967841f4 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Wed, 26 Jan 2022 17:02:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?CN-269=20=E5=9B=BE=E8=A1=A8=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84-echarts=E7=B1=BB=E5=9E=8B=E5=9B=BE=E8=A1=A8=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84:=E5=B8=A6=E5=9B=BE=E8=A1=A8=E9=A5=BC=E5=9B=BE?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BBtable=E8=AE=B0=E5=BD=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=B6=EF=BC=8C=E6=97=B6=E9=97=B4=E6=88=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charts/Chart2.vue                      |  2 --
 src/views/charts/charts/ChartEchartWithTable.vue | 11 +++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/charts/Chart2.vue b/src/views/charts/Chart2.vue
index 79acb4f1..669d953a 100644
--- a/src/views/charts/Chart2.vue
+++ b/src/views/charts/Chart2.vue
@@ -175,7 +175,6 @@
               v-else-if="isIpHostedDomain"
               :chart-info="chartInfo"
               :chart-data="chartData"
-              :query-params="queryParams"
               @showLoading="showLoading"
               :entity="entity"
       ></chart-echart-ip-hosted-domain>
@@ -184,7 +183,6 @@
               v-else-if="isAppRelatedDomain"
               :chart-info="chartInfo"
               :chart-data="chartData"
-              :query-params="queryParams"
               @showLoading="showLoading"
               :entity="entity"
       ></chart-echart-app-relate-domain>
diff --git a/src/views/charts/charts/ChartEchartWithTable.vue b/src/views/charts/charts/ChartEchartWithTable.vue
index c90885df..24b509a8 100644
--- a/src/views/charts/charts/ChartEchartWithTable.vue
+++ b/src/views/charts/charts/ChartEchartWithTable.vue
@@ -4,7 +4,7 @@
       <div class="chart-drawing" :id="`chart${chartInfo.id}`"></div>
     </div>
     <div class="cn-chart__footer pie-with-table" >
-      <pie-table :tableData="pieTableData" ref="pieTable" :chartInfo="chartInfo" :time-filter="queryParams" :order="orderPieTable"/>
+      <pie-table :tableData="pieTableData" ref="pieTable" :chartInfo="chartInfo" :time-filter="handleQueryParams(queryParams)" :order="orderPieTable"/>
     </div>
   </div>
 </template>
@@ -43,6 +43,12 @@ export default {
   mounted () {
   },
   methods: {
+    handleQueryParams(queryParams) {
+      return this.timeFilter = {
+        startTime:Number(queryParams.startTime)*1000,
+        endTime:Number(queryParams.endTime)*1000
+      }
+    },
     initEchartsWithTable (id) {
       const chartParams = this.chartInfo.params
       const dom = document.getElementById(id)
@@ -81,9 +87,6 @@ export default {
       if (this.chartOption.series[0].data && this.chartOption.series[0].data.length > 10) { // pieWithTable 图例超过10个改为滚动显示
         this.chartOption.legend.type = 'scroll'
       }
-
-      console.log('table===' + JSON.stringify(this.chartOption))
-
       this.loadEchartWithTable()
 
       if (!this.$_.isEmpty(data)) {