From 119258ff04c2c63292e4fdbbdbbbf0eddec74bb1 Mon Sep 17 00:00:00 2001
From: samwaf <samwafgo@gmail.com>
Date: Thu, 6 Oct 2022 08:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=88=86=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E8=AF=95=E5=A4=A7=E5=B1=8F=E6=A8=A1=E6=8B=9F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 localserver.go                                |  2 +-
 .../dashboard/base/components/MiddleChart.vue |  2 +-
 localwaf/src/pages/waf-log/attack/index.vue   | 71 +++++++++++--------
 localwaf/src/service/service-base.ts          | 12 ++--
 4 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/localserver.go b/localserver.go
index c245552..145b1b0 100644
--- a/localserver.go
+++ b/localserver.go
@@ -48,7 +48,7 @@ func StartLocalServer() {
 			var total int64 = 0
 			var weblogs []innerbean.WebLog
 			global.GWAF_LOCAL_DB.Debug().Limit(waf_attack.PageSize).Offset(waf_attack.PageSize * (waf_attack.PageIndex - 1)).Find(&weblogs)
-			global.GWAF_LOCAL_DB.Debug().Count(&total)
+			global.GWAF_LOCAL_DB.Debug().Model(&innerbean.WebLog{}).Count(&total)
 
 			c.JSON(http.StatusOK, response.Response{
 				Code: 200,
diff --git a/localwaf/src/pages/dashboard/base/components/MiddleChart.vue b/localwaf/src/pages/dashboard/base/components/MiddleChart.vue
index 299f6df..e8ad680 100644
--- a/localwaf/src/pages/dashboard/base/components/MiddleChart.vue
+++ b/localwaf/src/pages/dashboard/base/components/MiddleChart.vue
@@ -1,7 +1,7 @@
 <template>
   <t-row :gutter="[16, 16]">
     <t-col :xs="12" :xl="9">
-      <t-card title="统计数据" subtitle="(万元)" class="dashboard-chart-card">
+      <t-card title="月度攻击情况" subtitle="(次)" class="dashboard-chart-card">
         <template #actions>
           <div class="dashboard-chart-title-container">
             <t-date-range-picker
diff --git a/localwaf/src/pages/waf-log/attack/index.vue b/localwaf/src/pages/waf-log/attack/index.vue
index d235543..9be722c 100644
--- a/localwaf/src/pages/waf-log/attack/index.vue
+++ b/localwaf/src/pages/waf-log/attack/index.vue
@@ -147,9 +147,9 @@ export default Vue.extend({
       rowClassName: (rowKey: string) => `${rowKey}-class`,
       // 与pagination对齐
       pagination: {
-        defaultPageSize: 20,
         total: 0,
-        defaultCurrent: 1,
+        current: 1,
+        pageSize:10
       },
       searchValue: '',
       confirmVisible: false,
@@ -169,43 +169,52 @@ export default Vue.extend({
     },
   },
   mounted() {
-    let that = this
-    this.$request
-      .get('/waflog/attack/list', {
-        params: {
-           pageSize: that.pagination.defaultPageSize,
-           pageIndex: that.pagination.defaultCurrent,
-        }
-      })
-      .then((res) => {
-        let resdata = res.data
-        console.log(resdata)
-        if (resdata.code === 200) {
-
-          //const { list = [] } = resdata.data.list;
-
-          this.data = resdata.data.list;
-          this.pagination = {
-            ...this.pagination,
-            total: resdata.data.total,
-          };
-        }
-      })
-      .catch((e: Error) => {
-        console.log(e);
-      })
-      .finally(() => {
-        this.dataLoading = false;
-      });
-    this.dataLoading = true;
+    this.getList("")
   },
 
   methods: {
+    getList(keyword){
+      let that = this
+      this.$request
+        .get('/waflog/attack/list', {
+          params: {
+             pageSize: that.pagination.pageSize,
+             pageIndex: that.pagination.current,
+          }
+        })
+        .then((res) => {
+          let resdata = res.data
+          console.log(resdata)
+          if (resdata.code === 200) {
+
+            //const { list = [] } = resdata.data.list;
+
+            this.data = resdata.data.list;
+            this.pagination = {
+              ...this.pagination,
+              total: resdata.data.total,
+            };
+          }
+        })
+        .catch((e: Error) => {
+          console.log(e);
+        })
+        .finally(() => {
+          this.dataLoading = false;
+        });
+      this.dataLoading = true;
+    },
     getContainer() {
       return document.querySelector('.tdesign-starter-layout');
     },
     rehandlePageChange(curr, pageInfo) {
       console.log('分页变化', curr, pageInfo);
+      this.pagination.current = curr.current
+      if(this.pagination.pageSize != curr.pageSize){
+          this.pagination.current = 1
+          this.pagination.pageSize = curr.pageSize
+      }
+      this.getList("")
     },
     rehandleSelectChange(selectedRowKeys: number[]) {
       this.selectedRowKeys = selectedRowKeys;
diff --git a/localwaf/src/service/service-base.ts b/localwaf/src/service/service-base.ts
index 37db069..4a8ebd0 100644
--- a/localwaf/src/service/service-base.ts
+++ b/localwaf/src/service/service-base.ts
@@ -17,25 +17,25 @@ interface TendItem {
 
 export const PANE_LIST: Array<DashboardPanel> = [
   {
-    title: '总收入',
-    number: '¥ 28,425.00',
+    title: '今日攻击数',
+    number: '11100334',
     upTrend: '20.5%',
     leftType: 'echarts-line',
   },
   {
-    title: '总退款',
-    number: '¥ 768.00',
+    title: '今天总访问量',
+    number: '1111768',
     downTrend: '20.5%',
     leftType: 'echarts-bar',
   },
   {
-    title: '活跃用户（个）',
+    title: '活跃IP（个）',
     number: '1126',
     downTrend: '20.5%',
     leftType: 'icon-usergroup',
   },
   {
-    title: '订单（个）',
+    title: '分布地区（个）',
     number: 527,
     downTrend: '20.5%',
     leftType: 'icon-file-paste',