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

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

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>

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)

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)) {