From bb073de34e081e165d4725c8f94e144c4e5618dc Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Thu, 5 Dec 2019 14:58:51 +0800
Subject: feat: Encapsulate basic task information into public components

Change-Id: If00db97b6cf4f0a192269acaad1981c3f0d27919
Issue-ID: USECASEUI-352
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../slicing-task-model.component.html              | 55 +++-------------------
 .../slicing-task-model.component.ts                |  3 --
 2 files changed, 6 insertions(+), 52 deletions(-)

(limited to 'usecaseui-portal/src/app/views')

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html
index 6c2560ac..afec64a7 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html
@@ -1,54 +1,11 @@
 <nz-modal [nzVisible]="showDetail" nzWidth="85%" [nzTitle]="moduleTitle" (nzOnCancel)="handleCancel()"
   (nzOnOk)="handleOk()">
-  <nz-list class="taskmodel_list" [nzDataSource]="checkDetail" nzBordered [nzHeader]="'配置审核详情：'" [nzFooter]="null"
-    [nzRenderItem]="checkItem">
-    <ng-template #checkItem let-check>
-      <nz-list-item nz-row nzType="flex" nzJustify="start" [nzGutter]="8">
-        <div nz-col nzSpan="10">
-          <span>Task ID： {{ check.task_id }}</span>
-        </div>
-        <div nz-col nzSpan="8">
-          <span>Task Name： {{ check.task_name }}</span>
-        </div>
-        <div nz-col nzSpan="6">
-          <span>S-NSSAI：{{ check.service_snssai }}</span>
-        </div>
-      </nz-list-item>
-      <nz-list-item nz-row nzType="flex" nzJustify="start" [nzGutter]="8">
-        <div nz-col nzSpan="10">
-          <span>Arrived Time： {{ check.create_time | date: 'yyyy-MM-dd HH:mm:ss' }}</span>
-        </div>
-        <div nz-col nzSpan="8">
-          <span>Status： {{ check.processing_status }}</span>
-        </div>
-      </nz-list-item>
-    </ng-template>
-  </nz-list>
-
-  <nz-list class="taskmodel_list" [nzDataSource]="businessRequirement" nzBordered [nzHeader]="'业务需求信息：'"
-    [nzFooter]="null" [nzRenderItem]="businessItem">
-    <ng-template #businessItem let-item>
-      <nz-list-item  nz-row nzType="flex" nzJustify="start" [nzGutter]="8" *ngFor="let list of businessList ">
-        <div nz-col [nzSpan]="list.length === 1 ? '24' : '8'" *ngFor="let ite of list">
-          <span class="ant-typography">{{ ite.title }} : &nbsp;{{ item[ite.key] }}</span>
-        </div>
-      </nz-list-item>
-    </ng-template>
-  </nz-list>
-
-  <nz-list class="taskmodel_list" [nzDataSource]="NSTinfo" nzBordered [nzHeader]="'匹配NST信息：'" [nzFooter]="null"
-    [nzRenderItem]="taskItem">
-    <ng-template #taskItem let-item>
-      <nz-list-item nz-row nzType="flex" nzJustify="start" [nzGutter]="8">
-        <div nz-col nzSpan="12">
-          <span>NST ID： {{ item.nst_id }}</span>
-        </div>
-        <div nz-col nzSpan="12">
-          <span>NST Name： {{ item.nst_name }}</span>
-        </div>
-      </nz-list-item>
-    </ng-template>
-  </nz-list>
+  <app-basic-info
+		[checkDetail]="checkDetail"
+		[businessRequirement]="businessRequirement"
+		[NSTinfo]="NSTinfo"
+	>
+	</app-basic-info>
 
   <div>
     <nz-list class="taskmodel_list" nzBordered [nzHeader]="'匹配共享切片实例：'" [nzFooter]="null">
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts
index d9c1ec34..fa27d9e5 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { SlicingTaskServices } from '../../../../../core/services/slicingTaskServices';
-import { BUSINESS_REQUIREMENT } from '../../../../../../constants/constants';
 
 @Component({
   selector: 'app-slicing-task-model',
@@ -15,8 +14,6 @@ export class SlicingTaskModelComponent implements OnInit {
 
   constructor(private http: SlicingTaskServices) { }
 
-  // 业务需求列表
-  businessList: object[] = BUSINESS_REQUIREMENT;
   // 配置审核详情
   checkDetail: any[] = [{}];
   //业务需求信息
-- 
cgit 1.2.3-korg