From 5d94fc2f0de729c1f590ed82ce623690a0d7defc Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Fri, 3 Dec 2021 17:56:01 +0800
Subject: [PATCH] =?UTF-8?q?[web-app]=20=E7=9B=91=E6=8E=A7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=A0=E5=B0=84=E5=9B=BE=E6=A0=87=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/core/startup/startup.service.ts   |  2 +-
 web-app/src/app/pojo/Monitor.ts               |  1 +
 .../monitor-list/monitor-list.component.html  | 30 +++++++++++++++++--
 .../src/app/routes/monitor/monitor.module.ts  |  4 ++-
 .../routes/passport/login/login.component.ts  |  7 +++++
 web-app/src/styles/theme.less                 |  1 -
 6 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/web-app/src/app/core/startup/startup.service.ts b/web-app/src/app/core/startup/startup.service.ts
index bc9871d..f8108be 100644
--- a/web-app/src/app/core/startup/startup.service.ts
+++ b/web-app/src/app/core/startup/startup.service.ts
@@ -49,7 +49,7 @@ export class StartupService {
           // Application information: including site name, description, year
           this.settingService.setApp(appData.app);
           // User information: including name, avatar, email address
-          this.settingService.setUser(appData.user);
+          // this.settingService.setUser(appData.user);
           // ACL: Set the permissions to full, https://ng-alain.com/acl/getting-started
           this.aclService.setFull(true);
           // Menu data, https://ng-alain.com/theme/menu
diff --git a/web-app/src/app/pojo/Monitor.ts b/web-app/src/app/pojo/Monitor.ts
index 5a56007..64bb57b 100644
--- a/web-app/src/app/pojo/Monitor.ts
+++ b/web-app/src/app/pojo/Monitor.ts
@@ -4,6 +4,7 @@ export class Monitor {
   app!: string;
   host!: string;
   intervals: number = 600;
+  // 监控状态 0:未监控,1:可用,2:不可用,3:不可达,4:挂起
   status!: number;
   description!: string;
   creator!: string;
diff --git a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
index e2e701c..a2d8426 100644
--- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
+++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
@@ -59,9 +59,35 @@
   <tr *ngFor="let data of fixedTable.data">
     <td nzAlign="center" nzLeft [nzChecked]="checkedMonitorIds.has(data.id)" (nzCheckedChange)="onItemChecked(data.id, $event)"></td>
     <td nzAlign="center">{{ data.name }}</td>
-    <td nzAlign="center">{{ data.status }}</td>
+    <td nzAlign="center">
+      <nz-tag *ngIf="data.status == 0" nzColor="default">
+        <i nz-icon nzType="sync"></i>
+        <span>未监控</span>
+      </nz-tag>
+      <nz-tag *ngIf="data.status == 1" nzColor="success">
+        <i nz-icon nzType="sync"></i>
+        <span>正常监控</span>
+      </nz-tag>
+      <nz-tag *ngIf="data.status == 2" nzColor="warning">
+        <i nz-icon nzType="sync"></i>
+        <span>监控不可用</span>
+      </nz-tag>
+      <nz-tag *ngIf="data.status == 3" nzColor="error">
+        <i nz-icon nzType="sync"></i>
+        <span>监控不可大达</span>
+      </nz-tag>
+      <nz-tag *ngIf="data.status == 4" nzColor="default">
+        <i nz-icon nzType="sync"></i>
+        <span>监控已挂起</span>
+      </nz-tag>
+    </td>
     <td nzAlign="center">{{ data.host }}</td>
-    <td nzAlign="center">{{ data.app }}</td>
+    <td nzAlign="center">
+      <nz-tag nzColor="processing">
+        <i nz-icon nzType="cloud"></i>
+        <span>{{ data.app }}</span>
+      </nz-tag>
+    </td>
     <td nzAlign="center">{{ data.gmtUpdate? data.gmtUpdate : data.gmtCreate }}</td>
     <td nzAlign="center" nzRight>
       <button nz-button nzType="primary" (click)="onEditOneMonitor(data.id)">
diff --git a/web-app/src/app/routes/monitor/monitor.module.ts b/web-app/src/app/routes/monitor/monitor.module.ts
index 9820d79..fe48e42 100644
--- a/web-app/src/app/routes/monitor/monitor.module.ts
+++ b/web-app/src/app/routes/monitor/monitor.module.ts
@@ -8,6 +8,7 @@ import {MonitorDetailComponent} from "./monitor-detail/monitor-detail.component"
 import {NzBreadCrumbModule} from "ng-zorro-antd/breadcrumb";
 import {NzDividerModule} from "ng-zorro-antd/divider";
 import {NzSwitchModule} from "ng-zorro-antd/switch";
+import {NzTagModule} from "ng-zorro-antd/tag";
 
 const COMPONENTS: Type<void>[] = [
   MonitorNewComponent,
@@ -22,7 +23,8 @@ const COMPONENTS: Type<void>[] = [
         MonitorRoutingModule,
         NzBreadCrumbModule,
         NzDividerModule,
-        NzSwitchModule
+        NzSwitchModule,
+        NzTagModule
     ],
   declarations: COMPONENTS,
 })
diff --git a/web-app/src/app/routes/passport/login/login.component.ts b/web-app/src/app/routes/passport/login/login.component.ts
index 490d2b1..1f29017 100644
--- a/web-app/src/app/routes/passport/login/login.component.ts
+++ b/web-app/src/app/routes/passport/login/login.component.ts
@@ -10,6 +10,7 @@ import { NzTabChangeEvent } from 'ng-zorro-antd/tabs';
 import { finalize } from 'rxjs/operators';
 import {Message} from "../../../pojo/Message";
 import {LocalStorageService} from "../../../service/local-storage.service";
+import {User} from "@delon/theme/src/services/settings/types";
 
 @Component({
   selector: 'passport-login',
@@ -136,6 +137,12 @@ export class UserLoginComponent implements OnDestroy {
         // 设置用户Token信息
         this.storageSvc.storageAuthorizationToken(message.data.token);
         this.storageSvc.storageRefreshToken(message.data.refreshToken);
+        let user:User = {
+          name: this.userName.value,
+          avatar: "./assets/tmp/img/avatar.svg",
+          email: ""
+        }
+        this.settingsService.setUser(user);
         // 重新获取 StartupService 内容，我们始终认为应用信息一般都会受当前用户授权范围而影响
         this.startupSrv.load().subscribe(() => {
           let url = this.tokenService.referrer!.url || '/';
diff --git a/web-app/src/styles/theme.less b/web-app/src/styles/theme.less
index 7e76fdb..a33e5fb 100644
--- a/web-app/src/styles/theme.less
+++ b/web-app/src/styles/theme.less
@@ -11,6 +11,5 @@
 @alain-default-header-hg: 52px;
 @alain-default-header-bg: #722ED1;
 @alain-default-header-padding: 8px;
-@alain-default-aside-bg: #eca7a7;
 @alain-default-aside-nav-text-hover-color: #722ED1;
 @alain-default-aside-nav-selected-text-color: #722ED1;