From 27f241a7c7c9741d1834fbb13dd7250cb51de8c9 Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Wed, 11 Dec 2019 09:16:41 +0800
Subject: feat: Optimize code and add English fields

Change-Id: Id61ab33f0bb612f8ae3a1debbc4c2d4887cf2b2d
Issue-ID: USECASEUI-368
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../slicing-task-management.component.html         |  62 +++++--
 .../slicing-task-management.component.ts           |   8 +-
 .../subnet-params-model.component.html             | 181 +++++++++++++++------
 3 files changed, 179 insertions(+), 72 deletions(-)

(limited to 'usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management')

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html
index c4aeb72e..81f4c961 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html
@@ -2,17 +2,35 @@
 	<div nz-row>
 		<div nz-col nzSpan="12" class="task_status">
 			<span>Status : </span>
-			<nz-select nzShowSearch nzAllowClear [(ngModel)]="selectedValue" nzPlaceHolder="Select a processing status"
-				(ngModelChange)="processingStatusChange()">
-				<nz-option *ngFor="let item of statusOptions" [nzLabel]="item.title" [nzValue]="item.value"></nz-option>
+			<nz-select
+				nzShowSearch
+				[(ngModel)]="selectedValue"
+				nzPlaceHolder="Select a processing status"
+				(ngModelChange)="processingStatusChange()"
+			>
+				<nz-option
+					*ngFor="let item of statusOptions"
+					[nzLabel]="item.title"
+					[nzValue]="item.value"
+				></nz-option>
 			</nz-select>
 		</div>
 	</div>
 	<div>
-		<nz-table #basicTable nzShowPagination nzPageSizeOptions nzShowSizeChanger [nzTotal]="total"
-			[nzLoading]="loading" [nzData]="listOfData" [nzPageIndex]="pageNum" [nzPageSize]="pageSize"
-			[nzFrontPagination]="false" (nzPageSizeChange)="pageSizeChange($event)"
-			(nzPageIndexChange)="pageNumChange($event)">
+		<nz-table
+			#basicTable
+			nzShowPagination
+			nzPageSizeOptions
+			nzShowSizeChanger
+			[nzTotal]="total"
+			[nzLoading]="loading"
+			[nzData]="listOfData"
+			[nzPageIndex]="pageNum"
+			[nzPageSize]="pageSize"
+			[nzFrontPagination]="false"
+			(nzPageSizeChange)="pageSizeChange($event)"
+			(nzPageIndexChange)="pageNumChange($event)"
+		>
 			<thead>
 				<tr>
 					<th>Task ID</th>
@@ -33,19 +51,33 @@
 					<td>{{ data.create_time | date: "yyyy-MM-dd HH:mm:ss"}}</td>
 					<td>{{ data.processing_status }}</td>
 					<td>
-						<span *ngIf="data.processing_status === 'Planning'"
-							class="task_operation_disabled">{{ data.operation }}</span>
-						<a (click)="showdetail(data)"
-							*ngIf="data.processing_status !== 'Planning'">{{ data.operation }}</a>
+						<span
+							*ngIf="data.processing_status === 'Planning'"
+							class="task_operation_disabled"
+							>{{ data.operation }}</span
+						>
+						<a
+							(click)="showdetail(data)"
+							*ngIf="data.processing_status !== 'Planning'"
+							>{{ data.operation }}</a
+						>
 					</td>
 				</tr>
 			</tbody>
 		</nz-table>
 	</div>
-	<app-slicing-task-model [moduleTitle]="moduleTitle" [showDetail]="showDetail" [taskId]="taskId"
-		(cancel)="showDetail = $event">
+	<app-slicing-task-model
+		[moduleTitle]="moduleTitle"
+		[showDetail]="showDetail"
+		[taskId]="taskId"
+		(cancel)="showDetail = $event"
+	>
 	</app-slicing-task-model>
-	<app-check-process-model [moduleTitle]="moduleTitle" [showProcess]="showProcess" [taskId]="taskId"
-		(cancel)="showProcess = $event">
+	<app-check-process-model
+		[moduleTitle]="moduleTitle"
+		[showProcess]="showProcess"
+		[taskId]="taskId"
+		(cancel)="showProcess = $event"
+	>
 	</app-check-process-model>
 </div>
