From d5d592fee569831bc50a396d046f2b4f57f11e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Sat, 11 Jul 2020 10:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin-visitor.component.html              | 31 ++-----------
 .../admin-visitor.component.less              |  0
 .../admin-visitor/admin-visitor.component.ts  | 46 ++++++++++++-------
 .../admin-visitor/admin-visitor.module.ts     |  8 +---
 4 files changed, 36 insertions(+), 49 deletions(-)
 delete mode 100644 src/app/view/admin/admin-visitor/admin-visitor.component.less

diff --git a/src/app/view/admin/admin-visitor/admin-visitor.component.html b/src/app/view/admin/admin-visitor/admin-visitor.component.html
index bba032f..d0d75e3 100644
--- a/src/app/view/admin/admin-visitor/admin-visitor.component.html
+++ b/src/app/view/admin/admin-visitor/admin-visitor.component.html
@@ -1,27 +1,4 @@
-<div class="inner-content">
-    <nz-card nzTitle="访客信息管理" nzSize="small" [nzExtra]="reload">
-        <nz-table #table [nzData]="pageList.list" [nzTotal]="pageList.total" [(nzPageIndex)]="pageIndex"
-                  [nzPageSize]="pageSize" [nzLoading]="loading" [nzScroll]="{x:'800px'}"
-                  (nzPageIndexChange)="getVisitors()" nzFrontPagination="false">
-            <thead>
-            <th>ip地址</th>
-            <th>访问日期</th>
-            <th>浏览器类型</th>
-            <th>浏览器版本</th>
-            <th>系统</th>
-            </thead>
-            <tbody>
-            <tr *ngFor="let data of table.data">
-                <td>{{data.ip}}</td>
-                <td>{{data.date}}</td>
-                <td>{{data.browserName}}</td>
-                <td>{{data.browserVersion}}</td>
-                <td>{{data.osname}}</td>
-            </tr>
-            </tbody>
-        </nz-table>
-    </nz-card>
-</div>
-<ng-template #reload>
-    <a (click)="getVisitors()" title="刷新"><i nz-icon nzType="reload" nzTheme="outline"></i></a>
-</ng-template>
+<common-table [request]="request" [headData]="headData" cardTitle="访客信息管理">
+
+</common-table>
+
diff --git a/src/app/view/admin/admin-visitor/admin-visitor.component.less b/src/app/view/admin/admin-visitor/admin-visitor.component.less
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/view/admin/admin-visitor/admin-visitor.component.ts b/src/app/view/admin/admin-visitor/admin-visitor.component.ts
index 0df1eb7..02f2942 100644
--- a/src/app/view/admin/admin-visitor/admin-visitor.component.ts
+++ b/src/app/view/admin/admin-visitor/admin-visitor.component.ts
@@ -1,34 +1,48 @@
 import {Component, OnInit} from '@angular/core';
 import {Title} from '@angular/platform-browser';
 import {ApiService} from '../../../api/api.service';
-import {PageList} from '../../../class/HttpReqAndResp';
+import {RequestObj} from '../../../class/HttpReqAndResp';
 import {Visitor} from '../../../class/Visitor';
+import {Data} from '../components/common-table/data';
 
 @Component({
     selector: 'app-admin-visitor',
-    templateUrl: './admin-visitor.component.html',
-    styleUrls: ['./admin-visitor.component.less']
+    templateUrl: './admin-visitor.component.html'
 })
 export class AdminVisitorComponent implements OnInit {
 
     constructor(private apiService: ApiService, private title: Title) {
     }
 
-    pageIndex: number = 1;
-    pageSize: number = 10;
-
-    pageList: PageList<Visitor> = new PageList<Visitor>();
-
-    loading: boolean = true;
+    headData: Data<Visitor>[];
+    request: RequestObj
 
+    /***
+     * browserName: "Chrome 8"
+     browserVersion: "83.0.4103.116"
+     date: "2020-07-11 09:30:13"
+     id: 3131
+     ip: "127.0.0.1"
+     osname: "Windows 10"
+     */
     ngOnInit(): void {
         this.title.setTitle('小海博客 | 访客信息管理')
-        this.getVisitors();
+        this.request = {
+            path: '/admin/visitor/page',
+            method: 'GET',
+            queryParam: {
+                count: 1,
+                page: 10,
+                showLocation: location
+            }
+        }
+        this.headData = [
+            {fieldValue: 'id', title: '主键', show: false, primaryKey: true},
+            {fieldValue: 'date', title: '主键', show: true},
+            {fieldValue: 'browserName', title: '主键', show: true},
+            {fieldValue: 'ip', title: '主键', show: true},
+            {fieldValue: 'browserVersion', title: '主键', show: true},
+            {fieldValue: 'osname', title: '主键', show: true}
+        ]
     }
-
-    getVisitors = () => this.apiService.adminVisitors(false, this.pageSize, this.pageIndex).subscribe({
-        next: data => this.pageList = data.result,
-        complete: () => this.loading = false,
-        error: err => this.loading = false
-    })
 }
diff --git a/src/app/view/admin/admin-visitor/admin-visitor.module.ts b/src/app/view/admin/admin-visitor/admin-visitor.module.ts
index dad9947..e9620db 100644
--- a/src/app/view/admin/admin-visitor/admin-visitor.module.ts
+++ b/src/app/view/admin/admin-visitor/admin-visitor.module.ts
@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {RouterModule} from '@angular/router';
 import {AdminVisitorComponent} from './admin-visitor.component';
-import {NzButtonModule, NzCardModule, NzDividerModule, NzIconModule, NzTableModule} from 'ng-zorro-antd';
+import {CommonTableModule} from '../components/common-table/common-table.module';
 
 
 @NgModule({
@@ -12,11 +12,7 @@ import {NzButtonModule, NzCardModule, NzDividerModule, NzIconModule, NzTableModu
     imports: [
         CommonModule,
         RouterModule.forChild([{path: '', component: AdminVisitorComponent}]),
-        NzCardModule,
-        NzTableModule,
-        NzButtonModule,
-        NzDividerModule,
-        NzIconModule
+        CommonTableModule
     ]
 })
 export class AdminVisitorModule {