From afdfb9cdbf08e12254eff4611e74620c785f4069 Mon Sep 17 00:00:00 2001 From: wangyuerg Date: Wed, 10 Mar 2021 14:25:53 +0800 Subject: [PATCH] feat:modify style Signed-off-by: wangyuerg Change-Id: I70efd97fb18f3afb8e82014663df0c185a6d026c Issue-ID: USECASEUI-527 --- .../src/app/mock/json/getSlicingBusinessDetail.json | 3 ++- .../slicing-business-model.component.html | 14 +++++++------- .../slicing-business-model.component.less | 19 ++++++++++++------- .../slicing-business-model.component.ts | 1 + usecaseui-portal/src/assets/images/tn-edge-img.png | Bin 1861 -> 3066 bytes 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json index 134f85c5..32167b65 100644 --- a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json +++ b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json @@ -54,7 +54,8 @@ "linkType":"p2p/mp2p", "tnEndVersion":"10.1.1.1", "cnVlan":"11", - "cnVersion":"1.1.2.3" + "cnVersion":"1.1.2.3", + "orchestration_status":"active" } } } \ No newline at end of file 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 951e5096..3944f967 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 @@ -29,7 +29,7 @@ -
status:{{status}}
+
@@ -49,21 +49,21 @@

vLan:{{businessDetailInfo.vLanText}}

-

