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" > @@ -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)