diff --git a/src/assets/css/components/views/detections/detection-list/row.scss b/src/assets/css/components/views/detections/detection-list/row.scss index 25a3242f..c1b17cb5 100644 --- a/src/assets/css/components/views/detections/detection-list/row.scss +++ b/src/assets/css/components/views/detections/detection-list/row.scss @@ -182,6 +182,9 @@ .cn-detection__header { margin-bottom: 8px; } + .cn-detection-table { + overflow: auto; + } .cn-detection__case-severity { display: flex; width: 38px; diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue index a2ec8fb2..d0ec2020 100644 --- a/src/views/charts/PanelChart.vue +++ b/src/views/charts/PanelChart.vue @@ -189,7 +189,7 @@ export default { pageSize: 9 } } - if ((isDetectionService && JSON.stringify(extraParams) === '{}') || (isDetectionSecurity && JSON.stringify(extraParams) === '{}')) { + if (isDetectionService || isDetectionSecurity) { extraParams = { pageNo: 1, pageSize: 6 diff --git a/src/views/charts/charts/chartDetectionSecurity.vue b/src/views/charts/charts/chartDetectionSecurity.vue index 1028d28b..5e07085c 100644 --- a/src/views/charts/charts/chartDetectionSecurity.vue +++ b/src/views/charts/charts/chartDetectionSecurity.vue @@ -10,12 +10,12 @@ :index="index" > -
@@ -48,8 +48,7 @@ export default { pageSize: 6, total: 0, resetPageNo: true - }, - pageSizeForAlarm: 6 + } } }, methods: { @@ -63,7 +62,7 @@ export default { this.pageObj.pageNo = val const extraParams = { pageNo: val, - pageSize: this.pageSizeForAlarm + pageSize: this.pageSize } this.$emit('getDetectionData', this.chartInfo.params.url, extraParams, false, { startTime: this.queryParams.startTime, diff --git a/src/views/charts/charts/chartDetectionService.vue b/src/views/charts/charts/chartDetectionService.vue index 87a1bd57..eb88db5c 100644 --- a/src/views/charts/charts/chartDetectionService.vue +++ b/src/views/charts/charts/chartDetectionService.vue @@ -10,12 +10,12 @@ :index="index" > - @@ -46,8 +46,7 @@ export default { pageSize: 6, total: 0, resetPageNo: true - }, - pageSizeForAlarm: 6 + } } }, methods: { @@ -61,7 +60,7 @@ export default { this.pageObj.pageNo = val const extraParams = { pageNo: val, - pageSize: this.pageSizeForAlarm + pageSize: this.pageSize } this.$emit('getDetectionData', this.chartInfo.params.url, extraParams, false, { startTime: this.queryParams.startTime,