Merge "Modify the overall code lincence and comments"

6 files changed, 71 insertions, 26 deletions

diff --git a/usecaseui-portal/src/app/components/charts/bar/bar.component.html b/usecaseui-portal/src/app/components/charts/bar/bar.component.html
index 8e3e537d..7c1eee6b 100644
--- a/usecaseui-portal/src/app/components/charts/bar/bar.component.html
+++ b/usecaseui-portal/src/app/components/charts/bar/bar.component.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2018 CMCC, Inc. and others. All rights reserved.
+    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.
diff --git a/usecaseui-portal/src/app/components/charts/bar/bar.component.ts b/usecaseui-portal/src/app/components/charts/bar/bar.component.ts
index 38a2fc0d..ee76dfee 100644
--- a/usecaseui-portal/src/app/components/charts/bar/bar.component.ts
+++ b/usecaseui-portal/src/app/components/charts/bar/bar.component.ts
@@ -1,3 +1,18 @@
+/*
+    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.
+*/
 import { Component, OnInit, Input } from '@angular/core';
 import { SimpleChanges } from '@angular/core/src/metadata/lifecycle_hooks';
 
@@ -8,9 +23,9 @@ import { SimpleChanges } from '@angular/core/src/metadata/lifecycle_hooks';
 })
 export class BarComponent implements OnInit {
 
-  // 图形数据
+  // chart Data
   @Input() chartData;
-  // 初始化数据
+  // init Data
   @Input() initData;
 
   constructor() { }
@@ -32,18 +47,18 @@ export class BarComponent implements OnInit {
   }
 
   ngOnChanges(changes: SimpleChanges) {
-    // 当有实例的时候再执行，相当于第一次不执行下面方法
+    // Execute when there is an instance, which is equivalent to not executing the following method for the first time.
     if (this.chartIntance) {
       this.chartDataChange()
     }
   }
-  // 初始化图形高度
+  // Initialize the height of the graphic
   initOpts: any;
-  // 折线图配置
+  // Line chart configuration
   barOption: any;
-  // 实例对象
+  // Instance object
   chartIntance: any;
-  // 数据变化
+  // Data change
   updateOption: any;
   chartDataChange() {
     this.updateOption = this.chartData;
diff --git a/usecaseui-portal/src/app/components/charts/line/line.component.html b/usecaseui-portal/src/app/components/charts/line/line.component.html
index 9a43e28c..e032eb27 100644
--- a/usecaseui-portal/src/app/components/charts/line/line.component.html
+++ b/usecaseui-portal/src/app/components/charts/line/line.component.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2018 CMCC, Inc. and others. All rights reserved.
+    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.
diff --git a/usecaseui-portal/src/app/components/charts/line/line.component.ts b/usecaseui-portal/src/app/components/charts/line/line.component.ts
index 55b757ce..25881699 100644
--- a/usecaseui-portal/src/app/components/charts/line/line.component.ts
+++ b/usecaseui-portal/src/app/components/charts/line/line.component.ts
@@ -1,3 +1,18 @@
+/*
+    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.
+*/
 import { Component, OnInit, Input } from '@angular/core';
 import { SimpleChanges } from '@angular/core/src/metadata/lifecycle_hooks';
 
@@ -7,9 +22,9 @@ import { SimpleChanges } from '@angular/core/src/metadata/lifecycle_hooks';
   styleUrls: ['./line.component.less']
 })
 export class LineComponent implements OnInit {
-  // 图形数据
+  // chart Data
   @Input() chartData;
-  // 初始化数据
+  // init Data
   @Input() initData;
 
   constructor() { }
@@ -65,18 +80,18 @@ export class LineComponent implements OnInit {
   }
 
   ngOnChanges(changes:SimpleChanges){
-    // 当有实例的时候再执行，相当于第一次不执行下面方法
+    // Execute when there is an instance, which is equivalent to not executing the following method for the first time.
     if(this.chartIntance){
       this.chartDataChange()
     }
   }
-  // 初始化图形高度
+  // Initialize the height of the graphic
   initOpts:any;
-  // 折线图配置
+  // Line chart configuration
   lineOption:any;
-  // 实例对象
+  // Instance object
   chartIntance:any;
-  // 数据变化
+  // Data change
   updateOption:any;
   chartDataChange(){
     this.updateOption = this.chartData;
diff --git a/usecaseui-portal/src/app/components/charts/pie/pie.component.html b/usecaseui-portal/src/app/components/charts/pie/pie.component.html
index 5f1e94ce..d063f22a 100644
--- a/usecaseui-portal/src/app/components/charts/pie/pie.component.html
+++ b/usecaseui-portal/src/app/components/charts/pie/pie.component.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2018 CMCC, Inc. and others. All rights reserved.
+    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.
diff --git a/usecaseui-portal/src/app/components/charts/pie/pie.component.ts b/usecaseui-portal/src/app/components/charts/pie/pie.component.ts
index 9302ddb5..b1549ab2 100644
--- a/usecaseui-portal/src/app/components/charts/pie/pie.component.ts
+++ b/usecaseui-portal/src/app/components/charts/pie/pie.component.ts
@@ -1,3 +1,18 @@
+/*
+    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.
+*/
 import { Component, OnInit, Input } from '@angular/core';
 import { SimpleChanges } from '@angular/core/src/metadata/lifecycle_hooks';
 
@@ -7,9 +22,9 @@ import { SimpleChanges } from '@angular/core/src/metadata/lifecycle_hooks';
   styleUrls: ['./pie.component.less']
 })
 export class PieComponent implements OnInit {
-  // 图形数据
+  // chart Data
   @Input() chartData;
-  // 初始化数据
+  // init Data
   @Input() initData;
 
   constructor() { }
@@ -49,30 +64,30 @@ export class PieComponent implements OnInit {
 
   ngOnChanges(changes:SimpleChanges){
 
-    // 当有实例的时候再执行，相当于第一次不执行下面方法
+    // Execute when there is an instance, which is equivalent to not executing the following method for the first time.
     if(this.chartIntance){
       this.chartDataChange()
     }
   }
 
-  // 初始化图形高度
+  // Initialize the height of the graphic
   initOpts:any;
-  // alarm饼图
+  // Alarm pie chart
   pieOption:any;
-  // 实例对象
+  // Instance object
   chartIntance:any;
-  // 数据变化
+  // Data change
   updateOption:any;
   chartDataChange(){
     this.updateOption = this.chartData;
-    // 要等到updateOption渲染完再执行
+    // Wait until the updateOption is finished and then execute
     this.chartIntance.on('finished',()=>{
       this.chartIntance.dispatchAction({
         type:'highlight',
         seriesIndex: 0,
         dataIndex:0        
       })
-      // 由于所有视图变化渲染都会执行，更新完注销此事件
+      //Since all view changes are rendered, this event is logged out after the update
       this.chartIntance.off('finished')
     })
   }