From 1ede2ba779e136ddb452feaa20e432116bee10e8 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 30 Mar 2022 11:46:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddetections=20tab?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E5=8F=8A=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/views/detections/detection-list/row.scss  | 3 +++
 src/views/charts/PanelChart.vue                          | 2 +-
 src/views/charts/charts/chartDetectionSecurity.vue       | 9 ++++-----
 src/views/charts/charts/chartDetectionService.vue        | 9 ++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

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"
       ></chart-detections-table>
     </div>
-    <div class="cn-detection__footer" v-show="pageObj.total > 0">
+    <div class="cn-detection__footer">
       <chart-detection-pagination
           ref="pagination"
           :page-obj="pageObj"
           @pageJump="pageJump"
-          :pageSizeForAlarm="pageSizeForAlarm"
+          :pageSizeForAlarm="pageObj.pageSize"
       ></chart-detection-pagination>
     </div>
   </div>
@@ -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"
       ></chart-detections-table>
     </div>
-    <div class="cn-chart__footer" v-show="pageObj.total > 0">
+    <div class="cn-detection__footer">
       <chart-detection-pagination
         ref="pagination"
         :page-obj="pageObj"
         @pageJump="pageJump"
-        :pageSizeForAlarm="pageSizeForAlarm"
+        :pageSizeForAlarm="pageObj.pageSize"
       ></chart-detection-pagination>
     </div>
   </div>
@@ -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,