diff --git a/pages/index/index.vue b/pages/index/index.vue index 8f835e1..647fcc3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1044,10 +1044,14 @@ - + - - 节日特刊 + 端午节 + @@ -1632,7 +1636,7 @@ export default { showMoreFixed:false,// 显示悬浮框 profitSharingList:[],// 分润占比旁边的list // isShowFestival:'labour',// 显示的节日 - isShowFestival:'spring',// 显示的节日 + isShowFestival:'dragonBoat',// 显示的节日 oldSwiperIndex: 0,// 移动swiper 等待1秒钟 如果保持一致就请求 不一致就return showAdvertisement: false,// 是否显示一开始的广告 isShowCloseAnimal: false,// 是否显示关闭动画 diff --git a/pages/nationalPage/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/pages/nationalPage/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js index 216bedb..50e68df 100644 --- a/pages/nationalPage/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js +++ b/pages/nationalPage/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js @@ -252,12 +252,37 @@ const cfu = { let add = Number(((curData/compareData)-1)*100).toFixed(2) if (item.name==='24年'){ if (data){ - return `${curDate}:${data?getMoney(data / 10000,2):''}万元${add>0?',+':add<0?',':''}${add?add+'%':''}${festivalType===1 && index===1?'(清明节)':''}` + return `${curDate}:${data?getMoney(data / 10000,2):''}万元${add>0?',+':add<0?',':''}${add?add+'%':''}${festivalType===1 && index===1?'(劳动节)':''}` }else{ return `${curDate}:` } }else{ - return `${realDate}:${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(清明节)':''}` + return `${realDate}:${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(劳动节)':''}` + } + }else if(type===3){ + let data = opts.series.filter(subItem=> subItem.name === item.name)[0].real[index] + let day = opts.series.filter(subItem=> subItem.name === item.name)[0].howDayNumber + + let festivalType = opts.series[0].selectFestival + console.log('festivalType',festivalType) + console.log('data',data) + console.log('day',day) + let curData = opts.series.filter(subItem=> subItem.name === '24年')[0].real[index] + let compareData = opts.series.filter(subItem=> subItem.name === '23年')[0].real[index] + // 显示具体的日期 + let realDate = opts.series.filter(subItem=> subItem.name === '23年')[0].realDateList[index] + // 显示具体的日期 + let curDate = opts.series.filter(subItem=> subItem.name === '24年')[0].realDateList[index] + + let add = Number(((curData/compareData)-1)*100).toFixed(2) + if (item.name==='24年'){ + if (data){ + return `${curDate}:${data?getMoney(data / 10000,2):''}万元${add>0?',+':add<0?',':''}${add?add+'%':''}${index===3?'(端午节)':''}` + }else{ + return `${curDate}:` + } + }else{ + return `${realDate}:${data?getMoney(data / 10000,2):''}万元${index===1?'(端午节)':''}` } } @@ -285,12 +310,12 @@ const cfu = { let add = Number(((curData/compareData)-1)*100).toFixed(2) if (item.name==='24年'){ if (data){ - return `${festivalType===2?curDate:item.name}:${data?getMoney(data / 10000,2):''}万元${add>0?',+':add<0?',':''}${add?add+'%':''}${festivalType===1 && index===1?'(清明节)':''}` + return `${festivalType===2 || festivalType===3?curDate:item.name}:${data?getMoney(data / 10000,2):''}万元${add>0?',+':add<0?',':''}${add?add+'%':''}${festivalType===1 && index===1?'(清明节)':festivalType===3 && index===3?'(端午节)':''}` }else{ return `${curDate}:` } }else{ - return `${festivalType===2?realDate:item.name}:${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(清明节)':''}` + return `${festivalType===2 || festivalType===3?realDate:item.name}:${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(清明节)':festivalType===3 && index===1?'(端午节)':''}` } }, diff --git a/pages/nationalPage/merchantRevenue.vue b/pages/nationalPage/merchantRevenue.vue index 40ec538..b66a1e5 100644 --- a/pages/nationalPage/merchantRevenue.vue +++ b/pages/nationalPage/merchantRevenue.vue @@ -3,12 +3,12 @@
@@ -47,7 +47,7 @@ @@ -556,6 +556,9 @@ export default { .labourTop{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png"); } + .dragonBoatTop{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png"); + } .top{ width: 100%; height: 324rpx; @@ -574,6 +577,9 @@ export default { .headerlabour{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png"); } + .headerDragonBoat{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png"); + } .header{ position: fixed; width: 100%; @@ -729,6 +735,9 @@ export default { .labourContentTop{ background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%); } + .dragonBoatContentTop{ + background: linear-gradient( 360deg, rgba(225,241,237,0) 0%, #E1F1ED 100%); + } .contentTop{ width: 100%; @@ -854,6 +863,11 @@ export default { color: #D14702; } } + .dragonBoatNav{ + .selectItem { + color: #3E8958!important; + } + } } .sortBox{ diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue index ce65a9b..6b6d977 100644 --- a/pages/nationalPage/rankPage.vue +++ b/pages/nationalPage/rankPage.vue @@ -25,7 +25,7 @@ {{`/统计到${allDateDay || ''}`}} @@ -58,7 +58,7 @@
{{ type===1?'对客销售':type===2?'营业收入':type===3?'入区车流':'' }} {{type===3?'/万辆':'/万元'}} @@ -677,6 +677,9 @@ export default { .labourTop{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png"); } + .dragonBoatTop{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png"); + } .top{ width: 100%; height: 324rpx; @@ -694,6 +697,9 @@ export default { .headerLabour{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png"); } + .headerDragonBoat{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png"); + } .header{ position: fixed; width: 100%; @@ -735,6 +741,9 @@ export default { .labourTitleBox{ background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%); } + .dragonBoatTitleBox{ + background: linear-gradient( 360deg, rgba(225,241,237,0) 0%, #E1F1ED 100%); + } .revenueDetailTitleBox{ width: 100%; height: 90rpx; @@ -862,6 +871,11 @@ export default { color: #D14702!important; } } + .dragonBoatNav{ + .selectItem { + color: #3E8958!important; + } + } } .dateText{ font-size: 24rpx; diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue index f21448a..4f4af2c 100644 --- a/pages/nationalPage/springTravel.vue +++ b/pages/nationalPage/springTravel.vue @@ -43,12 +43,12 @@ ''}" class="festivalImg" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/pageTitle.png': selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmFestival.png': selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourIcon.png': - selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourIcon.png': + selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatTitleIcon.png': ''"/>
@@ -69,7 +69,7 @@ {{`/统计到${allDateDay}`}} /共统计节日数据5天 @@ -129,7 +129,7 @@
@@ -345,7 +345,7 @@ @@ -515,7 +515,7 @@ @@ -564,9 +564,14 @@ - + {{`/统计到${allDateDay || ''}`}} @@ -574,7 +579,7 @@
@@ -592,7 +597,7 @@
对客销售 /万元 @@ -601,13 +606,13 @@ 服务区排名
@@ -631,7 +636,7 @@ @@ -755,7 +760,7 @@
营业收入 /万元 @@ -764,13 +769,13 @@ 服务区排名 @@ -804,7 +809,7 @@ @@ -929,7 +934,7 @@
入区车流 /万辆 @@ -938,13 +943,13 @@ 服务区排名 @@ -963,7 +968,7 @@
入区车流 /万辆 @@ -972,13 +977,13 @@ 服务区排名 @@ -1131,7 +1136,7 @@ export default { entryCarDailyAdd:0,// 每日车流增幅 entryCarDailyNumber:0,// 每日车流增长 - selectFestival: 2,// 选择的节日 + selectFestival: 3,// 选择的节日 festivalList:[{label:'平安春运',value:1},{label:'清明节',value:2},{label:'劳动节',value:3},{label:'端午节',value:4}],// 节日列表 } }, @@ -1189,6 +1194,8 @@ export default { dayNumber = moment().diff("2024-04-03", "days")// 清明 }else if (this.selectFestival===2){ dayNumber = moment().diff("2024-04-30", "days")// 劳动 + }else if (this.selectFestival===3){ + dayNumber = moment().diff("2024-06-07", "days")// 端午 } console.log('dayNumber',dayNumber) if (this.selectFestival===0){ @@ -1212,6 +1219,15 @@ export default { this.lastDay = '2024-05-06' this.allDateDay = '2024-05-06' } + }else if (this.selectFestival===3){ + if (dayNumber<=5){ + this.howDayNumber = dayNumber + }else{ + this.howDayNumber = 5 + this.currentScroll = 'item'+ '2024-06-11' + this.lastDay = '2024-06-11' + this.allDateDay = '2024-06-11' + } } let dateList = [] @@ -1222,6 +1238,8 @@ export default { dateList.push({label:`第${i}天`,value:moment("2024-04-02").add(i, 'days').format("YYYY-MM-DD")}) }else if (this.selectFestival===2){ dateList.push({label:`第${i}天`,value:moment("2024-04-29").add(i, 'days').format("YYYY-MM-DD")}) + }else if (this.selectFestival===3){ + dateList.push({label:`第${i}天`,value:moment("2024-06-06").add(i, 'days').format("YYYY-MM-DD")})// 端午 } // if (i<7){ // dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`}) @@ -1812,6 +1830,9 @@ export default { .labourFestival{ background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png") !important; } + .dragonBoat{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png") !important; + } .top{ width: 100%; height: 432rpx; @@ -1833,6 +1854,9 @@ export default { .headerLabour{ background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png") !important; } + .headerDragonBoat{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png") !important; + } .header{ position: fixed; width: 100%; @@ -1971,7 +1995,10 @@ export default { background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%); } .labourTop{ - background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%); + background: linear-gradient(360deg, rgba(255,236,208,0) 0%, #FFECD0 100%); + } + .dragonBoatTop{ + background: linear-gradient(360deg, rgba(191,230,220,0) 0%, #BFE6DC 100%); } .overAllDataTop{ width: 100%; @@ -2231,6 +2258,9 @@ export default { .labourLeftBox{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo1.png"); } + .dragonBoatLeftBox{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo1.png"); + } .leftBox{ left: 0;top: 0; //background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/leftRed.png"); @@ -2272,6 +2302,15 @@ export default { color: #E17900!important; } } + .dragonBoatRightBox{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo2.png"); + .value{ + color: #2F7F4B!important; + } + .label{ + color: #2F7F4B!important; + } + } .rightBox{ right: 0;top: 0; @@ -2303,6 +2342,9 @@ export default { .labourRevenueLeft{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo3.png"); } + .dragonBoatRevenueLeft{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo3.png"); + } .revenueRight{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueRight.png"); .value{ @@ -2330,6 +2372,15 @@ export default { color: #F0490E; } } + .dragonBoatRevenueRight{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo4.png"); + .value{ + color: #6F8A14; + } + .label{ + color: #6F8A14; + } + } .carLeft{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carLeft.png"); } @@ -2339,6 +2390,9 @@ export default { .labourCarLeft{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo5.png"); } + .dragonBoatCarLeft{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo5.png"); + } .carRight{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carRight.png"); .value{ @@ -2366,6 +2420,15 @@ export default { color: #A59301; } } + .dragonBoatCarRight{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo6.png"); + .value{ + color: #218794; + } + .label{ + color: #218794; + } + } } .otherListBox{ diff --git a/pages/nationalPage/testPage.vue b/pages/nationalPage/testPage.vue index a715031..e4fd44b 100644 --- a/pages/nationalPage/testPage.vue +++ b/pages/nationalPage/testPage.vue @@ -36,7 +36,11 @@
-
+
@@ -55,7 +59,7 @@
@@ -63,7 +67,7 @@
@@ -86,7 +90,7 @@
@@ -109,7 +113,7 @@
@@ -132,7 +136,7 @@
@@ -310,7 +314,7 @@ export default { dateList.push(`第${i}天`) } for(let i = 1;i<=5;i++){ - dateList2.push(i) + dateList2.push(`第${i}天`) } } @@ -389,7 +393,7 @@ export default { howDayNumber:this.howDayNumber, selectFestival: this.selectFestival, // realDateList: ['2023-04-28','2023-04-29','2023-04-30','2023-05-01','2023-05-02','2023-05-03','2023-05-04']//劳动节 - realDateList: ['2024-06-21','2024-06-22','2024-06-23','2024-06-24','2024-06-25'] + realDateList: ['2023-06-21','2023-06-22','2023-06-23','2023-06-24','2023-06-25'] }, ], max:Number(max.toFixed(2)), @@ -416,7 +420,7 @@ export default { howDayNumber:this.howDayNumber, selectFestival: this.selectFestival, // realDateList: ['2023-04-28','2023-04-29','2023-04-30','2023-05-01','2023-05-02','2023-05-03','2023-05-04']//劳动节 - realDateList: ['2024-06-21','2024-06-22','2024-06-23','2024-06-24','2024-06-25'] + realDateList: ['2023-06-21','2023-06-22','2023-06-23','2023-06-24','2023-06-25'] }, ], max:Number(max.toFixed(2)), @@ -623,6 +627,9 @@ export default { .labourBox{ background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%); } + .dragonBoatBox{ + background: linear-gradient( 360deg, rgba(225,241,237,0) 0%, #E1F1ED 100%); + } .boxBg{ z-index: 1; position: absolute; @@ -676,6 +683,9 @@ export default { .labourBox{ background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%); } + .dragonBoatBox{ + background: linear-gradient( 360deg, rgba(225,241,237,0) 0%, #E1F1ED 100%); + } .boxBg{ z-index: 1; position: absolute; @@ -752,6 +762,9 @@ export default { .labourLeftBox{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo1.png"); } + .dragonBoatLeftBox{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo1.png"); + } .rightBox{ right: 0;top: 0; background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rightPink.png"); @@ -794,6 +807,15 @@ export default { color: #E17900!important; } } + .dragonBoatRightBox{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo2.png"); + .value{ + color: #2F7F4B!important; + } + .label{ + color: #2F7F4B!important; + } + } .revenueLeft{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueLeft.png"); } @@ -803,6 +825,9 @@ export default { .labourRevenueLeft{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo3.png"); } + .dragonBoatRevenueLeft{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo3.png"); + } .revenueRight{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueRight.png"); .value{ @@ -830,6 +855,15 @@ export default { color: #F0490E; } } + .dragonBoatRevenueRight{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo4.png"); + .value{ + color: #6F8A14; + } + .label{ + color: #6F8A14; + } + } .carLeft{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carLeft.png"); } @@ -839,6 +873,9 @@ export default { .labourCarLeft{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo5.png"); } + .dragonBoatCarLeft{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo5.png"); + } .carRight{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carRight.png"); .value{ @@ -866,6 +903,15 @@ export default { color: #A59301; } } + .dragonBoatCarRight{ + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo6.png"); + .value{ + color: #218794; + } + .label{ + color: #218794; + } + } } } }