This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 19a59004d Optimize the detail-page of monitor. (#2196)
19a59004d is described below
commit 19a59004deb069e659b8a90d2209236c6e38b93b
Author: Kerwin Bryant <[email protected]>
AuthorDate: Fri Jul 5 09:32:12 2024 +0800
Optimize the detail-page of monitor. (#2196)
Co-authored-by: tomsun28 <[email protected]>
---
.../monitor-data-table/monitor-data-table.component.html | 2 +-
.../monitor/monitor-detail/monitor-detail.component.html | 3 ++-
.../routes/monitor/monitor-detail/monitor-detail.component.ts | 10 ++++------
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git
a/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.html
b/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.html
index b1228176c..019ef5535 100644
---
a/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.html
+++
b/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.html
@@ -23,7 +23,7 @@
[nzBordered]="true"
[nzBodyStyle]="{ overflow: !monitor ? 'hidden' : 'auto' }"
[nzTitle]="card_title"
- [nzLoading]="loading"
+ [nzLoading]="!app || loading"
[nzExtra]="!monitor ? metrics_card_extra : monitor_card_extra"
>
<div *ngIf="!!monitor">
diff --git
a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html
b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html
index 1509f88c7..03cf5e9b8 100755
---
a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html
+++
b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html
@@ -35,7 +35,7 @@
<span nz-icon nzType="pie-chart"></span>
<span>{{ 'monitors.detail' | i18n }}</span>
</nz-breadcrumb-item>
- <nz-breadcrumb-item>
+ <nz-breadcrumb-item *ngIf="!!app">
<a routerLink="/setting/define" [queryParams]="{ app: app }">
<nz-tag style="font-size: 14px; margin-left: 4px" nzColor="#3f51b5"
class="hoverClass">
<span>{{ 'monitor.app.' + app | i18n }}</span>
@@ -43,6 +43,7 @@
</a>
</nz-breadcrumb-item>
</nz-breadcrumb>
+
<nz-divider></nz-divider>
<nz-layout>
diff --git
a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.ts
b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.ts
index 31f8c08f1..228557ecb 100644
--- a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.ts
+++ b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.ts
@@ -61,9 +61,8 @@ export class MonitorDetailComponent implements OnInit,
OnDestroy {
showBasic = true;
ngOnInit(): void {
- this.loadRealTimeMetric();
this.countDownTime = this.deadline;
- this.interval$ = setInterval(this.countDown.bind(this), 1000);
+ this.loadRealTimeMetric();
}
loadMetricChart() {
@@ -157,6 +156,9 @@ export class MonitorDetailComponent implements OnInit,
OnDestroy {
} else {
console.warn(message.msg);
}
+ if (this.interval$ === undefined) {
+ this.interval$ = setInterval(this.countDown.bind(this), 1000);
+ }
this.isSpinning = false;
},
error => {
@@ -166,10 +168,6 @@ export class MonitorDetailComponent implements OnInit,
OnDestroy {
);
}
- showBasicStatus(show: boolean) {
- this.showBasic = show;
- }
-
countDown() {
if (this.deadline > 0) {
this.countDownTime = Math.max(0, this.countDownTime - 1);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
