diff options
author | 2019-05-14 06:44:39 +0000 | |
---|---|---|
committer | 2019-05-14 06:44:39 +0000 | |
commit | 7a1b0c7403988c378a1039997b6796e2a3e71f54 (patch) | |
tree | ddcdbde7b4fb4f1367a785fbc29670118818d430 | |
parent | 612e1f0f4133df671a376be5235cf3c4b2cfbb1a (diff) | |
parent | 2e359b756193f4c93fe24b35162067d9b4470c33 (diff) |
Merge "User and service type management interface"
-rw-r--r-- | usecaseui-portal/src/app/components/charts/pie/pie.component.ts | 9 | ||||
-rw-r--r-- | usecaseui-portal/src/app/components/customer/customer.component.html | 2 | ||||
-rw-r--r-- | usecaseui-portal/src/app/components/customer/customer.component.less | 17 | ||||
-rw-r--r-- | usecaseui-portal/src/app/management/management.component.html | 4 | ||||
-rw-r--r-- | usecaseui-portal/src/assets/i18n/cn.json | 4 | ||||
-rw-r--r-- | usecaseui-portal/src/assets/images/customer01.png | bin | 0 -> 47352 bytes | |||
-rw-r--r-- | usecaseui-portal/src/assets/images/customer02.png | bin | 0 -> 116230 bytes | |||
-rw-r--r-- | usecaseui-portal/src/assets/images/customer03.png | bin | 0 -> 8803 bytes | |||
-rw-r--r-- | usecaseui-portal/src/assets/images/customer04.png | bin | 0 -> 3049 bytes | |||
-rw-r--r-- | usecaseui-portal/src/assets/images/customer05.png | bin | 0 -> 2701 bytes |
10 files changed, 17 insertions, 19 deletions
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 b1549ab2..7eee9165 100644 --- a/usecaseui-portal/src/app/components/charts/pie/pie.component.ts +++ b/usecaseui-portal/src/app/components/charts/pie/pie.component.ts @@ -48,14 +48,7 @@ export class PieComponent implements OnInit { hoverOffset: 3, avoidLabelOverlap: false, label: this.initData.option.series[0].label, - data:[ - {value:5, name:'11'}, - {value:8, name:'22'}, - {value:10, name:'33'}, - {value:20, name:'44'}, - {value:60, name:'55'}, - - ], + data:[], itemStyle: this.initData.option.series[0].itemStyle } ] diff --git a/usecaseui-portal/src/app/components/customer/customer.component.html b/usecaseui-portal/src/app/components/customer/customer.component.html index 5cdd5d99..5a38944c 100644 --- a/usecaseui-portal/src/app/components/customer/customer.component.html +++ b/usecaseui-portal/src/app/components/customer/customer.component.html @@ -24,7 +24,7 @@ <p> {{"i18nTextDefine_Instance_Count_of_ServiceType" | translate}} </p> <app-bar [initData]="serviceInit" [chartData]="serviceData"></app-bar> <div class="footname" style="width: 100%;height: 40px;line-height: 40px;text-align: center;color: #3C4F8C;margin-top: 20px"> - <img src=".assets/images/customerBarUser.png" alt="customerName" style="margin-right: 5px;margin-bottom: 3px;"> + <img src="./assets/images/customerBarUser.png" alt="customerName" style="margin-right: 5px;margin-bottom: 3px;"> {{this.serviceInit["customer"]}} </div> </div> diff --git a/usecaseui-portal/src/app/components/customer/customer.component.less b/usecaseui-portal/src/app/components/customer/customer.component.less index 3ad7191e..81274dda 100644 --- a/usecaseui-portal/src/app/components/customer/customer.component.less +++ b/usecaseui-portal/src/app/components/customer/customer.component.less @@ -43,8 +43,8 @@ display: inline-block; vertical-align: top; .customer_title { - line-height: 3.5; - height: 5%; + line-height: 3.5em; + //height: 5%; width: 100%; border-bottom: 1px #07A9E1 solid; .customers { @@ -55,6 +55,7 @@ } img { width: 30px; + height: 30px; float: right; margin-top: 7px; } @@ -63,6 +64,7 @@ .customer_detail { height: 95%; width: 100%; + overflow: auto; border-top: 1px #07A9E1 solid; .customer_add { line-height: 3.5; @@ -97,10 +99,11 @@ cursor: pointer; color: rgba(60,79,140,0.5); img { - width: 10%; + width: 30px; + height: 30px; } span { - width: 80%; + width: 70%; padding-left: 10%; display: inline-block; } @@ -119,8 +122,8 @@ display: inline-block; vertical-align: top; .services_type_title { - line-height: 3.5; - height: 5%; + line-height: 3.5em; + //height: 5%; width: 100%; border-bottom: 1px #07A9E1 solid; .servicess { @@ -131,6 +134,7 @@ } img { width: 50px; + height: 50px; float: right; margin-right: -10px; margin-top: 5px; @@ -140,6 +144,7 @@ .services_type_detail { height: 95%; width: 100%; + overflow: auto; border-top: 1px #07A9E1 solid; .services_add { line-height: 3.5; diff --git a/usecaseui-portal/src/app/management/management.component.html b/usecaseui-portal/src/app/management/management.component.html index 8cfccfd3..2efa3f8e 100644 --- a/usecaseui-portal/src/app/management/management.component.html +++ b/usecaseui-portal/src/app/management/management.component.html @@ -18,9 +18,9 @@ <div class="title"> <p> {{"i18nTextDefine_Create_initial_customer" | translate}} </p> <span> {{"i18nTextDefine_Customer_not_in_ONAP" | translate}} </span> - <span> {{"i18nTextDefine_createCustomer&serviceType" | translate}} </span> + <span> {{"i18nTextDefine_CreateCustomer" | translate}} </span> <img src="./assets/images/customer01.png" alt=""> - <input nz-input placeholder=" {{'i18nTextDefine_input_customerName' | translate}} " nzSize="large" style="height: 50px" [(ngModel)]="firstCustomer"> + <input nz-input placeholder=" {{'i18nTextDefine_Input_customerName' | translate}} " nzSize="large" style="height: 50px" [(ngModel)]="firstCustomer"> <div class="action"> <button nz-button nzType="primary" class="cancel" (click) = "clearCustomerInput()"> {{"i18nTextDefine_Cancel" | translate}} </button> <button nz-button nzType="primary" class="add" (click) = "createNewCustomer(firstCustomer)"> {{"i18nTextDefine_Add" | translate}} </button> diff --git a/usecaseui-portal/src/assets/i18n/cn.json b/usecaseui-portal/src/assets/i18n/cn.json index 9686dea3..38fdbf25 100644 --- a/usecaseui-portal/src/assets/i18n/cn.json +++ b/usecaseui-portal/src/assets/i18n/cn.json @@ -108,8 +108,8 @@ "management-component":"--:", "i18nTextDefine_Create_initial_customer":"创建初始用户", "i18nTextDefine_Customer_not_in_ONAP":"ONAP尚未存在已创建用户", - "i18nTextDefine_createCustomer&serviceType":"请创建用户及其服务类型", - "i18nTextDefine_input_customerName":"输入用户名称", + "i18nTextDefine_CreateCustomer":"请创建用户及其服务类型", + "i18nTextDefine_Input_customerName":"输入用户名称", "customer-component":"--:", "i18nTextDefine_Instance_Count_of_Customer":"用户实例计数", diff --git a/usecaseui-portal/src/assets/images/customer01.png b/usecaseui-portal/src/assets/images/customer01.png Binary files differnew file mode 100644 index 00000000..8b60a1f1 --- /dev/null +++ b/usecaseui-portal/src/assets/images/customer01.png diff --git a/usecaseui-portal/src/assets/images/customer02.png b/usecaseui-portal/src/assets/images/customer02.png Binary files differnew file mode 100644 index 00000000..7593dd9f --- /dev/null +++ b/usecaseui-portal/src/assets/images/customer02.png diff --git a/usecaseui-portal/src/assets/images/customer03.png b/usecaseui-portal/src/assets/images/customer03.png Binary files differnew file mode 100644 index 00000000..dd599566 --- /dev/null +++ b/usecaseui-portal/src/assets/images/customer03.png diff --git a/usecaseui-portal/src/assets/images/customer04.png b/usecaseui-portal/src/assets/images/customer04.png Binary files differnew file mode 100644 index 00000000..14506af2 --- /dev/null +++ b/usecaseui-portal/src/assets/images/customer04.png diff --git a/usecaseui-portal/src/assets/images/customer05.png b/usecaseui-portal/src/assets/images/customer05.png Binary files differnew file mode 100644 index 00000000..45e1c97e --- /dev/null +++ b/usecaseui-portal/src/assets/images/customer05.png |