From 372bbf21aba82b32c544933bce08cc9ae2795fb6 Mon Sep 17 00:00:00 2001
From: wangyuerg <wangyuerg@chinamobile.com>
Date: Tue, 1 Sep 2020 17:11:20 +0800
Subject: fix: fix the bug of subnet-params and conflict

Change-Id: Ic27e6cfbb3a706ed23f3f1317dd552c01f285bb1
Signed-off-by: wangyuerg <wangyuerg@chinamobile.com>
Issue-ID: USECASEUI-444
---
 .../subnet-params-model.component.html                 | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html')

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html
index 50b6e5ad..6a49cc67 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html
@@ -8,7 +8,7 @@
 				</nz-form-label>
 				<nz-form-control [nzSpan]="12">
 					<input nz-input
-						   [(ngModel)]="detailData[item.key]"
+						   [(ngModel)]="formData[item.key]"
 						   [name]="item.key"
 						   [id]="item.key"
 						   [readOnly]="item.title === 'S-NSSAI'"
@@ -23,30 +23,37 @@
 					{{ item.title }}
 				</nz-form-label>
 				<nz-form-control [nzSpan]="item.title === 'Endpoint'?14:8" *ngIf="item.key !== 'an_coverage_area_ta_list'">
-					<input nz-input [id]="item.key" [name]="item.key" [(ngModel)]="detailData[item.key]"
+					<input nz-input [id]="item.key" [name]="item.key" [(ngModel)]="formData[item.key]"
 						[readOnly]="item.title === 'S-NSSAI'" [disabled]="item.title === 'S-NSSAI'"
 						*ngIf=" item.title !== 'Resource Sharing Level' && item.title !== 'Mobility' && item.title !== 'Endpoint' " />
-					<nz-radio-group [name]="item.key" [(ngModel)]="detailData[item.key]"
+					<nz-radio-group [name]="item.key" [(ngModel)]="formData[item.key]"
 						*ngIf="item.title === 'Resource Sharing Level'">
 						<label nz-radio [nzValue]="option.key" *ngFor="let option of item.options">
 							{{ option.title }}
 						</label>
 					</nz-radio-group>
-					<nz-select [name]="item.key" [(ngModel)]="detailData[item.key]" *ngIf="item.title === 'Mobility'">
+					<nz-select [name]="item.key" [(ngModel)]="formData[item.key]" *ngIf="item.title === 'Mobility'">
 						<nz-option [nzValue]="option.key" [nzLabel]="option.title" *ngFor="let option of item.options">
 						</nz-option>
 					</nz-select>
+					<div class="validation_alert">{{formData[item.key] === ''? 'can not be empty!':' '}}</div>
 					<!-- 2020.08.17  Add 3 parameters for Endpoint-->
 					<!-- Comment: The following code-->
 					<nz-input-group *ngIf="item.title === 'Endpoint' && EndpointEnable">
 						<div *ngFor="let option of item.options;let i=index">
-							<input nz-input
+							<div class="endpoint_input">
+								<input nz-input
 								   *ngIf="option.title !== 'nexthop_info'"
 								   [id]="option.key"
 								   [name]="option.key"
 								   [title]="EndpointInputs[i][option.key]"
 								   [(ngModel)]="EndpointInputs[i][option.key]"
+								   [placeholder]="option.holder"
+								   (input)="onInput($event, option.title)"
 								   style="width:32%;margin-right:1%" />
+								<div class="end_alert_ip" *ngIf="option.title === 'ip_address'">{{validateEndPoint(option.title, EndpointInputs[i][option.key])}}</div>
+								<div class="end_alert_logical"  *ngIf="option.title === 'logical_link'">{{validateEndPoint(option.title, EndpointInputs[i][option.key])}}</div>
+							</div>
 							<nz-select
 									*ngIf="option.title === 'nexthop_info'"
 									[name]="option.key"
@@ -84,6 +91,7 @@
 							</button>
 						</nz-form-control>
 					</div>
+					<div class="validation_alert_area">{{checkArea()}}</div>
 				</div>
 			</nz-form-item>
 		</form>
-- 
cgit 1.2.3-korg