From c4fe2271e8d28fec5dd627829e21e3bd30197a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Tue, 16 May 2023 15:59:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddetection=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E5=BC=80=E6=97=B6=E6=8E=A5=E5=8F=A3=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8D=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/detections/DetectionList.vue                     | 1 +
 src/views/detections/DetectionRow.vue                      | 7 ++++++-
 .../overview/DetectionPerformanceEventAppOverview.vue      | 5 +++--
 .../overview/DetectionPerformanceEventDomainOverview.vue   | 5 +++--
 .../overview/DetectionPerformanceEventIpOverview.vue       | 5 +++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/detections/DetectionList.vue b/src/views/detections/DetectionList.vue
index 874c8703..342a88bc 100644
--- a/src/views/detections/DetectionList.vue
+++ b/src/views/detections/DetectionList.vue
@@ -13,6 +13,7 @@
             :page-type="pageType"
             :timeFilter="timeFilter"
             :key="index"
+            :pageObj="pageObj"
             :ref="`detectionRow${index}`"
             :index="index"
             @switchCollapse="switchCollapse"
diff --git a/src/views/detections/DetectionRow.vue b/src/views/detections/DetectionRow.vue
index 5c449d67..03982883 100644
--- a/src/views/detections/DetectionRow.vue
+++ b/src/views/detections/DetectionRow.vue
@@ -78,22 +78,26 @@
               v-if="pageType === detectionPageType.securityEvent"
               :detection="detection"
               :time-filter="timeFilter"
+              :pageObj="pageObj"
           ></detection-security-event-overview>
           <template v-else>
             <detection-performance-event-ip-overview
                 v-if="detection.entityType === entityType.ip.toLowerCase()"
                 :detection="detection"
                 :time-filter="timeFilter"
+                :pageObj="pageObj"
             ></detection-performance-event-ip-overview>
             <detection-performance-event-domain-overview
                 v-else-if="detection.entityType === entityType.domain.toLowerCase()"
                 :detection="detection"
                 :time-filter="timeFilter"
+                :pageObj="pageObj"
             ></detection-performance-event-domain-overview>
             <detection-performance-event-app-overview
                 v-else-if="detection.entityType === entityType.app.toLowerCase()"
                 :detection="detection"
                 :time-filter="timeFilter"
+                :pageObj="pageObj"
             ></detection-performance-event-app-overview>
           </template>
         </div>
@@ -123,7 +127,8 @@ export default {
     index: Number,
     timeFilter: Object,
     detection: Object,
-    pageType: String // 安全事件、服务质量
+    pageType: String, // 安全事件、服务质量
+    pageObj: Object
   },
   data () {
     return {
diff --git a/src/views/detections/overview/DetectionPerformanceEventAppOverview.vue b/src/views/detections/overview/DetectionPerformanceEventAppOverview.vue
index 68288af6..6824ace9 100644
--- a/src/views/detections/overview/DetectionPerformanceEventAppOverview.vue
+++ b/src/views/detections/overview/DetectionPerformanceEventAppOverview.vue
@@ -100,7 +100,8 @@ import _ from 'lodash'
 export default {
   name: 'DetectionPerformanceEventAppOverview',
   props: {
-    detection: Object
+    detection: Object,
+    pageObj: Object
   },
   data () {
     return {
@@ -228,7 +229,7 @@ export default {
     queryBasic () {
       return new Promise((resolve, reject) => {
         try {
-          getData(api.detection.performanceEvent.overviewBasic, { appName: this.detection.appName, startTime: this.detection.startTime }).then(data => {
+          getData(api.detection.performanceEvent.overviewBasic, { appName: this.detection.appName, startTime: this.detection.startTime, endTime: this.detection.endTime, pageNo: this.pageObj.pageNo, pageSize: this.pageObj.pageSize }).then(data => {
             resolve(data[0])
           }).catch(error => {
             reject(error)
diff --git a/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue b/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue
index efd14a27..710339c9 100644
--- a/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue
+++ b/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue
@@ -103,7 +103,8 @@ import _ from 'lodash'
 export default {
   name: 'DetectionPerformanceEventDomainOverview',
   props: {
-    detection: Object
+    detection: Object,
+    pageObj: Object
   },
   data () {
     return {
@@ -259,7 +260,7 @@ export default {
     queryBasic () {
       return new Promise((resolve, reject) => {
         try {
-          getData(api.detection.performanceEvent.overviewBasic, { domain: this.detection.domain, startTime: this.detection.startTime }).then(data => {
+          getData(api.detection.performanceEvent.overviewBasic, { domain: this.detection.domain, startTime: this.detection.startTime, endTime: this.detection.endTime, pageNo: this.pageObj.pageNo, pageSize: this.pageObj.pageSize }).then(data => {
             resolve(data[0])
           }).catch(error => {
             reject(error)
diff --git a/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue b/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue
index d5c9c426..8da10026 100644
--- a/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue
+++ b/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue
@@ -94,7 +94,8 @@ import _ from 'lodash'
 export default {
   name: 'DetectionPerformanceEventIpOverview',
   props: {
-    detection: Object
+    detection: Object,
+    pageObj: Object
   },
   data () {
     return {
@@ -220,7 +221,7 @@ export default {
     queryBasic () {
       return new Promise((resolve, reject) => {
         try {
-          getData(api.detection.performanceEvent.overviewBasic, { serverIp: this.detection.serverIp, startTime: this.detection.startTime }).then(data => {
+          getData(api.detection.performanceEvent.overviewBasic, { serverIp: this.detection.serverIp, startTime: this.detection.startTime, endTime: this.detection.endTime, pageNo: this.pageObj.pageNo, pageSize: this.pageObj.pageSize }).then(data => {
             resolve(data[0])
           }).catch(error => {
             reject(error)