fix: detection列表加上分页、顶部柱状图时区解决；实体列表--ip下拉的地图查询参数修正

src/utils/api.js

@@ -84,6 +84,7 @@ export const api = {
       victimLocation: '/interface/detection/security/filter/victimLocation',
       eventSeverity: '/interface/detection/security/filter/severity',
       listBasic: '/interface/detection/security/list/basic',
+      listCount: '/interface/detection/security/list/count',
       overviewBasic: '/interface/detection/security/detail/overview/basic',
       overviewEvent: '/interface/detection/security/detail/overview/event'
     },
@@ -93,6 +94,7 @@ export const api = {
       eventSeverity: '/interface/detection/performance/filter/severity',
       activeEntity: '/interface/detection/performance/filter/activeEntity',
       listBasic: '/interface/detection/performance/list/basic',
+      listCount: '/interface/detection/performance/list/count',
       overviewBasic: '/interface/detection/performance/detail/overview/basic'
     }
   }

src/utils/date-util.js

@@ -40,8 +40,7 @@ export function getNowTime (interval) {
     endTime
   }
 }
-//日期格式转换
-export function  rTime(date) {
-  let json_date = new Date(date).toJSON();
-  return new Date(new Date(json_date) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
+// 日期格式转换
+export function rTime (date) {
+  return window.$dayJs.tz(new Date(date)).format('YYYY-MM-DD HH:mm:ss')
 }

src/views/charts/PanelChart.vue

@@ -45,8 +45,7 @@
 <script>
 import ChartHeader from './ChartHeader'
 import Chart from '@/views/charts/Chart'
-import testData from './charts/testData'
-import { dnsServerRole } from '@/utils/constants'
+import { dnsServerRole, chartPieTableTopOptions, chartTableDefaultPageSize, chartTableTopOptions } from '@/utils/constants'
 import {
   isEcharts,
   isSingleValue,
@@ -79,7 +78,7 @@ import {
 import { tableTitleMapping, legendMapping } from '@/views/charts/charts/chart-table-title'
 import { replaceUrlPlaceholder } from '@/utils/tools'
 import { getNowTime, getSecond } from '@/utils/date-util'
-import { chartPieTableTopOptions, chartTableDefaultPageSize, chartTableTopOptions } from '@/utils/constants'
+
 import { get } from '@/utils/http'
 import { ref } from 'vue'
 import _ from 'lodash'
@@ -208,16 +207,16 @@ export default {
                 data: {
                   result: [
                     {
-                      "dnsServerRole":"TLDNS",
-                      "ipLocationCountry":"China",
-                      "ipLocationId":"CN",
-                      "count":161
+                      dnsServerRole: 'TLDNS',
+                      ipLocationCountry: 'China',
+                      ipLocationId: 'CN',
+                      count: 161
                     },
                     {
-                      "dnsServerRole":"RTDNS",
-                      "ipLocationCountry":"Japan",
-                      "ipLocationId":"JP",
-                      "count":222
+                      dnsServerRole: 'RTDNS',
+                      ipLocationCountry: 'Japan',
+                      ipLocationId: 'JP',
+                      count: 222
                     }
                   ]
                 }

src/views/detections/Index.vue

@@ -1016,6 +1016,11 @@ export default {
         this.listData = data
       }).catch(error => {
 
+      })
+      getData(api.detection[this.pageType].listCount, params).then(data => {
+        this.pageObj.total = data
+      }).catch(error => {
+
       })
     },
     timeRefreshChange () {

src/views/entityExplorer/entityList/detailOverview/Ip.vue

@@ -257,8 +257,7 @@ export default {
       const queryParams = {
         startTime: parseInt(this.timeFilter.startTime / 1000),
         endTime: parseInt(this.timeFilter.endTime / 1000),
-        ip: this.entityData.ipAddr,
-        country: this.entityData.ipLocationCountry
+        ip: this.entityData.ipAddr
       }
       return queryParams
     },