+

  • {{businessDetailInfo.tnVersion}}

    -

    TN EDGEText
    Gateway

    +

    PE

  • -

    {{businessDetailInfo.mbps}} Mbps/yyyG

    +

    {{businessDetailInfo.mbps}} Mbps

    {{businessDetailInfo.msText}} ms

    -

    +

    Link Type:{{businessDetailInfo.linkType}}

  • @@ -71,13 +71,13 @@

    -

    TN EDGEText
    Gateway

    +

    PE

  • vLan:{{businessDetailInfo.cnVlan}}

    -

    +

  • diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less index 21c68524..38e20a72 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less @@ -6,16 +6,17 @@ a{ } .header{ display: flex; - justify-content: space-around; + justify-content: space-between; align-items: center; height: 40px; line-height: 40px; color:#000; - margin:10px 20px; + margin:10px 102px; } .anImg{ width: 65px; height: auto; + margin-top: 20px; } .list-box{ display: flex; @@ -36,21 +37,23 @@ a{ background: #000; } .online-type{ - width: 200px; + width: 180px; height: 3px; - background: #6a9bd0; + background: #1DA57A; + margin: 0 5px; } .offline-type{ - width: 200px; + width: 180px; height: 3px; background: #7e848a; + margin: 0 5px; } .vLan-line{ text-align: center; top:-20px; } .tnImg{ - width: 85px; + width: 65px; height:auto; } .three-box{ @@ -58,6 +61,8 @@ a{ top:-20px; } .cnCloud{ - width: 90px; + margin-left:10px; + width: 88px; height: auto; + margin-top: 20px; } \ No newline at end of file diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts index 0072378a..2d97dc3f 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts @@ -28,6 +28,7 @@ export class SlicingBusinessModelComponent implements OnInit { businessDetailInfo : any = {} ngOnInit() { this.status = this.outerData.orchestration_status + console.log('status',this.status) this.getDetail() } diff --git a/usecaseui-portal/src/assets/images/tn-edge-img.png b/usecaseui-portal/src/assets/images/tn-edge-img.png index c4093e30c4f328ed7117a2901ccbc32ac85a9afe..4ca6d1c3f3025d4cf9dac73d38887aef342800f0 100644 GIT binary patch literal 3066 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 IM6N<$g5I}E!2kdN literal 1861 zcmV-L2fFx)P)Csq*us61 zg@%?Q6$K^4q>({hz@!0D1JWn3>IZN^a@W_h^F8<6uk-&Qw^cTiYW_KQK6XX~008J) z-#tEwi2Rs(L#A>YE+X>V$B!vD1&HGQ{CxlO(al?V`2KTI@viS4p9mI~+@GJz(aqb| z|CW8cOj=mvrfpZaBALg_q=hwOqII&0*G<`du!M`sHDf*cXE<6Xi+B&B1u8dX!gfg- zFVVu95YakO<7HV4YnCjFheU~&2@8utPT4l<@p8r()@VoTsKm>)Sy&V+S|>=n2eA?? z4A4BD9b<94EQ?`H>5TqqJ=fhZ}sG2FkY_B!kT8Rv5#fP>Wr5O z3yX4E77saymuO*4uFK*f`*?{K7L_zdIJE= zL%cwth!-dn@dAY+UZ7CK3lu7g2hincvt8|fzTVv?+!CN2@wV{8b^rYN%U2N*`SAWz zicJCzuxuW|g)1U*ae0<-OMqv@3lxfY8=6aIf9g6+U*v#zJ!8Uk2pFjm?{`ze1#&>V zav1JdOkbo#ye+0oT>?fb=Hq3#j8d78Hw30HQZRdmRp^O(ae2nwSBQ$qE8&*POkl)B zyg;E$#yj`Y&=^c##A520H`bYDj(-t@$;m6Ce@Tc53~grO)m$ofAz)}S6E9F36Y=^} z_w$#pQSYK+`a(PtobQy)_Y#N{J|R&~6-zHpky#GyYQ z&`|ZV8K@cYq8BIp@UMxbu z=@2g#V+yB1ya&I~<(5%h#2XnmJ0KL|Rc1L>zDcEvcomEd*1~&{ z+%lSo!z126x`MS3=on1l@Q7Cl(H>$7hsC9$z+yk(u0&i94ui=X2*FOn6kd+Wi=>#s z^ARtSBj9<67bq0Ryhw^;-ualkNQQ8iAzmawxXZC@MpQ%_4wDzr5N=pZ-o(c4(3+Q1 z#=Z(hWZumvM5}{%6PU9zyI-@}u7cmqrTL`+!qvmFIie5mKP}#wuXne_1X0R%mWp^I z2oY`DXP%xM%jwB+kk1RbEZ6w+;t=sF)7**O`-gK1m}ui6UPUo>Wd8-?sS$2m#H%Fs zj+}b>5^j8)ZB`I_N506I|<889^ghHMnZ9{d}d6!OG%^MxG zu)?sZs>$266UUsou_rv?+EvBmZQFsTOiy=vVJNZQh!^517bsWplXq#jTC^uH6Bk9t z8!}vtuhwY=oa3+-hVPhsL%AL@7&{H?LRllR8+iertH8| zrk2Jfql?S47hf9aTdEIjE8(JucvDRtjez~noBHh^f`u>Zctao8=CXS~hc56&Np@cv&U`(`31979m_)kB@FTnr1`ehrh2m#L#@}0fNTQ--9y7&QeBC8v3GO#E6ctv!+ zs#h{Xg-9XsI<-z=7h~6xH;5H&ii%fc*%Zz_g50+cdCB^ORUa-X!MbAObvPpptBQ|T zgn(gF74eD?Fzl%&UXkbHU{3tNf~w;6F@;gPYU6dwXr?e~Rc*W?&)0+r7&R*HCXKmj z2sqY*`TBkzjdwa>yodFb-2DF2D-lES*1&%ispjpWV?VowzYt6Du)Y!z*@r7q`Lel2 zxlBI7jmJ$}KU@*wEmq32>4Y1Pzf5l0|I5GL{rwbgldx2b<#U_b!u|8-U*zcKZR*W< zp)Xh;$GnB(JI?iJJFe}+vbj+Hv2Uy;bZt{NCtb(2eVDuja{x+38^7mDyoQo>>FYUZDHzaUn&Y6 ztdC`LMRK|O3g65*gFFTCRwh)y7N)MIP{*}>IOeU?lC#f*JD=tD@rmb(kq3gRxmd!A$q-X&EKnni@ui+bD(}*`G00000NkvXXu0mjf+0>IU -- 2.16.6