summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal
diff options
context:
space:
mode:
authorwangyuerg <wangyuerg@chinamobile.com>2021-03-25 15:38:10 +0800
committerwangyuerg <wangyuerg@chinamobile.com>2021-03-25 15:38:45 +0800
commitcd382d5374bfde0629b8de44a46829c4d0613c3d (patch)
tree9fa9a5108dd2f1fd1e03edbd771c9b0d4b2fb685 /usecaseui-portal
parentc915bc1fcfa9d08f856994a27e9652c56110336d (diff)
feat:Null processing add loading
Signed-off-by: wangyuerg <wangyuerg@chinamobile.com> Change-Id: I615b82148629554c4012d0af90dd51aef6637350 Issue-ID: USECASEUI-527
Diffstat (limited to 'usecaseui-portal')
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html4
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html22
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts5
3 files changed, 18 insertions, 13 deletions
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
index 2098cf72..57e08be7 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
@@ -18,9 +18,9 @@
<p>
{{ masktext }}
</p>
- <img src="../../../../../../assets/images/coverageAreaMap.png" class="detail-img"/>
+ <img src="assets/images/coverageAreaMap.png" class="detail-img"/>
</div>
- <img src="../../../../../../assets/images/ask-img.png" alt="" class="detail-icon" *ngIf="item.key === 'coverageAreaNumber'" (mouseover)="detailFn(item.coverflag)" (mouseleave)="detailFn(item.coverflag)" />
+ <img src="assets/images/ask-img.png" alt="" class="detail-icon" *ngIf="item.key === 'coverageAreaNumber'" (mouseover)="detailFn(item.coverflag)" (mouseleave)="detailFn(item.coverflag)" />
</nz-tooltip>
<nz-radio-group [name]="item.key" [(ngModel)]="slicing_order_info[item.key]"
*ngIf="item.type === 'radio'">
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
index aa99279f..c8a02490 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
@@ -41,13 +41,14 @@
<ul class="list-box">
<li>
<p>
- <img src="../../../../../../../assets/images/an-img.png" class="anImg" />
+ <img src="assets/images/an-img.png" class="anImg" alt=""/>
</p>
<p *ngIf="isshowran" class="ran_text">{{rantext}}</p>
<p class="ran_adrress">{{businessDetailInfo.an_ip_adrress}}
- <img src="../../../../../../../assets/images/ask-img.png" alt="" class="detail-icon"
- *ngIf="businessDetailInfo.an_ip_adrress" (mouseover)="detailFn(false,'ran')"
- (mouseleave)="detailFn(false,'ran')" /></p>
+ <img src="assets/images/ask-img.png" alt=""
+ class="detail-icon"
+ *ngIf="businessDetailInfo.an_ip_adrress"
+ (mouseover)="detailFn(false,'ran')" (mouseleave)="detailFn(false,'ran')" /></p>
</li>
<li class="vLan-line">
<p>
@@ -58,7 +59,7 @@
<li>
<p class="fantask">{{ businessDetailInfo.an_nextHop_info }}</p>
<p>
- <img src="../../../../../../../assets/images/tn-edge-img.png" class="tnImg" />
+ <img src="assets/images/tn-edge-img.png" class="tnImg" alt=""/>
</p>
<p>PE</p>
</li>
@@ -73,7 +74,7 @@
<li>
<p class="fantask">{{businessDetailInfo.cn_nextHop_info}}</p>
<p>
- <img src="../../../../../../../assets/images/tn-edge-img.png" class="tnImg" />
+ <img src="assets/images/tn-edge-img.png" class="tnImg" />
</p>
<p>PE</p>
</li>
@@ -85,13 +86,14 @@
</li>
<li>
<p>
- <img src="../../../../../../../assets/images/cn-cloud-img.jpg" class="cnCloud" />
+ <img src="assets/images/cn-cloud-img.jpg" class="cnCloud" alt=""/>
</p>
<p *ngIf="isshowcore" class="cor_text">{{rantext}}</p>
<p class="cn_adrress">{{businessDetailInfo.cn_ip_adrress}}
- <img src="../../../../../../../assets/images/ask-img.png" alt="" class="core_icon"
- *ngIf="businessDetailInfo.cn_ip_adrress" (mouseover)="detailFn(true,'core')"
- (mouseleave)="detailFn(false,'core')" />
+ <img src="assets/images/ask-img.png" alt=""
+ class="core_icon"
+ *ngIf="businessDetailInfo.cn_ip_adrress"
+ (mouseover)="detailFn(true,'core')" (mouseleave)="detailFn(false,'core')" />
</p>
</li>
</ul>
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts
index 310a1cb9..9897f5ab 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts
@@ -50,6 +50,7 @@ export class SubnetParamsModelComponent implements OnInit {
pageSize: number = 2;
recordNum: number = 0;
hasPageNo: number[] = [];
+ loading = false;
objectKeys = Object.keys;
// Comment: Above code
@@ -164,6 +165,7 @@ export class SubnetParamsModelComponent implements OnInit {
pageNo: pageNo,
pageSize: pageSize,
};
+ this.loading = true;
this.http
.getConnectionLinkTable(pageObj, this.getConnetionFailed)
.then((res) => {
@@ -267,9 +269,10 @@ export class SubnetParamsModelComponent implements OnInit {
}
judgeTn(): void {
+ console.log('fprm',this.formData)
if (
this.formData["sliceProfile_TN_resourceSharingLevel"] ===
- "non-shared"
+ "non-shared" || this.formData["sliceProfile_TN_resourceSharingLevel"]==null
) {
//:todo clear??
// this.connectionLinkTable.forEach((item) => {