From 0a6e32dbdb5d505536d33a3539f7b9fcfba1cffe Mon Sep 17 00:00:00 2001 From: GuangrongFu Date: Mon, 30 Jul 2018 11:06:58 +0800 Subject: Added Menu Items Change-Id: Iab5d4c3be6e3db846bb0077221ec7d7ecbeb0315 Issue-ID: HOLMES-150 Signed-off-by: GuangrongFu --- rulemgt-frontend/assembly.xml | 7 +++ rulemgt-frontend/karma.conf.js | 2 +- rulemgt-frontend/package-lock.json | 2 +- rulemgt-frontend/src/app/app.component.ts | 4 +- rulemgt-frontend/src/app/app.module.ts | 2 +- rulemgt-frontend/src/app/app.routing.ts | 16 +++---- .../src/app/correlation-modal/modal.component.html | 2 +- .../src/app/correlation-modal/modal.component.ts | 2 +- .../src/app/correlation-modal/modal.service.ts | 2 +- rulemgt-frontend/src/app/correlation-modal/msg.ts | 2 +- .../correlation-ruleInfo/ruleInfo.component.html | 2 +- .../app/correlation-ruleInfo/ruleInfo.component.ts | 2 +- .../correlation-ruleList/alarmRule.component.html | 4 +- .../correlation-ruleList/alarmRule.component.ts | 2 +- .../app/correlation-ruleList/alarmRule.service.ts | 2 +- .../src/app/correlation-ruleList/alarmRule.ts | 2 +- .../src/app/correlation-ruleList/ruleRequest.ts | 2 +- .../src/app/pages/remote.component.html | 5 +-- rulemgt-frontend/src/assets/images/logo.png | Bin 0 -> 4762 bytes rulemgt-frontend/src/default.html | 47 +++++++++++++-------- rulemgt-frontend/src/index.html | 3 +- rulemgt-frontend/src/main.ts | 2 +- rulemgt-frontend/src/polyfills.ts | 2 +- 23 files changed, 66 insertions(+), 50 deletions(-) create mode 100644 rulemgt-frontend/src/assets/images/logo.png (limited to 'rulemgt-frontend') diff --git a/rulemgt-frontend/assembly.xml b/rulemgt-frontend/assembly.xml index bf9a73e..9a4a65d 100644 --- a/rulemgt-frontend/assembly.xml +++ b/rulemgt-frontend/assembly.xml @@ -11,6 +11,13 @@ dist /iui/holmes + + src + /iui/holmes + + default.html + + diff --git a/rulemgt-frontend/karma.conf.js b/rulemgt-frontend/karma.conf.js index 37c5952..9f3bb5e 100644 --- a/rulemgt-frontend/karma.conf.js +++ b/rulemgt-frontend/karma.conf.js @@ -1,4 +1,4 @@ -/* Copyright 2017 ZTE Corporation. +/* Copyright 2018 ZTE Corporation. * *Licensed under the Apache License, Version 2.0 (the "License"); *you may not use this file except in compliance with the License. diff --git a/rulemgt-frontend/package-lock.json b/rulemgt-frontend/package-lock.json index 1c29b4d..ac2cffe 100644 --- a/rulemgt-frontend/package-lock.json +++ b/rulemgt-frontend/package-lock.json @@ -1,5 +1,5 @@ { - "name": "alarm-analysis", + "name": "holmes", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/rulemgt-frontend/src/app/app.component.ts b/rulemgt-frontend/src/app/app.component.ts index aa1b236..29bf86b 100644 --- a/rulemgt-frontend/src/app/app.component.ts +++ b/rulemgt-frontend/src/app/app.component.ts @@ -1,5 +1,5 @@ /* - Copyright 2017 ZTE Corporation. + Copyright 2018 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'remote-config', - templateUrl: './pages/remote.component.html', + templateUrl: './pages/remote.component.html' }) export class AppComponent implements OnInit { constructor(private translate: TranslateService) { } diff --git a/rulemgt-frontend/src/app/app.module.ts b/rulemgt-frontend/src/app/app.module.ts index 670c9b3..47977e6 100644 --- a/rulemgt-frontend/src/app/app.module.ts +++ b/rulemgt-frontend/src/app/app.module.ts @@ -1,5 +1,5 @@ /* - Copyright 2017 ZTE Corporation. + Copyright 2018 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/rulemgt-frontend/src/app/app.routing.ts b/rulemgt-frontend/src/app/app.routing.ts index 3502167..649053b 100644 --- a/rulemgt-frontend/src/app/app.routing.ts +++ b/rulemgt-frontend/src/app/app.routing.ts @@ -1,5 +1,5 @@ /* - Copyright 2017 ZTE Corporation. + Copyright 2018 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import {AlarmRule} from './correlation-ruleList/alarmRule.component'; -import {RuleInfo} from './correlation-ruleInfo/ruleInfo.component' +import { AlarmRule } from './correlation-ruleList/alarmRule.component'; +import { RuleInfo } from './correlation-ruleInfo/ruleInfo.component'; const appRoutes: Routes = [ { path: 'alarmRule', - component:AlarmRule + component: AlarmRule }, { path: 'ruleInfo', @@ -31,10 +31,10 @@ const appRoutes: Routes = [ component: RuleInfo }, { - path:'', - redirectTo:'alarmRule', + path: '', + redirectTo: 'alarmRule', pathMatch: 'full' }, ]; -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes,{ useHash: true }); +export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes, { useHash: true }); diff --git a/rulemgt-frontend/src/app/correlation-modal/modal.component.html b/rulemgt-frontend/src/app/correlation-modal/modal.component.html index 16f61e8..cc1cb2c 100644 --- a/rulemgt-frontend/src/app/correlation-modal/modal.component.html +++ b/rulemgt-frontend/src/app/correlation-modal/modal.component.html @@ -1,5 +1,5 @@ -
+
diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts index 65a5296..f6329f5 100644 --- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts +++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts @@ -1,5 +1,5 @@ /* - Copyright 2017 ZTE Corporation. + Copyright 2018 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts index 33ea713..d558041 100644 --- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts +++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts @@ -1,5 +1,5 @@ /* - Copyright 2017 ZTE Corporation. + Copyright 2018 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.ts index 9c36d30..92c45b5 100644 --- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.ts +++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.ts @@ -1,5 +1,5 @@ /* - Copyright 2017 ZTE Corporation. + Copyright 2018 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/rulemgt-frontend/src/app/correlation-ruleList/ruleRequest.ts b/rulemgt-frontend/src/app/correlation-ruleList/ruleRequest.ts index 2719a90..065fe50 100644 --- a/rulemgt-frontend/src/app/correlation-ruleList/ruleRequest.ts +++ b/rulemgt-frontend/src/app/correlation-ruleList/ruleRequest.ts @@ -1,5 +1,5 @@ /* - Copyright 2017 ZTE Corporation. + Copyright 2018 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/rulemgt-frontend/src/app/pages/remote.component.html b/rulemgt-frontend/src/app/pages/remote.component.html index 2b5c8c3..a3f64c8 100644 --- a/rulemgt-frontend/src/app/pages/remote.component.html +++ b/rulemgt-frontend/src/app/pages/remote.component.html @@ -1,5 +1,5 @@ -
-
+
\ No newline at end of file diff --git a/rulemgt-frontend/src/assets/images/logo.png b/rulemgt-frontend/src/assets/images/logo.png new file mode 100644 index 0000000..1f47ed0 Binary files /dev/null and b/rulemgt-frontend/src/assets/images/logo.png differ diff --git a/rulemgt-frontend/src/default.html b/rulemgt-frontend/src/default.html index beab509..33280b7 100644 --- a/rulemgt-frontend/src/default.html +++ b/rulemgt-frontend/src/default.html @@ -17,10 +17,12 @@ - + + @@ -114,31 +115,41 @@
diff --git a/rulemgt-frontend/src/index.html b/rulemgt-frontend/src/index.html index c8da64f..5331b5e 100644 --- a/rulemgt-frontend/src/index.html +++ b/rulemgt-frontend/src/index.html @@ -1,5 +1,5 @@