summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src
diff options
context:
space:
mode:
Diffstat (limited to 'usecaseui-portal/src')
-rw-r--r--usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json37
-rw-r--r--usecaseui-portal/src/app/mock/json/getSlicingNsiDetail.json42
-rw-r--r--usecaseui-portal/src/app/mock/json/getSlicingNssiDetail.json23
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_business_list.json2
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json2
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_nsi_list.json2
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json2
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_nssi_list.json2
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_nssi_list_activated.json2
-rw-r--r--usecaseui-portal/src/app/mock/routes.js3
-rw-r--r--usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html8
-rw-r--r--usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts1
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts6
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.html2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts6
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts6
-rw-r--r--usecaseui-portal/src/styles.less3
17 files changed, 131 insertions, 18 deletions
diff --git a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
new file mode 100644
index 00000000..018799cd
--- /dev/null
+++ b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
@@ -0,0 +1,37 @@
+{
+ "result_header": {
+ "result_code": "200",
+ "result_message": "5G slicing business details query result."
+ },
+ "result_body": {
+ "business_demand_info": {
+ "service_name": "5GSliceeMMB",
+ "service_snssai": "1-010101",
+ "exp_data_rate_dl": "300",
+ "exp_data_rate_ul": "300",
+ "ue_mobility_level": "stageary",
+ "latency": "20",
+ "use_interval": "12",
+ "coverage_area_ta_list": [
+ " 北京;北京市;昌平区;城北街道 ",
+ " 上海;上海市;黄浦区;外滩",
+ " 天津;天津市;河西区;海河街道 "
+ ],
+ "activity_factor": "60",
+ "resource_sharing_level": "shared",
+ "area_traffic_cap_ul": "300",
+ "area_traffic_cap_dl": "300",
+ "max_number_of_ues": "10000"
+ },
+ "nst_info": {
+ "nst_id": "46da8cf8-0878-48ac-bea3-f2200959411a",
+ "nst_name": "eMBBNST"
+ },
+ "nsi_info": {
+ "nsi_id": "23edd22b-a0b2-449f-be87-d094159b9269",
+ "nsi_name": "slicing-01-eMBB",
+ "nsi_type": "eMBB",
+ "nsi_orchestration-status": "activated"
+ }
+ }
+} \ No newline at end of file
diff --git a/usecaseui-portal/src/app/mock/json/getSlicingNsiDetail.json b/usecaseui-portal/src/app/mock/json/getSlicingNsiDetail.json
new file mode 100644
index 00000000..b5c24577
--- /dev/null
+++ b/usecaseui-portal/src/app/mock/json/getSlicingNsiDetail.json
@@ -0,0 +1,42 @@
+{
+ "result_header": {
+ "result_code": "200",
+ "result_message": "5Gslicingserviceonlineusersqueryresult."
+ },
+ "result_body": {
+ "hosted_business_list": [
+ {
+ "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9269",
+ "service_instance_name": "slicing-01-eMBB",
+ "service_type": "eMMB",
+ "service_snssai": "1-010101",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9269",
+ "service_instance_name": "slicing-01-eMBB",
+ "service_type": "eMMB",
+ "service_snssai": "1-010101",
+ "orchestration_status": "activated"
+ }
+ ],
+ "included_nssi_list": [
+ {
+ "service_instance_order": "1",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-01-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "1",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-01-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ }
+ ]
+ }
+} \ No newline at end of file
diff --git a/usecaseui-portal/src/app/mock/json/getSlicingNssiDetail.json b/usecaseui-portal/src/app/mock/json/getSlicingNssiDetail.json
new file mode 100644
index 00000000..121254e9
--- /dev/null
+++ b/usecaseui-portal/src/app/mock/json/getSlicingNssiDetail.json
@@ -0,0 +1,23 @@
+{
+ "result_header": {
+ "result_code": "200",
+ "result_message": "5G slicing service nssi details query result."
+ },
+ "result_body": {
+ "record_number": 2,
+ "hosted_nsi_list": [
+ {
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-01-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "eMBB",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-01-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "eMBB",
+ "orchestration_status": "activated"
+ }
+ ]
+ }
+} \ No newline at end of file
diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_list.json b/usecaseui-portal/src/app/mock/json/slicing_business_list.json
index 48145fdc..bedefa98 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_business_list.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_business_list.json
@@ -4,7 +4,7 @@
"result_message": "5G slicing service instances query result."
},
"result_body": {
- "record_number": 30,
+ "record_number": 38,
"slicing_business_list": [
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9265",
diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json b/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json
index bc3172af..0b4b1d7f 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json
@@ -4,7 +4,7 @@
"result_message": "5G slicing service instances query based on status result ."
},
"result_body": {
- "record_number": 2,
+ "record_number": 23,
"slicing_business_list": [
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9260",
diff --git a/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json b/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json
index 418d8193..927441d6 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json
@@ -4,7 +4,7 @@
"result_message": "5G slicing NSI service instances result."
},
"result_body": {
- "record_number": 20,
+ "record_number": 27,
"nsi_service_instances": [
{
"service_instance_order": "1",
diff --git a/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json b/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json
index 480d0694..64fe718f 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json
@@ -4,7 +4,7 @@
"result_message": "5G slicing NSI service instances result."
},
"result_body": {
- "record_number": 2,
+ "record_number": 22,
"nsi_service_instances": [
{
"service_instance_order": "1",
diff --git a/usecaseui-portal/src/app/mock/json/slicing_nssi_list.json b/usecaseui-portal/src/app/mock/json/slicing_nssi_list.json
index 315087b9..2bc509f5 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_nssi_list.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_nssi_list.json
@@ -4,7 +4,7 @@
"result_message": "5G slicing NSSI query result."
},
"result_body": {
- "record_number": 12,
+ "record_number": 28,
"nssi_service_instances": [
{
"service_instance_order": "1",
diff --git a/usecaseui-portal/src/app/mock/json/slicing_nssi_list_activated.json b/usecaseui-portal/src/app/mock/json/slicing_nssi_list_activated.json
index d40addba..aea7085a 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_nssi_list_activated.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_nssi_list_activated.json
@@ -4,7 +4,7 @@
"result_message": "5G slicing NSSI query result."
},
"result_body": {
- "record_number": 6,
+ "record_number": 16,
"nssi_service_instances": [
{
"service_instance_order": "1",
diff --git a/usecaseui-portal/src/app/mock/routes.js b/usecaseui-portal/src/app/mock/routes.js
index b25ada4f..3a5eb950 100644
--- a/usecaseui-portal/src/app/mock/routes.js
+++ b/usecaseui-portal/src/app/mock/routes.js
@@ -109,11 +109,14 @@ module.exports =
"/PUT/uui-slicing/nsmf/resource/:serviceId/deactivate": "/slicing_business_activate",
"/DELETE/uui-slicing/nsmf/resource/:serviceId": "/slicing_business_activate",
"/uui-slicing/nsmf/resource/:serviceId/progress":"/getSlicingBusinessProgress",
+ "/uui-slicing/nsmf/resource/business/:businessId/details":"/getSlicingBusinessDetail",
///////<-------------slicing_nsi--------->/////
"/uui-slicing/nsmf/resource/nsi/:instanceStatus/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nsi_list_activated",
+ "/uui-slicing/nsmf/resource/nsi/:nsiId/details":"/getSlicingNsiDetail",
///////<-------------slicing_nssi--------->/////
"/uui-slicing/nsmf/resource/nssi/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nssi_list",
"/uui-slicing/nsmf/resource/nssi/:instanceStatus/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nssi_list_activated",
+ "/uui-slicing/nsmf/resource/nssi/:nssiId/details":"/getSlicingNssiDetail",
///////<-------------general interface--------->/////
"/api/*": "/$1",
"/*/*": "/$1_$2",
diff --git a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html
index 8a6cbf23..5a600ce3 100644
--- a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html
+++ b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html
@@ -1,4 +1,4 @@
-<nz-list class="taskmodel_list" [nzDataSource]="checkDetail" nzBordered [nzHeader]="'配置审核详情:'" [nzFooter]="null"
+<nz-list class="taskmodel_list" [nzDataSource]="checkDetail" nzBordered [nzHeader]="'配置审核详情:'" [nzFooter]="null" *ngIf="taskModel!==false"
[nzRenderItem]="checkItem">
<ng-template #checkItem let-check>
<nz-list-item nz-row nzType="flex" nzJustify="start" [nzGutter]="8">
@@ -28,7 +28,11 @@
<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>
+ <span class="ant-typography" *ngIf="ite!=='区域'">{{ ite.title }} : &nbsp;{{ item[ite.key] }}</span>
+ <span class="ant-typography" *ngIf="ite==='区域'">
+ {{ ite.title }} : &nbsp;
+ <span style="display: inline-block" *ngFor="let items of item[ite.key]">{{ items }}&nbsp;&nbsp;&nbsp;&nbsp;</span>
+ </span>
</div>
</nz-list-item>
</ng-template>
diff --git a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts
index 0f096b71..d718d9d3 100644
--- a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts
+++ b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts
@@ -10,6 +10,7 @@ export class BasicInfoComponent implements OnInit {
@Input() checkDetail: any;
@Input() businessRequirement: any;
@Input() NSTinfo: any;
+ @Input() taskModel: any;
// 业务需求列表
businessList: object[] = BUSINESS_REQUIREMENT;
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts
index a88d1618..48c8d5ac 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts
@@ -20,7 +20,7 @@ export class NsiTableComponent implements OnInit {
listOfData: any[] = [];
pageIndex: number = 1;
pageSize: number = 10;
- total: number = 100;
+ total: number = 0;
loading = false;
isSelect: boolean = false;
statusOptions: any[] = BUSINESS_STATUS;
@@ -37,9 +37,9 @@ export class NsiTableComponent implements OnInit {
this.isSelect = true;
}
this.myhttp.getSlicingNsiList(paramsObj,this.isSelect).subscribe (res => {
- const { result_header: { result_code }, result_body: { nsi_service_instances } } = res;
+ const { result_header: { result_code }, result_body: { nsi_service_instances,record_number } } = res;
if (+result_code === 200) {
- this.total = nsi_service_instances.length;
+ this.total = record_number;
this.loading = false;
this.listOfData = nsi_service_instances;
}
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.html
index c2408a81..82e02b24 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.html
@@ -27,7 +27,7 @@
<th>Service Instance Id</th>
<th>Service Instance Name</th>
<th>Service Type</th>
- <th>Context</th>
+ <th>Environment Context</th>
<th>Status</th>
<th width="140px">Detail</th>
</tr>
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts
index 926350b9..00e5c5c9 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts
@@ -20,7 +20,7 @@ export class NssiTableComponent implements OnInit {
listOfData: any[] = [];
pageIndex: number = 1;
pageSize: number = 10;
- total: number = 100;
+ total: number = 0;
loading = false;
isSelect: boolean = false;
statusOptions: any[] = BUSINESS_STATUS;
@@ -37,9 +37,9 @@ export class NssiTableComponent implements OnInit {
this.isSelect = true;
}
this.myhttp.getSlicingNssiList(paramsObj,this.isSelect).subscribe (res => {
- const { result_header: { result_code }, result_body: { nssi_service_instances } } = res;
+ const { result_header: { result_code }, result_body: { nssi_service_instances,record_number } } = res;
if (+result_code === 200) {
- this.total = nssi_service_instances.length;
+ this.total = record_number;
this.loading = false;
this.listOfData = nssi_service_instances;
}
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
index ffcb2fe0..0d4c6df8 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
@@ -26,7 +26,7 @@ export class SlicingBusinessTableComponent implements OnInit {
listOfData: any[] = [];
pageIndex: number = 1;
pageSize: number = 10;
- total: number = 100;
+ total: number = 0;
loading = false;
isSelect: boolean = false;
statusOptions: any[] = BUSINESS_STATUS;
@@ -45,9 +45,9 @@ export class SlicingBusinessTableComponent implements OnInit {
this.isSelect = true;
}
this.myhttp.getSlicingBusinessList(paramsObj,this.isSelect).subscribe (res => {
- const { result_header: { result_code }, result_body: { slicing_business_list } } = res;
+ const { result_header: { result_code }, result_body: { slicing_business_list,record_number } } = res;
if (+result_code === 200) {
- this.total = slicing_business_list.length;
+ this.total = record_number;
this.loading = false;
this.listOfData = slicing_business_list.map((item)=>{
if(item.last_operation_progress < 100){
diff --git a/usecaseui-portal/src/styles.less b/usecaseui-portal/src/styles.less
index 5d372eb3..4d647f76 100644
--- a/usecaseui-portal/src/styles.less
+++ b/usecaseui-portal/src/styles.less
@@ -828,4 +828,7 @@ nz-notification-container .ant-notification{
}
.slicing-resource-table-list{
padding: 0 20px 0 0!important;
+}
+.taskmodel_list{
+ margin-bottom: 20px;
} \ No newline at end of file