From e0503c445cbb07f2075ef17b22061e304a203119 Mon Sep 17 00:00:00 2001
From: guochuyicmri <guochuyi@chinamobile.com>
Date: Wed, 22 May 2019 16:55:40 +0800
Subject: User and service type management interface

Change-Id: I8cc018600880433891a434f312c37f97fc2e6107
Issue-ID: USECASEUI-211
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
---
 .../components/customer/customer.component.html    |  4 ++--
 .../app/components/customer/customer.component.ts  | 25 ++++++++++++++--------
 usecaseui-portal/src/app/home/home.component.html  |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/usecaseui-portal/src/app/components/customer/customer.component.html b/usecaseui-portal/src/app/components/customer/customer.component.html
index 82ef2818..fea9dfdf 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 @@
         <div class="type">
           <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">
+          <div class="footname" style="width: 100%;height: 40px;line-height: 40px;text-align: center;color: #3C4F8C;">
             <img src="./assets/images/customerBarUser.png" alt="customerName" style="margin-right: 5px;margin-bottom: 3px;">
             {{this.serviceInit["customer"]}}
           </div>
@@ -62,7 +62,7 @@
     </div>
     <div class="services_type_detail">
       <div class="services_add" *ngIf="servicesadd">
-        <input nz-input placeholder=" {{'i18nTextDefine_Input_ServicesType' | translate}} " class="services_name" nzSize="default">
+        <input nz-input placeholder=" {{'i18nTextDefine_Input_ServicesType' | translate}} " class="services_name" nzSize="default" [(ngModel)]="addNewServiceType">
         <button nz-button nzType="primary" class="services_addbut" (click) = "createNewServiceType()">{{"i18nTextDefine_Add" | translate}}</button>
       </div>
       <div class="services_list">
diff --git a/usecaseui-portal/src/app/components/customer/customer.component.ts b/usecaseui-portal/src/app/components/customer/customer.component.ts
index b609de57..f59f72bf 100644
--- a/usecaseui-portal/src/app/components/customer/customer.component.ts
+++ b/usecaseui-portal/src/app/components/customer/customer.component.ts
@@ -175,7 +175,7 @@ export class CustomerComponent implements OnInit {
     serviceInit: Object = {
         customer: '',
         width: 280,
-        height: 210,
+        height: 190,
         option: {
             tooltip: {
                 show: true,
@@ -361,7 +361,10 @@ export class CustomerComponent implements OnInit {
 
     createNewCustomer() {
         let createParams = {
-            customerId: this.addNewCustomer
+            customerId: this.addNewCustomer,
+            'global-customer-id':this.addNewCustomer,
+            'subscriber-name':this.addNewCustomer,
+            'subscriber-type':'INFRA'
         };
         this.managemencs.createCustomer(this.addNewCustomer, createParams).subscribe((data) => {
             if (data["status"] == 'SUCCESS') {
@@ -417,11 +420,14 @@ export class CustomerComponent implements OnInit {
     createNewServiceType() {
         let createParams = {
             customer: this.selectCustomer,
-            ServiceType:this.addNewServiceType
+            ServiceType: this.addNewServiceType,
+            "service-type":this.addNewServiceType,
+            "temp-ub-sub-account-id":"sotnaccount"
         };
         this.managemencs.createServiceType(createParams).subscribe((data) => {
             if (data["status"] == 'SUCCESS') {
                 this.getCustomersColumn(this.selectCustomer);
+                this.getAllCustomers();
                 console.log(data, "Interface returned success")
             } else {
                 console.log(data, "Interface returned error")
@@ -444,12 +450,13 @@ export class CustomerComponent implements OnInit {
         this.deleteServiceTypeModelVisible = false;
         this.getServiceTypeVersion();
     }
-    getServiceTypeVersion(){
-        let params={
-            customerId:this.selectCustomer.id,
-            ServiceType:this.thisdeleteServiceType["type"]
+    getServiceTypeVersion() {
+        let paramss = {
+            customerId: this.selectCustomer,
+            ServiceType: this.thisdeleteServiceType["type"]
         };
-        this.managemencs.getdeleteServiceTypeVersion(params).subscribe((data) => {
+        this.managemencs.getdeleteServiceTypeVersion(paramss).subscribe((data) => {
+            console.log(data)
             if (data["status"] == 'SUCCESS') {
                 let params = {
                     customerId:this.selectCustomer,
@@ -466,9 +473,9 @@ export class CustomerComponent implements OnInit {
     deleteServiceType(params){
         this.managemencs.deleteSelectServiceType(params).subscribe((data) => {
             if (data["status"] == 'SUCCESS') {
-                this.getCustomersPie();
                 this.getServiceTypes(params.customerId);
                 this.getCustomersColumn(params.customerId);
+                this.getAllCustomers();
                 console.log(data, "Interface returned success")
             } else {
                 console.log(data, "Interface returned error")
diff --git a/usecaseui-portal/src/app/home/home.component.html b/usecaseui-portal/src/app/home/home.component.html
index ba847ecb..d429bf8f 100644
--- a/usecaseui-portal/src/app/home/home.component.html
+++ b/usecaseui-portal/src/app/home/home.component.html
@@ -72,7 +72,7 @@
     </div>
   </div>
   <div class="rightcontent" style="height: 96vh">
-    <div class="rt-content" >
+    <div class="rt-content">
       <div class="alarm">
         <h4>{{"i18nTextDefine_ALARM" | translate}}</h4>
         <app-pie [initData]="alarmChartInit" [chartData]="alarmChartData"></app-pie>
-- 
cgit 1.2.3-korg