diff options
author | Chuyi Guo <guochuyi@chinamobile.com> | 2019-08-30 02:09:41 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-08-30 02:09:41 +0000 |
commit | 2693152e849d12e71db93576c03a729be55ca0b4 (patch) | |
tree | 7a02877a999e1841fd1e815934c9e022bc8e23c5 | |
parent | 9835801b23bca6d5514bab1805f196240ea23da5 (diff) | |
parent | feb28bd28a181688e64a2f826500126494d16274 (diff) |
Merge "feat: add copyright and comments"
-rw-r--r-- | usecaseui-portal/src/app/app.component.less | 18 | ||||
-rw-r--r-- | usecaseui-portal/src/app/app.component.ts | 11 |
2 files changed, 23 insertions, 6 deletions
diff --git a/usecaseui-portal/src/app/app.component.less b/usecaseui-portal/src/app/app.component.less index ade860b1..ed7ad4f1 100644 --- a/usecaseui-portal/src/app/app.component.less +++ b/usecaseui-portal/src/app/app.component.less @@ -1,3 +1,21 @@ +/* + Copyright (C) 2019 CMCC, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + + +// left menu bar adaptation @media screen and (min-width: 1200px){ .siderContent{ height:240px; diff --git a/usecaseui-portal/src/app/app.component.ts b/usecaseui-portal/src/app/app.component.ts index 7306db1c..2642b3ed 100644 --- a/usecaseui-portal/src/app/app.component.ts +++ b/usecaseui-portal/src/app/app.component.ts @@ -26,14 +26,14 @@ import 'rxjs/add/operator/map'; styleUrls: ['./app.component.less'] }) export class AppComponent { - public url:string = 'home'; + public url:string = 'home'; constructor(private translate: TranslateService,private myhttp: HomesService,private router:Router,) { this.currentLanguageGet(); this.getUrl(); - - } + + // Get the current routing path getUrl(){ this.router.events.map(event=> { if(event instanceof NavigationEnd){ @@ -42,15 +42,12 @@ export class AppComponent { }).subscribe(event=>{}) } - //209.05.08 Get the currentLanguage currentloginId = null; currentLanguage = "en"; currentLanguageGet() { this.currentloginId = sessionStorage.getItem("userId") || null; - console.log(this.currentloginId,"this.currentloginId","loginId"); if (this.currentloginId != null) { - console.log(this.currentloginId,"this.currentloginId","loginId","you id"); this.myhttp.getCurrentLanguage(this.currentloginId) .subscribe( (data) => { @@ -68,6 +65,8 @@ export class AppComponent { sessionStorage.setItem("DefaultLang",this.currentLanguage); } } + + // Whether the submenu expands the identifier get flag () { if(!this.url.indexOf('services')){ return true |