From 569b17fbbdc500b66cfe9aba202717a15f433160 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Tue, 26 Sep 2023 18:30:55 +0800 Subject: [PATCH] update --- pages.json | 12 + pages/index/index.vue | 147 ++++- pages/nationalPage/index.vue | 598 +++++++++++++++++++ static/public/fontNational/qL6Y7kMqM7Kt.woff | Bin 0 -> 4092 bytes static/public/fontNational/stylesheet.css | 8 + 5 files changed, 763 insertions(+), 2 deletions(-) create mode 100644 pages/nationalPage/index.vue create mode 100644 static/public/fontNational/qL6Y7kMqM7Kt.woff create mode 100644 static/public/fontNational/stylesheet.css diff --git a/pages.json b/pages.json index 1323756..c85d005 100644 --- a/pages.json +++ b/pages.json @@ -82,6 +82,18 @@ } ] }, + { + "root": "pages/nationalPage", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + } + ] + }, { "root": "pages/revenue", "pages": [ diff --git a/pages/index/index.vue b/pages/index/index.vue index 9507d87..c3e1369 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -380,6 +380,29 @@ +
+
+
+ +
+ +
+ 欢度国庆 + +
+
+
+ +
+
+

{{item.value || '-'}}

+

{{item.title}}{{item.unit}}

+ +
+
+
+
+ @@ -749,6 +772,11 @@ export default { popupType:'center', popupShow:false, popup:true, + nationalDayList:[ + {title:'当日营收',unit:'/万元',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/revenueBg.svg'}, + {title:'当日车流',unit:'/辆',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/carIcon.svg'}, + {title:'车流增幅Top1',unit:'',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/add.png'}, + ], tabTypeList:[ { imgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg', path: '/pages/commercialBI/carPortrait', name: '车流'}, { imgUrl: '/static/images/index/guest.svg', path: '/pages/commercialBI/guestPortrait', name: '客群' }, @@ -1023,7 +1051,21 @@ export default { }, methods:{ ...mapActions(['memberLogin','getLoginCode']), - + // 拿到国庆数据 + async handleGetNationalData(){ + let req = { + pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000', + StatisticsEndDate:this.lastDay, + ShowGrowthRate:true + } + const data = await request.$webGet('CommercialApi/BigData/GetBayonetGrowthAnalysis',req) + this.nationalDayList[1].value = data.Result_Data.sumEntryCount?this.$util.noDecimal(data.Result_Data.sumEntryCount):'' + this.nationalDayList[2].value = data.Result_Data.GrowthList[0].Entry_GrowthRate>0?'+' + data.Result_Data.GrowthList[0].Entry_GrowthRate + '%':'-' + data.Result_Data.GrowthList[0].Entry_GrowthRate + '%' + console.log('拿到国庆数据data',data) + }, + goToNational(){ + this.$util.toNextRoute('navigateTo', `/pages/nationalPage/index?time=${this.lastDay}`) + }, handleShowTrafficDetail(){ this.showMonthDetail = !this.showMonthDetail }, @@ -1222,6 +1264,8 @@ export default { this.handleGetDailyPatrol() // 获取全省平均车流量 this.handleGetAllCarTraffic() + // 国庆数据 + this.handleGetNationalData() } else if (this.user.Membership_Id){ // 默认 // 不是从推送进来 走正常的请求方法 // if (!this.PushAuthority){return} @@ -1246,6 +1290,8 @@ export default { this.handleGetDailyPatrol() // 获取全省平均车流量 this.handleGetAllCarTraffic() + // 国庆数据 + this.handleGetNationalData() } // 老代码 不知道干啥用的 @@ -1663,9 +1709,11 @@ export default { if (str==='first'){ this.yesObj = result.RevenuePushModel + if (this.yesObj){ let indexYes = (result.RevenuePushModel.CashPay / 10000).toString().indexOf('.') this.yesObj.CashPay = (result.RevenuePushModel.CashPay / 10000).toString().substring(0,indexYes+3) + this.nationalDayList[0].value = this.$util.fmoney(this.yesObj.CashPay,2) } if (result.GrowthRate){ this.yesObjCompared = result.GrowthRate @@ -1876,7 +1924,6 @@ export default { let index1= (this.showTableData.CashPay / 10000).toString().indexOf('.') this.showTableData.CashPayChange = (this.showTableData.CashPay / 10000).toString().substring(0,index1+3) - // for (let key in this.showTableData){ // if (this.showTableData[key]){ // // 在有值的前提下 @@ -3510,6 +3557,102 @@ $iphoneHeight: env(safe-area-inset-bottom); } } + .nationalDay{ + width: calc(100% - 64rpx); + height: 286rpx; + margin-left: 32rpx; + border-radius: 16rpx; + background: linear-gradient(135deg, rgba(255, 238, 232, 1) 0%, rgba(255, 238, 231, 1) 79%, rgba(255, 221, 215, 1) 100%); + //background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/indexBg.svg"); + //background-repeat: no-repeat; + //background-size: 100% 100%; + .national{ + box-sizing: border-box; + padding: 0 24rpx 24rpx; + width: 100%; + height: 100%; + .nationalTop{ + width: 100%; + display: flex; + align-items: center; + .lanternImg{ + width: 104rpx; + height: 126rpx; + margin-left: 8rpx; + } + .titleBox{ + width: 300rpx; + height: 60rpx; + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/titleBox.svg"); + background-repeat: no-repeat; + background-size: contain; + padding-left: 36rpx; + box-sizing: border-box; + display: flex; + transform: translateX(-30px); + align-items: center; + .title{ + display: flex; + align-items: center; + .text{ + font-size: 32rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 600; + color: #E93113; + line-height: 44rpx; + } + .rightIcon{ + width: 32rpx; + height: 32rpx; + margin-left: 16rpx; + } + } + } + } + .nationalContent{ + width: 100%; + display: flex; + justify-content: space-between; + .itemContent{ + width: calc((100% - 32rpx)/3); + box-sizing: border-box; + padding: 24rpx 16rpx; + background: #FFFAF7; + box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(162,4,4,0.1); + border-radius: 12rpx; + border: 2rpx solid #FFFFFF; + overflow: hidden; + position: relative; + .itemBg{ + position: absolute; + bottom: 0;right: 0; + width: 100rpx; + height: 100rpx; + } + .value{ + font-size: 32rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #E23038; + line-height: 40rpx; + margin-bottom: 8rpx; + } + .title{ + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 500; + color: rgba(120, 107, 108, 1); + line-height: 36rpx; + span{ + margin-left: 4rpx; + } + } + } + } + } + + } + .otherFunBox{ width: 100%; box-sizing: border-box; diff --git a/pages/nationalPage/index.vue b/pages/nationalPage/index.vue new file mode 100644 index 0000000..036ce27 --- /dev/null +++ b/pages/nationalPage/index.vue @@ -0,0 +1,598 @@ + + + + + + + diff --git a/static/public/fontNational/qL6Y7kMqM7Kt.woff b/static/public/fontNational/qL6Y7kMqM7Kt.woff new file mode 100644 index 0000000000000000000000000000000000000000..12ed61cce4d4eb905ec841cc945d445c7fff4cd9 GIT binary patch literal 4092 zcmZvfcTkf})b^7A0Zl-vbO=b57D5vNiGWl?uhK$@%g^@zjtST_w04e&N;hh?lZINrK75p$nQI%)M6Ey=PC8C#3)F>iWjHQf0ItF40 zqPIoVkBOkI?;mzPb+K^;0HBgYjVCh95ZYnuU}s}X^csm;iik8XitmvF(Ik3%M9oHo zhdc{(<>2D!4FFI=iTZC2TXT1ExQmT9F&?D_QG@@3Sr_o!#>I~45o3ak0RYlGAu(BT z*B2h1#PhZi*U%AxUFQN2ul~z%Yn-S#iSU4&X&GMqm*dvoynplj-6z01>z%QmDT5J< zB7XRd&4v$fy|c~rH6%FlCU+!L;=Wy=rJ&@EE_(W2A($r_gVdC#1cQL0#uU65)Ejq! z{1Wd+&nqG{hHyQ_uW0zLL$Z_e`%an)&&TW8TJ%_@bsNkcrlLfpUZkL=2DIO_-tzN<2W zY$U%SAGs-|rmCVE>WB$3)52hPhAsZ&^~%oRn({Y#6Zi75T4q*_SV6?G%COAB{^sVw z?X_cp0I!BonazwL=O)}~U(*LAj{(B9X`&17dhrJRyW2loLA8BPoJFQU*G846OMMyH zeOC>L2k&jM{!Ug`t%zr4eVjFg3enIz8n*Ipw6U(%&1=ohuI#%$K{J!eb=j|46n-5= zF5IdS_ByJ^rJXw;w0((k9Tg}{GWDV}DQ87<`$@g}s(rwv$~fY{v%-@g%xfQxXB|Ur za5S4*IQhKsMQt1XWLbH#<&*8T{zVURslG>D6A~A))3NZPcBlBL$5M+-&FWYe+u?NV zZozPn`fE@YEcin%W%u-Hh8yEx3Wp%ukQjj#r^Z}}Rhdo;fM&F>Fi-dzT{^%O@l z4q`_r?gicX{EEx&z66X~J=fxAX&N(){sRwm$J9ElaVTAJhEZ+%Qr=-w;~pn7p1f`4SD>wliLP~STF;*7Frg3wvZcC zN|CnpY-_ZTxeZNziJbWT!=c&c#o<-lKm8MDBAhd=*V2usP@rtQ@mXC6p>4Ujtb{*J z?3*00wd_IBsR6=1R!B2>^o3)kT)Vwa7w~67L0R{5T0%;cD@_HHb0MzQeZ!VP$K}&p zT7dfW64MajR@abTh3BkR{Snt|hkh+6RIT&fyFZoZtJ!~;-5*iVcOUn2s6TIayZmR< zCSC#5 z6&9EGp&nr;wkIk2i4`10#YsqB?jYU$a=E-4o{f6#>a|00i zk*32v5vGA&3}sSewU zxMXxvj9^UMXVvC>^O+yIB^3*fJv1e2JuFhWS6h1-0>wRP1Yu!yI=%`mKFu>xNHaVJ zDVd8pxerl|+T-(HX`v3Zs-q?G{#q__Y%U2=3sf7gBo!&}(-D{k z+#gbxA{9@&Ji3C#*oB1VKQpEFV!Q4972iCMmussVgv%k{?-r!Sq;(oXc6>S5eI?ny zLb~d72~_18sW57JxTfH1fh`iz+0A<=$QOj?kCaOW%O~(W>J6o}tIOi3zz0kN4?=64 zfkQC;sT365cmSRq#b4k@N4V|L`(NCPAwCBmeF)v{M?43*z;l5> zj#$ZgXY0Nv)o|Ux5GAXDzHV`SA^O9P_;=mua8MG;<%{?Xz=pmjZ+*6~4JO^` zx*8;TTwLz(FfsF6Ds!#~&USY8N5BSFJ}$dFG3luM-BvQS z0^Tbs!w=8+hUHA-N6XGS?+O%De%xnKd|nkQ-NkEViR_x1=%ZJzPx_fSm*mc8*M=s2 z(FfP|u{%nfi^4|v@Sff4=>kPxt@SUcaR#KeDwbfY%$`7L%F!yvYM7UPc7APQD*3=d zQmE+o$2ioXi6FQ}i+@3p+k^7Of zNw1bg-K%n#Aq2BkQg99G9i_L&TG<6PB|K7mclA;PPGi+mR$7!Tvhbv#E;9b1^@v5H zS;ArTv}?=J=*Bs>zgFclAur?4ky|K}JZI$<-ZhoWm7siD!Z`}Us6>x zloVbII^D)^K0IdoI{hK;3JA4tTwDbGB%j812JWJuP13pt^0Db%5y zojBH4(Lq$1gWb(gFC$}ec9W_?s?i?u;8kz-S}!XP&&l^va7riksV%zt9_|$Z2YX6Q z&SbI|?q`3kpB`F_ za`cL5=jq19v;B!PYi;~DQ@MYHhB#D|*xxhhg?|YV@EKA0_ zLWpzI6RRFuX{s#uC`wJ(Ip5acoLNXS4n&?^v;)E97zyIIsK&cWt$8W z2>bLFC_KOUwCP+fe(tlmxDrqAVI9JI^$o(Ve~KvFj+)SyrBOV&&K~#U06^`5WYN0FgPfvi&aVDqd1fJ z1qMkL&8E&~t!AwjN(L>V88A%T$GQIFLCJMfXFpDmCO~A4}(iN*i;$KE`{UV{&jP48~Tnn7}3uy`GXZ& zzyG1^s1zlCeXXc_OWoyxxYM=bRmahF^2?~1lJ~M5iC(y!?p4SFBUX4;;^&NT_M5i` z544*tF7wgKIpnjCR6qbKHu=Q=tq@4Fi*XK_6VpT-&8v z!^y?rh$;zqkP0ySAF7!DUk74c9~|x8ivQ>LHD$OhATkf20VvA{=Mm54-xc3&+X?%0 z5xgQ|AdY7<;Kj4W`_YBJ094siBNF^}8Eycww~hoZgi zu&%~lP6j?O+SBp5mN+qAox-7}s3&gcs%$ai_=*J{WhXuRL8*U3LhQ_a3ahwIi$%29b$poL2qVl)s@m|_&+;#L ziH;dzUMI}kKeL48yUt|Q>#q*9K%_l~yZOg3OE{2;Tga>iQypJ|ttXq0X)P<`VRJ_5 zOVKA%=e}M#605~GOBG^D^!r}wm+IzkVaQfng=l7MXvEShO zq@oi4=#>f}KFV76o4wJyP-YMNmO5urwf)OUcJStX*P^(Qmd=+sXA9ykX5}G9_kVxN z&#j~_)S6aG!X&u=q|a;;>vBUy9uAY=AUVd$}a&(9peQh{epg`!nP4 zT6Kvla@<<>sJUV>d)MeXupd7hWuÔ$_0dA<Yt?=7-bZlo*)sT0 z1Z$qpaoBMgMB?%IlMG{$N3rS&YR~+`+5rd^^L>}4(w*PR@bO#r;ZsI&m9NAX_}@On z0`S)!OwmkL0Ki>5aN<9Y9*w@(k0UnlI=%8hfE<__ZHoj)1H30l|6kw0*onWUBmnq7 DJBVJ` literal 0 HcmV?d00001 diff --git a/static/public/fontNational/stylesheet.css b/static/public/fontNational/stylesheet.css new file mode 100644 index 0000000..8a28f97 --- /dev/null +++ b/static/public/fontNational/stylesheet.css @@ -0,0 +1,8 @@ +@font-face { + font-family: 'Alimama ShuHeiTi'; + src:url("/static/public/fontNational/qL6Y7kMqM7Kt.woff"); + font-weight: bold; + font-style: normal; + font-display: swap; +} +