diff options
3 files changed, 15 insertions, 8 deletions
diff --git a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts index 6759d026..aff3ef9e 100644 --- a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts +++ b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts @@ -33,6 +33,7 @@ export class CcvpnDetailComponent implements OnInit { } @Input() detailParams; + @Input() upDateShow; @Output() closeDetail = new EventEmitter(); tabBarStyle = { @@ -77,6 +78,7 @@ export class CcvpnDetailComponent implements OnInit { //tabBarStyle dataInit() { console.log(this.detailParams) + console.log(this.upDateShow) // this.input_parameters = JSON.stringify(this.detailParams['input-parameters']) this.input_parameters = JSON.parse(this.detailParams['input-parameters']); console.log(this.input_parameters); diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.html b/usecaseui-portal/src/app/services/services-list/services-list.component.html index 3185869d..b0efa5f4 100644 --- a/usecaseui-portal/src/app/services/services-list/services-list.component.html +++ b/usecaseui-portal/src/app/services/services-list/services-list.component.html @@ -164,21 +164,19 @@ </td> <td> <i [ngClass]="{'cannotclick':data.status == 'In Progress'||(data.status=='Failed' && data.operationType=='1001')||(data.status=='Failed' && data.operationType=='1002')}" - class="anticon anticon-bars" (click)="serviceDetail(data)"></i> + class="anticon anticon-bars" (click)="serviceDetail(data,1)"></i> <i [ngClass]="{'cannotclick':data.status == 'In Progress'}" class="anticon anticon-delete" (click)="deleteModel(data)"></i> <i [ngClass]="{'cannotclick':data.status == 'In Progress'}" class="anticon anticon-ellipsis" (click)="iconMoreShow(data,tableData)" style="transform: rotate(90deg);"></i> <ul *ngIf="data.iconMore==true " class="icon-more"> - <li (click)="scaleService(data)"> - <i [ngClass]="{'cannotclick':data.serviceDomain!='E2E Service' || data.status == 'In Progress'||(data.status=='Failed' && data.operationType=='1001')||(data.status=='Failed' && data.operationType=='1002')}" - class="anticon anticon-scale"></i> + <li (click)="scaleService(data)" [ngClass]="{'cannotclick':data.serviceDomain!='E2E Service' || data.status == 'In Progress'||(data.status=='Failed' && data.operationType=='1001')||(data.status=='Failed' && data.operationType=='1002')}"> + <i class="anticon anticon-scale"></i> <span> {{"i18nTextDefine_Scale" | translate}} </span> </li> - <li (click)="update(data)"> - <i [ngClass]="{'cannotclick':data.serviceDomain!='CCVPN' || data.status == 'In Progress'||(data.status=='Failed' && data.operationType=='1001')||(data.status=='Failed' && data.operationType=='1002')}" - class="anticon anticon-update" ></i> + <li (click)="serviceDetail(data,2)" [ngClass]="{'cannotclick':data.serviceDomain!='CCVPN' || data.status == 'In Progress'||(data.status=='Failed' && data.operationType=='1001')||(data.status=='Failed' && data.operationType=='1002')}"> + <i class="anticon anticon-update" ></i> <span> {{"i18nTextDefine_Update" | translate}} </span> </li> </ul> @@ -630,6 +628,7 @@ </div> <div class="detailComponent" *ngIf="detailshow"> <app-ccvpn-detail [detailParams]="detailData" + [upDateShow]="upDateShow" (closeDetail)="detailshow = false;listDisplay = false;"></app-ccvpn-detail> </div> <div class="detailComponent" *ngIf="detailshow2"> diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/services/services-list/services-list.component.ts index d9b1656e..45652529 100644 --- a/usecaseui-portal/src/app/services/services-list/services-list.component.ts +++ b/usecaseui-portal/src/app/services/services-list/services-list.component.ts @@ -581,8 +581,9 @@ export class ServicesListComponent implements OnInit { // show detail detailshow = false; detailshow2 = false; + upDateShow = false; detailData:Object; - serviceDetail(service){ + serviceDetail(service,typeNum){ service["siteSer"]=[]; service["sdwanSer"]=[]; service["customer"]=this.customerSelected; @@ -597,6 +598,11 @@ export class ServicesListComponent implements OnInit { }) if(service["serviceDomain"]=='CCVPN' ||service["serviceDomain"]=='SOTN' ){ this.detailshow = true; + if(typeNum == 1){ + this.upDateShow = false; + }else { + this.upDateShow = true; + } }else if(service["serviceDomain"]=='E2E Service' || service["serviceDomain"]=='Network Service'){ this.detailshow2 = true; } |