\ No newline at end of file
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts
index 6c4d9041..944f4a25 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts
@@ -14,7 +14,7 @@ export class SlicingTaskManagementComponent implements OnInit {
 
   showDetail: boolean = false;
   showProcess: boolean = false;
-  selectedValue = null;
+  selectedValue = 'all';
   taskId: string;
   moduleTitle: string = "";
   listOfData: any[] = [];
@@ -47,7 +47,7 @@ export class SlicingTaskManagementComponent implements OnInit {
   processingStatusChange(): void {
     this.pageSize = '10';
     this.pageNum = '1';
-    if (this.selectedValue) {
+    if (this.selectedValue && this.selectedValue !== 'all') {
       this.getListOfProcessingStatus();
     } else {
       this.getTaskList();
@@ -73,7 +73,7 @@ export class SlicingTaskManagementComponent implements OnInit {
   pageSizeChange(pageSize: number): void {
     this.pageSize = pageSize + '';
     const { selectedValue } = this;
-    if (selectedValue) {
+    if (selectedValue && selectedValue !== 'all') {
       this.getListOfProcessingStatus();
     } else {
       this.getTaskList();
@@ -83,7 +83,7 @@ export class SlicingTaskManagementComponent implements OnInit {
   pageNumChange(pageNum: number): void {
     this.pageNum = pageNum + '';
     const { selectedValue } = this;
-    if (selectedValue) {
+    if (selectedValue && selectedValue !== 'all') {
       this.getListOfProcessingStatus();
     } else {
       this.getTaskList();
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 1dfc6338..127a5b98 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
@@ -1,54 +1,129 @@
-<nz-modal [(nzVisible)]="showModel" [nzTitle]="title + '参数'" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()" nzWidth="700px">
-    <div class="subnet_params_container">
-        <form nz-form *ngIf="title === '无线域'">
-            <nz-form-item *ngFor="let item of wirelessFormItems">
-                <nz-form-label  [nzSpan]="5" nzRequired [nzFor]="item.key">{{item.title}}</nz-form-label>
-                <nz-form-control [nzSpan]="10"  *ngIf="item.key !== 'an_coverage_area_ta_list'">
-                    <input nz-input [(ngModel)]="detailData[item.key]" [name]="item.key" [id]="item.key"/>
-                </nz-form-control>
-                <div *ngIf="item.key === 'an_coverage_area_ta_list'">
-                    <div *ngFor="let area of areaList; let i = index">
-                        <nz-form-control [nzSpan]="4" [nzOffset]=" i && !ind ? 5 : 0"  class="subnet_params_area" *ngFor="let item of area; let ind = index">
-                            <nz-select [(ngModel)]="item.selected" [name]="'area' +i + ind" (nzOpenChange)="handleChange(area, item)" (ngModelChange)="handleChangeSelected(area,item)"> 
-                                <nz-option [nzValue]="op.name" *ngFor="let op of item.options" [nzLabel]="op.name" ></nz-option>
-                            </nz-select>
-                        </nz-form-control>
-                        <nz-form-control [nzSpan]="1" [nzOffset]="1">
-                            <button nz-button nzType="primary" nzSize="small"  class="subnet_params_button"  *ngIf="!i" (click)="creatAreaList()">
-                                <i nz-icon class="anticon anticon-plus subnet_params_icon"></i>
-                            </button>
-                            <button nz-button nzType="primary" nzSize="small"  class="subnet_params_button"  *ngIf="i" (click)="deleteAreaList(i)">
-                                <i nz-icon class="anticon anticon-minus subnet_params_icon"></i>
-                            </button>
-                        </nz-form-control>
-                    </div>
-                    
-                </div>
-            </nz-form-item>
-        </form>
-        <form nz-form *ngIf="title === '传输域'">
-            <nz-form-item *ngFor="let item of transferFormItems">
-                <nz-form-label  [nzSpan]="7" nzRequired [nzFor]="item.key">{{item.title}}</nz-form-label>
-                <nz-form-control [nzSpan]="12">
-                    <input nz-input [(ngModel)]="detailData[item.key]" [name]="item.key" [id]="item.key"/>
-                </nz-form-control>
-            </nz-form-item>
-        </form>
-        <form nz-form *ngIf="title === '核心域'">
-            <nz-form-item *ngFor="let item of coreFormItems">
-                <nz-form-label  [nzSpan]="10" nzRequired [nzFor]="item.key">{{item.title}}</nz-form-label>
-                <nz-form-control [nzSpan]="10" >
-                    <input nz-input [(ngModel)]="detailData[item.key]" [name]="item.key" [id]="item.key" [readOnly]="item.title === 'S-NSSAI'" *ngIf="item.title !== '共享等级' && item.title !== '游牧性'"/>
-                    <nz-radio-group [name]="item.key" [(ngModel)]="detailData[item.key]" *ngIf="item.title === '共享等级'">
-                        <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 === '游牧性'">
-                        <nz-option [nzValue]="option.key" *ngFor="let option of item.options" [nzLabel]="option.title"></nz-option>
-                    </nz-select>
-                </nz-form-control>
-
-            </nz-form-item>
-        </form>
-
-    </div>
+<nz-modal
+	[(nzVisible)]="showModel"
+	[nzTitle]="title + '参数'"
+	(nzOnCancel)="handleCancel()"
+	(nzOnOk)="handleOk()"
+	nzWidth="700px"
+>
+	<div class="subnet_params_container">
+		<form nz-form *ngIf="title === '无线域'">
+			<nz-form-item *ngFor="let item of wirelessFormItems">
+				<nz-form-label [nzSpan]="6" nzRequired [nzFor]="item.key">
+                    {{ item.title }}
+                </nz-form-label>
+				<nz-form-control
+					[nzSpan]="10"
+					*ngIf="item.key !== 'an_coverage_area_ta_list'"
+				>
+					<input
+						nz-input
+						[(ngModel)]="detailData[item.key]"
+						[name]="item.key"
+						[id]="item.key"
+					/>
+				</nz-form-control>
+				<div *ngIf="item.key === 'an_coverage_area_ta_list'">
+					<div *ngFor="let area of areaList; let i = index">
+						<nz-form-control
+							[nzSpan]="4"
+							[nzOffset]="i && !ind ? 6 : 0"
+							class="subnet_params_area"
+							*ngFor="let item of area; let ind = index"
+						>
+							<nz-select
+								[(ngModel)]="item.selected"
+								[name]="'area' + i + ind"
+								(nzOpenChange)="handleChange(area, item)"
+								(ngModelChange)=" handleChangeSelected(area, item) "
+							>
+								<nz-option
+									[nzValue]="op.name"
+									[nzLabel]="op.name"
+									*ngFor="let op of item.options"
+								></nz-option>
+							</nz-select>
+						</nz-form-control>
+						<nz-form-control [nzSpan]="1" [nzOffset]="1">
+							<button
+								nz-button
+								nzType="primary"
+								nzSize="small"
+								class="subnet_params_button"
+								*ngIf="!i"
+								(click)="creatAreaList()"
+							>
+								<i nz-icon class="anticon anticon-plus subnet_params_icon" ></i>
+							</button>
+							<button
+								nz-button
+								nzType="primary"
+								nzSize="small"
+								class="subnet_params_button"
+								*ngIf="i"
+								(click)="deleteAreaList(i)"
+							>
+								<i nz-icon class="anticon anticon-minus subnet_params_icon" ></i>
+							</button>
+						</nz-form-control>
+					</div>
+				</div>
+			</nz-form-item>
+		</form>
+		<form nz-form *ngIf="title === '传输域'">
+			<nz-form-item *ngFor="let item of transferFormItems">
+				<nz-form-label [nzSpan]="7" nzRequired [nzFor]="item.key">
+                    {{ item.title }}
+                </nz-form-label>
+				<nz-form-control [nzSpan]="12">
+					<input
+						nz-input
+						[(ngModel)]="detailData[item.key]"
+						[name]="item.key"
+						[id]="item.key"
+					/>
+				</nz-form-control>
+			</nz-form-item>
+		</form>
+		<form nz-form *ngIf="title === '核心域'">
+			<nz-form-item *ngFor="let item of coreFormItems">
+				<nz-form-label [nzSpan]="10" nzRequired [nzFor]="item.key">
+                    {{ item.title }}
+                </nz-form-label>
+				<nz-form-control [nzSpan]="10">
+					<input
+						nz-input
+						[id]="item.key"
+						[name]="item.key"
+						[(ngModel)]="detailData[item.key]"
+						[readOnly]="item.title === 'S-NSSAI'"
+						*ngIf=" item.title !== 'Resource Sharing Level' && item.title !== 'Mobility' "
+					/>
+					<nz-radio-group
+						[name]="item.key"
+						[(ngModel)]="detailData[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-option
+							[nzValue]="option.key"
+							[nzLabel]="option.title"
+							*ngFor="let option of item.options"
+						></nz-option>
+					</nz-select>
+				</nz-form-control>
+			</nz-form-item>
+		</form>
+	</div>
 </nz-modal>
-- 
cgit 1.2.3-korg