From 0a6e32dbdb5d505536d33a3539f7b9fcfba1cffe Mon Sep 17 00:00:00 2001 From: GuangrongFu Date: Mon, 30 Jul 2018 11:06:58 +0800 Subject: [PATCH] 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 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 0000000000000000000000000000000000000000..1f47ed0e7b590a341a0c2b80518107c924bd542d GIT binary patch literal 4762 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 literal 0 HcmV?d00001 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 @@