- {{ 'monitor.status.available' | i18n }} {{ appCountService.availableSize }}
+ {{ 'monitor.status.available' | i18n }} {{ appCountService.availableSize }}
{{ 'monitor.status.unavailable' | i18n }} {{ 'monitor.status.available' | i18n }} {{ appCountCustom.availableSize }}
- {{ 'monitor.status.unavailable' | i18n }} {{ appCountCustom.unAvailableSize }}
+ {{ 'monitor.status.unavailable' | i18n }} {{ appCountCustom.unAvailableSize }}
- {{ 'monitor.status.unreachable' | i18n }} {{ appCountCustom.unReachableSize }}
+ {{ 'monitor.status.unreachable' | i18n }} {{ appCountCustom.unReachableSize }}
{{ 'monitor.status.un-manage' | i18n }} {{ appCountCustom.unManageSize }}
diff --git a/web-app/src/app/routes/dashboard/dashboard.component.ts b/web-app/src/app/routes/dashboard/dashboard.component.ts
index 68fa74e..73b4588 100644
--- a/web-app/src/app/routes/dashboard/dashboard.component.ts
+++ b/web-app/src/app/routes/dashboard/dashboard.component.ts
@@ -352,6 +352,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
if (message.code === 0) {
let page = message.data;
this.alerts = page.content;
+ this.cdr.detectChanges();
} else {
console.warn(message.msg);
}
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 f1aeb23..bf84796 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
@@ -24,12 +24,11 @@
-
-
import('./exception/exception.module').then(m => m.ExceptionModule) },
{ path: 'monitors', loadChildren: () => import('./monitor/monitor.module').then(m => m.MonitorModule) },
{ path: 'alert', loadChildren: () => import('./alert/alert.module').then(m => m.AlertModule) }
@@ -40,8 +40,8 @@ const routes: Routes = [
path: 'passport',
component: LayoutPassportComponent,
children: [
- { path: 'login', component: UserLoginComponent, data: { title: '登录' } },
- { path: 'lock', component: UserLockComponent, data: { title: '锁屏' } }
+ { path: 'login', component: UserLoginComponent, data: { titleI18n: 'app.login.login' } },
+ { path: 'lock', component: UserLockComponent, data: { titleI18n: 'app.lock' } }
]
},
{ path: '**', redirectTo: 'exception/404' }
diff --git a/web-app/src/app/routes/routes.module.ts b/web-app/src/app/routes/routes.module.ts
index c76a06b..342f821 100644
--- a/web-app/src/app/routes/routes.module.ts
+++ b/web-app/src/app/routes/routes.module.ts
@@ -2,6 +2,8 @@ import { NgModule, Type } from '@angular/core';
import { SharedModule } from '@shared';
// dashboard pages
+import { NzTagModule } from 'ng-zorro-antd/tag';
+import { NzTimelineModule } from 'ng-zorro-antd/timeline';
import { NgxEchartsModule } from 'ngx-echarts';
import { DashboardComponent } from './dashboard/dashboard.component';
@@ -10,8 +12,6 @@ import { UserLockComponent } from './passport/lock/lock.component';
// passport pages
import { UserLoginComponent } from './passport/login/login.component';
import { RouteRoutingModule } from './routes-routing.module';
-import { NzTagModule } from 'ng-zorro-antd/tag';
-import { NzTimelineModule } from 'ng-zorro-antd/timeline';
const COMPONENTS: Array> = [
DashboardComponent,