From 13c5e01fa08691cab7998375b144680fb056a104 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Thu, 6 Jun 2024 18:41:47 +0800
Subject: [PATCH] update

---
 pages/nationalPage/merchantRevenue.vue |  46 ++++-
 pages/nationalPage/rankPage.vue        |  51 ++++-
 pages/nationalPage/springTravel.vue    | 257 ++++++++++++++++++++-----
 pages/nationalPage/testPage.vue        | 168 ++++++++++++++--
 4 files changed, 450 insertions(+), 72 deletions(-)

diff --git a/pages/nationalPage/merchantRevenue.vue b/pages/nationalPage/merchantRevenue.vue
index e172d96..40ec538 100644
--- a/pages/nationalPage/merchantRevenue.vue
+++ b/pages/nationalPage/merchantRevenue.vue
@@ -1,7 +1,15 @@
 <template>
   <div class="main">
-    <div :class="selectFestival===0?'top springTop':selectFestival===1?'top qmTop':selectFestival===2?'top labourTop':''">
-      <div :class="selectFestival===0?'header headerSpring':selectFestival===1?'header headerQm':selectFestival===2?'header headerlabour':''" :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
+    <div :class="selectFestival===0?'top springTop':
+    selectFestival===1?'top qmTop':
+    selectFestival===2?'top labourTop':
+    selectFestival===2?'top dragonBoatTop':
+    ''">
+      <div :class="selectFestival===0?'header headerSpring':
+      selectFestival===1?'header headerQm':
+      selectFestival===2?'header headerlabour':
+      selectFestival===2?'header headerDragonBoat':
+      ''" :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
         <image :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>
 <!--        <img :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="detailIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverPartDetail.png">-->
         <div v-if="showSpring" class="picker" @click="handleGoMap">
@@ -28,11 +36,19 @@
 <!--      </scroll-view>-->
     </div>
     <div class="contentPage">
-      <div :class="selectFestival===0?'contentTop springContentTop':selectFestival===1?'contentTop qmContentTop':selectFestival===2?'contentTop labourContentTop':''">
+      <div :class="selectFestival===0?'contentTop springContentTop':
+      selectFestival===1?'contentTop qmContentTop':
+      selectFestival===2?'contentTop labourContentTop':
+      selectFestival===3?'contentTop dragonBoatContentTop':
+      ''">
         <div class="content">
           <div class="left">
 <!--            <img class="detailLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png"/>-->
-            <img class="detailLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmServicepartDetail.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourServerPartDetail.png':''"/>
+            <img class="detailLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png':
+            selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmServicepartDetail.png':
+            selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourServerPartDetail.png':
+            selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourServerPartDetail.png':
+            ''"/>
             <!--          <text class="modalUnit">{{selectDateText || ''}}</text>-->
             <!--          <text class="modalUnit">{{`/统计到${allDateDay || ''}`}}</text>-->
           </div>
@@ -49,7 +65,11 @@
           <!--            <div class="allBox">-->
           <!--              <div :class="currentScroll==='all'?'scrollItem selectItem':'scrollItem'" @click="handleChangeTime('all')">累计</div>-->
           <!--            </div>-->
-          <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':selectFestival===1?'navList qmNav':selectFestival===2?'navList labourNav':''"  :scrollIntoView="currentScroll" :scroll-with-animation="true">
+          <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':
+          selectFestival===1?'navList qmNav':
+          selectFestival===2?'navList labourNav':
+          selectFestival===3?'navList dragonBoatNav':
+          ''"  :scrollIntoView="currentScroll" :scroll-with-animation="true">
             <div :class="currentScroll==='item'+item.value?'scrollItem selectItem':'scrollItem'" v-for="(item,index) in scrollList" :key="index" :id="'item'+item.value" @click="handleChangeTime(item.value)">{{item.label}}</div>
           </scroll-view>
         </div>
@@ -201,6 +221,8 @@ export default {
       this.currentScroll = 'item'+  this.lastDay
     }else if (this.selectFestival===2){
       this.currentScroll = 'item'+ this.lastDay
+    }else if (this.selectFestival===3){
+      this.currentScroll = 'item'+ this.lastDay
     }
 
 
@@ -241,7 +263,17 @@ export default {
         this.lastDay = '2024-05-06'
         this.allDateDay = '2024-05-06'
       }
+    }else if (this.selectFestival===3){
+      dayNumber = moment().diff("2024-06-07", "days")
+      if (dayNumber<=5){
+        this.howDayNumber = dayNumber
+      }else{
+        this.howDayNumber = 5
+        this.currentScroll = 'item'+ '2024-06-11'
+        this.allDateDay = '2024-06-11'
+      }
     }
+
     let dateList = []
     for (let i = 1;i<=this.howDayNumber;i++){
       if (this.selectFestival===0){
@@ -250,6 +282,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}`})
@@ -298,7 +332,7 @@ export default {
         pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
         curYear: this.curYear,
         compareYear: this.compareYear,
-        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
+        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:this.selectFestival===3?5:'',
         StatisticsDate: time,
         ServerpartId: this.springService.Serverpart_ID || this.ServerpartId,
         SortStr:`${this.type===1?'revenue':this.type===2?'account':this.type===3?'bayonet':''} ${this.sortType===0?'asc':'desc'}`,
diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue
index 4f9ebbd..ce65a9b 100644
--- a/pages/nationalPage/rankPage.vue
+++ b/pages/nationalPage/rankPage.vue
@@ -1,16 +1,32 @@
 <template>
   <div class="main">
-    <div :class="selectFestival===0?'top springTop':selectFestival===1?'top qmTop':selectFestival===2?'top labourTop':''">
-      <div :class="selectFestival===0?'header headerSpring':selectFestival===1?'header headerQm':selectFestival===2?'header headerLabour':'' " :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
+    <div :class="selectFestival===0?'top springTop':
+    selectFestival===1?'top qmTop':
+    selectFestival===2?'top labourTop':
+    selectFestival===3?'top dragonBoatTop':
+    ''">
+      <div :class="selectFestival===0?'header headerSpring':
+      selectFestival===1?'header headerQm':
+      selectFestival===2?'header headerLabour':
+      selectFestival===3?'header headerDragonBoat':
+      '' " :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
         <image :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>
       </div>
     </div>
 
     <div class="contentPage">
       <div class="revenueDetail">
-        <div :class="selectFestival===0?'revenueDetailTitleBox springTitleBox':selectFestival===1?'revenueDetailTitleBox qmTitleBox':selectFestival===2?'revenueDetailTitleBox labourTitleBox':''">
+        <div :class="selectFestival===0?'revenueDetailTitleBox springTitleBox':
+        selectFestival===1?'revenueDetailTitleBox qmTitleBox':
+        selectFestival===2?'revenueDetailTitleBox labourTitleBox':
+        selectFestival===3?'revenueDetailTitleBox dragonBoatTitleBox':
+        ''">
           <div class="left">
-            <img class="detailLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmServicepartDetail.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourServerPartDetail.png':''"/>
+            <img class="detailLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png':
+            selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmServicepartDetail.png':
+            selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourServerPartDetail.png':
+            selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourServerPartDetail.png':
+            ''"/>
             <!--          <text class="modalUnit">{{selectDateText || ''}}</text>-->
             <text class="modalUnit">{{`/统计到${allDateDay || ''}`}}</text>
           </div>
@@ -27,7 +43,11 @@
 <!--            <div class="allBox">-->
 <!--              <div :class="currentScroll==='all'?'scrollItem selectItem':'scrollItem'" @click="handleChangeTime('all')">累计</div>-->
 <!--            </div>-->
-            <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':selectFestival===1?'navList qmNav':selectFestival===2?'navList labourNav':''" :scrollIntoView="currentScroll" :scroll-with-animation="true">
+            <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':
+            selectFestival===1?'navList qmNav':
+            selectFestival===2?'navList labourNav':
+            selectFestival===3?'navList dragonBoatNav':
+            ''" :scrollIntoView="currentScroll" :scroll-with-animation="true">
               <div :class="currentScroll==='item'+item.value?'scrollItem selectItem':'scrollItem'" v-for="(item,index) in scrollList" :key="index" :id="'item'+item.value" @click="handleChangeTime(item.value)">{{item.label}}</div>
             </scroll-view>
           </div>
@@ -35,7 +55,11 @@
           <div class="modalBox">
             <div class="modalTitleBox">
               <div class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
-                <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#D14702':''}"></div>
+                <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':
+                selectFestival===1?'#3B9285':
+                selectFestival===2?'#D14702':
+                selectFestival===3?'#D14702':
+                ''}"></div>
                 <text class="modalText">{{ type===1?'对客销售':type===2?'营业收入':type===3?'入区车流':'' }}</text>
                 <text class="modalUnit">{{type===3?'/万辆':'/万元'}}</text>
               </div>
@@ -246,6 +270,8 @@ export default {
       this.currentScroll = 'item'+ this.lastDay
     }else if (this.selectFestival===2){
       this.currentScroll = 'item'+ this.lastDay
+    }else if (this.selectFestival===3){
+      this.currentScroll = 'item'+ this.lastDay
     }
 
 
@@ -292,6 +318,15 @@ export default {
         this.lastDay = '2024-05-06'
         this.allDateDay = '2024-05-06'
       }
+    }else if(this.selectFestival===3){
+      dayNumber = moment().diff("2024-06-07", "days")
+      if (dayNumber<=5){
+        this.howDayNumber = dayNumber
+      }else{
+        this.howDayNumber = 5
+        this.currentScroll = 'item'+ '2024-06-11'
+        this.allDateDay = '2024-06-11'
+      }
     }
     let dateList = []
     for (let i = 1;i<=this.howDayNumber;i++){
@@ -301,6 +336,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}`})
@@ -348,7 +385,7 @@ export default {
         pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
         curYear: this.curYear,
         compareYear: this.compareYear,
-        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
+        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:this.selectFestival===3?5:'',
         StatisticsDate:time,
         businessRegion:1,
         SortStr:`${this.type===1?'revenue':this.type===2?'account':this.type===3?'bayonet':''} ${this.sortType===0?'asc':'desc'}`
diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue
index 4c7ca56..f21448a 100644
--- a/pages/nationalPage/springTravel.vue
+++ b/pages/nationalPage/springTravel.vue
@@ -1,7 +1,15 @@
 <template>
   <div class="main">
-    <div :class="selectFestival===0?'top topSpring':selectFestival===1?'top qmFestival':selectFestival===2?'top labourFestival':''">
-      <div :class="selectFestival===0?'header headerSpring':selectFestival===1?'header headerQm':selectFestival===2?'header headerLabour':''" :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
+    <div :class="selectFestival===0?'top topSpring':
+    selectFestival===1?'top qmFestival':
+    selectFestival===2?'top labourFestival':
+    selectFestival===3?'top dragonBoat':
+    ''">
+      <div :class="selectFestival===0?'header headerSpring':
+      selectFestival===1?'header headerQm':
+      selectFestival===2?'header headerLabour':
+      selectFestival===3?'header headerDragonBoat':
+      ''" :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
         <image :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>
 <!--        <img class="pageTitle" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/pageTitle.png"/>-->
         <div v-if="showSpring" class="picker" @click="handleGoMap">
@@ -24,8 +32,24 @@
       </div>
       <picker class="pick" @change="handleChangeFestival($event)" :value="selectFestival" :range="festivalList" range-key="label">
         <div class="festivalChangeBox" :style="{paddingTop:menu.bottom + 32 + 'px'}">
-          <image :style="{width:selectFestival===0?'260rpx':selectFestival===1?'168rpx':selectFestival===2?'168rpx':'',height:selectFestival===0?'68rpx':selectFestival===1?'68rpx':selectFestival===2?'68rpx':''}" 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':''"/>
-          <image class="changeIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/changeFestivalSpring.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/changFestivalQm.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRightArrow.png':''"/>
+          <image :style="{width:selectFestival===0?'260rpx':
+          selectFestival===1?'168rpx':
+          selectFestival===2?'168rpx':
+          selectFestival===3?'168rpx':
+          '',height:selectFestival===0?'68rpx':
+          selectFestival===1?'68rpx':
+          selectFestival===2?'68rpx':
+          selectFestival===3?'68rpx':
+          ''}" 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':
+          ''"/>
+          <image class="changeIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/changeFestivalSpring.png':
+          selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/changFestivalQm.png':
+          selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRightArrow.png':
+          selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRightArrow.png':
+          ''"/>
         </div>
       </picker>
     </div>
@@ -34,13 +58,21 @@
       <div class="springTravelBox">
         <div class="overAllData">
           <!--  对客营收 -->
-          <div :class="selectFestival===0?'overAllDataTop springTop':selectFestival===1?'overAllDataTop qmTop':selectFestival===2?'overAllDataTop labourTop':''">
+          <div :class="selectFestival===0?'overAllDataTop springTop':
+          selectFestival===1?'overAllDataTop qmTop':
+          selectFestival===2?'overAllDataTop labourTop':
+          selectFestival===3?'overAllDataTop dragonBoatTop':
+          ''">
             <div class="titleBox">
               <div class="titleBoxLeft">
 <!--                <img class="titleImg" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png" />-->
-                <img class="titleImg" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmSumData.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png':''" />
+                <img class="titleImg" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png':
+                selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmSumData.png':
+                selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png':
+                selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png':
+                ''" />
                 <text class="titleNotice" v-if="!isShowWarningTime && selectFestival===0">{{`/统计到${allDateDay}`}}</text>
-                <text class="titleNotice" v-if="selectFestival===1">/共统计节日数据5天</text>
+                <text class="titleNotice" v-if="selectFestival===1 || selectFestival===3">/共统计节日数据5天</text>
                 <text class="titleNotice" v-if="selectFestival===2">/共统计节日数据7天</text>
               </div>
               <div class="typeChangeBox" v-if="!showSpring">
@@ -78,15 +110,27 @@
               </div>
             </div>
             <div class="pkBox">
-              <div :class="selectFestival===0?'leftBox springLeftBox':selectFestival===1?'leftBox qmLeftBox':selectFestival===2?'leftBox labourLeftBox':''">
+              <div :class="selectFestival===0?'leftBox springLeftBox':
+              selectFestival===1?'leftBox qmLeftBox':
+              selectFestival===2?'leftBox labourLeftBox':
+              selectFestival===3?'leftBox dragonBoatLeftBox':
+              ''">
                 <text class="value">{{pageData.curYearRevenue.data?$util.getMoney(pageData.curYearRevenue.data / 10000):'0.00'}}</text>
                 <text class="label">2024年/万元</text>
               </div>
-              <div :class="selectFestival===0?'rightBox springRightBox':selectFestival===1?'rightBox qmRightBox':selectFestival===2?'rightBox labourRightBox':''">
+              <div :class="selectFestival===0?'rightBox springRightBox':
+              selectFestival===1?'rightBox qmRightBox':
+              selectFestival===2?'rightBox labourRightBox':
+              selectFestival===3?'rightBox dragonBoatRightBox':
+              ''">
                 <text class="value">{{pageData.lYearRevenue.data?$util.getMoney(pageData.lYearRevenue.data / 10000):'0.00'}}</text>
                 <text class="label">2023年/万元</text>
               </div>
-              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk1st.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS1st.png':''"/>
+              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png':
+              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk1st.png':
+              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS1st.png':
+              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS1st.png':
+              ''"/>
             </div>
 
             <div class="otherListBox" v-if="isShowAllDetail">
@@ -282,15 +326,27 @@
           </div>
           <div class="overAllDataBottom">
             <div class="pkBox">
-              <div :class="selectFestival===0?'leftBox revenueLeft':selectFestival===1?'leftBox qmRevenueLeft':selectFestival===2?'leftBox labourRevenueLeft':''">
+              <div :class="selectFestival===0?'leftBox revenueLeft':
+              selectFestival===1?'leftBox qmRevenueLeft':
+              selectFestival===2?'leftBox labourRevenueLeft':
+              selectFestival===3?'leftBox dragonBoatRevenueLeft':
+              ''">
                 <text class="value">{{pageData.curYearAccount.data?$util.getMoney(pageData.curYearAccount.data / 10000):'0.00'}}</text>
                 <text class="label">2024年/万元</text>
               </div>
-              <div :class="selectFestival===0?'rightBox revenueRight':selectFestival===1?'rightBox qmRevenueRight':selectFestival===2?'rightBox labourRevenueRight':''">
+              <div :class="selectFestival===0?'rightBox revenueRight':
+              selectFestival===1?'rightBox qmRevenueRight':
+              selectFestival===2?'rightBox labourRevenueRight':
+              selectFestival===3?'rightBox dragonBoatRevenueRight':
+              ''">
                 <text class="value">{{pageData.lYearAccount.data?$util.getMoney(pageData.lYearAccount.data / 10000):'0.00'}}</text>
                 <text class="label">2023年/万元</text>
               </div>
-              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueVS.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk2st.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS2st.png':''"/>
+              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueVS.png':
+              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk2st.png':
+              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS2st.png':
+              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS2st.png':
+              ''"/>
             </div>
 
             <div class="otherListBox"  v-if="isShowAllDetail">
@@ -440,15 +496,27 @@
           </div>
           <div class="overAllDataBottom">
             <div class="pkBox" style="margin-bottom: 20px">
-              <div :class="selectFestival===0?'leftBox carLeft':selectFestival===1?'leftBox qmCarLeft':selectFestival===2?'leftBox labourCarLeft':''">
+              <div :class="selectFestival===0?'leftBox carLeft':
+              selectFestival===1?'leftBox qmCarLeft':
+              selectFestival===2?'leftBox labourCarLeft':
+              selectFestival===3?'leftBox dragonBoatCarLeft':
+              ''">
                 <text class="value">{{pageData.curYearBayonet.data?$util.getMoney(pageData.curYearBayonet.data / 10000):'0.00'}}</text>
                 <text class="label">2024年/万辆</text>
               </div>
-              <div :class="selectFestival===0?'rightBox carRight':selectFestival===1?'rightBox qmCarRight':selectFestival===2?'rightBox labourCarRight':'' ">
+              <div :class="selectFestival===0?'rightBox carRight':
+              selectFestival===1?'rightBox qmCarRight':
+              selectFestival===2?'rightBox labourCarRight':
+              selectFestival===3?'rightBox dragonBoatCarRight':
+              '' ">
                 <text class="value">{{pageData.lYearBayonet.data?$util.getMoney(pageData.lYearBayonet.data / 10000):'0.00'}}</text>
                 <text class="label">2023年/万辆</text>
               </div>
-              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carVS.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk3st.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS3st.png':''"/>
+              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carVS.png':
+              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk3st.png':
+              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS3st.png':
+              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS3st.png':
+              ''"/>
             </div>
 
             <div class="otherListBox">
@@ -487,44 +555,84 @@
         </div>
 
         <div class="revenueDetail">
-          <div :class="selectFestival===0?'springTitleBox revenueDetailTitleBox':selectFestival===1?'qmTitleBox revenueDetailTitleBox':selectFestival===2?'labourTitleBox revenueDetailTitleBox':''">
+          <div :class="selectFestival===0?'springTitleBox revenueDetailTitleBox':
+          selectFestival===1?'qmTitleBox revenueDetailTitleBox':
+          selectFestival===2?'labourTitleBox revenueDetailTitleBox':
+          selectFestival===3?'dragonBoatTitleBox revenueDetailTitleBox':
+          ''">
 <!--            <img class="detailLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailLogo.png"/>-->
-            <img class="detailLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailLogo.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmDaily.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourDailyData.png':''"/>
+            <img class="detailLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailLogo.png':
+            selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmDaily.png':
+            selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourDailyData.png':
+            selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourDailyData.png':
+            ''"/>
             <img class="detailIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailIcon.png"/>
 <!--            <text class="modalUnit">单位：万元</text>-->
             <text class="modalUnit">{{`/统计到${allDateDay || ''}`}}</text>
 <!--            <text class="goTest" @click="handleGoTest">看测试页面</text>-->
 <!--            <img class="goTest" @click="handleGoTest" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelBtn.png"/>-->
-            <img class="goTest" @click="handleGoTest" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelBtn.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPic.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourCarTraffic.png':''"/>
+            <img class="goTest" @click="handleGoTest" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelBtn.png':
+            selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPic.png':
+            selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourCarTraffic.png':
+            selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourCarTraffic.png':
+            ''"/>
           </div>
           <div class="revenueContent">
-            <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':selectFestival===1?'navList qmNav':selectFestival===2?'navList labourNav':''" :scrollIntoView="currentScroll" :scroll-with-animation="true">
+            <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':
+            selectFestival===1?'navList qmNav':
+            selectFestival===2?'navList labourNav':
+            selectFestival===3?'navList dragonBoatNav':
+            ''" :scrollIntoView="currentScroll" :scroll-with-animation="true">
               <div :class="currentScroll==='item'+item.value?'scrollItem selectItem':'scrollItem'" v-for="(item,index) in scrollList" :key="index" :id="'item'+item.value" @click="handleChangeTime(item.value)">{{item.label}}</div>
             </scroll-view>
 <!--            <span class="dateText">{{selectDateText || ''}}</span>-->
             <div class="modalBox">
               <div class="modalTitleBox" v-if="pageType===1">
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
-                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#D14702':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':
+                  selectFestival===1?'#3B9285':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}"></div>
                   <text class="modalText">对客销售</text>
                   <text class="modalUnit">/万元</text>
                 </div>
                 <div class="moreBox" @click="handleGoMorePage(1)">
-                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#D14702':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':
+                  selectFestival===1?'#226C61':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}">服务区排名</span>
 <!--                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png"/>-->
-                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':''"/>
+                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':
+                  selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':
+                  selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  ''"/>
                 </div>
               </div>
               <div class="modalTitleBox" v-else>
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
-                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#D14702':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':
+                  selectFestival===1?'#3B9285':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}"></div>
                   <text class="modalText">对客销售</text>
                   <text class="modalUnit">/万元</text>
                 </div>
                 <div class="moreBox" @click="handleGoMorePage(1)">
-                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#D14702':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':
+                  selectFestival===1?'#226C61':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}">服务区排名</span>
 <!--                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png"/>-->
-                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':''"/>
+                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':
+                  selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':
+                  selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  ''"/>
                 </div>
               </div>
 
@@ -644,14 +752,26 @@
             <div class="modalBox">
               <div class="modalTitleBox" v-if="pageType===1">
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 380rpx)',textAlign:'left'}">
-                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#D14702':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':
+                  selectFestival===1?'#3B9285':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}"></div>
                   <text class="modalText">营业收入</text>
                   <text class="modalUnit">/万元</text>
                 </div>
                 <div class="moreBox" @click="handleGoMorePage(2)">
-                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#D14702':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':
+                  selectFestival===1?'#226C61':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}">服务区排名</span>
 <!--                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png"/>-->
-                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':''"/>
+                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':
+                  selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':
+                  selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  ''"/>
                 </div>
 <!--                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.curYearRevenue.value?$util.getMoney(pageData.curYearAccount.value / 10000):'0.00'}}</div>-->
 <!--                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.lYearAccount.value?$util.getMoney(pageData.lYearAccount.value / 10000):'0.00'}}</div>-->
@@ -666,14 +786,26 @@
               </div>
               <div class="modalTitleBox" v-else>
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 380rpx)',textAlign:'left'}">
-                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#D14702':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':
+                  selectFestival===1?'#3B9285':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}"></div>
                   <text class="modalText">营业收入</text>
                   <text class="modalUnit">/万元</text>
                 </div>
                 <div class="moreBox" @click="handleGoMorePage(2)">
-                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#D14702':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':
+                  selectFestival===1?'#226C61':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}">服务区排名</span>
 <!--                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png"/>-->
-                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':''"/>
+                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':
+                  selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':
+                  selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  ''"/>
                 </div>
               </div>
 
@@ -794,14 +926,26 @@
             <div class="modalBox">
               <div class="modalTitleBox" v-if="pageType===1">
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
-                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#D14702':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':
+                  selectFestival===1?'#3B9285':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}"></div>
                   <text class="modalText">入区车流</text>
                   <text class="modalUnit">/万辆</text>
                 </div>
                 <div class="moreBox" @click="handleGoMorePage(3)">
-                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#D14702':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':
+                  selectFestival===1?'#226C61':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}">服务区排名</span>
 <!--                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png"/>-->
-                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':''"/>
+                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':
+                  selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':
+                  selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  ''"/>
                 </div>
 <!--                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.curYearBayonet.value?$util.getMoney(pageData.curYearBayonet.value / 10000):'0.00'}}</div>-->
 <!--                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.lYearBayonet.value?$util.getMoney(pageData.lYearBayonet.value / 10000):'0.00'}}</div>-->
@@ -816,14 +960,26 @@
               </div>
               <div class="modalTitleBox" v-else>
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
-                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#D14702':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':
+                  selectFestival===1?'#3B9285':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}"></div>
                   <text class="modalText">入区车流</text>
                   <text class="modalUnit">/万辆</text>
                 </div>
                 <div class="moreBox" @click="handleGoMorePage(3)">
-                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#D14702':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':
+                  selectFestival===1?'#226C61':
+                  selectFestival===2?'#D14702':
+                  selectFestival===3?'#D14702':
+                  ''}">服务区排名</span>
 <!--                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png"/>-->
-                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':''"/>
+                  <img class="moreIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png':
+                  selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png':
+                  selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png':
+                  ''"/>
                 </div>
               </div>
 
@@ -976,7 +1132,7 @@ export default {
       entryCarDailyNumber:0,// 每日车流增长
 
       selectFestival: 2,// 选择的节日
-      festivalList:[{label:'平安春运',value:1},{label:'清明节',value:2},{label:'劳动节',value:2}],// 节日列表
+      festivalList:[{label:'平安春运',value:1},{label:'清明节',value:2},{label:'劳动节',value:3},{label:'端午节',value:4}],// 节日列表
     }
   },
   async onLoad(query){
@@ -1128,6 +1284,8 @@ export default {
         this.currentScroll = 'item'+ this.lastDay
       }else if(this.selectFestival===2){
         this.currentScroll = 'item'+ this.lastDay
+      }else if(this.selectFestival===3){
+        this.currentScroll = 'item'+ this.lastDay
       }
 
       let dayNumber = 0
@@ -1137,6 +1295,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){
@@ -1167,6 +1327,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 = []
       for (let i = 1;i<=this.howDayNumber;i++) {
@@ -1176,6 +1345,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")})// 端午
         }
       }
       console.log('dateList',dateList)
@@ -1199,7 +1370,7 @@ export default {
           pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
           curYear:this.curYear,
           compareYear:this.compareYear,
-          HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
+          HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:this.selectFestival===3?5:'',
           StatisticsDate:date || this.lastDay,
           ServerpartId:this.springService.Serverpart_ID
         }
@@ -1208,7 +1379,7 @@ export default {
           pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
           curYear:this.curYear,
           compareYear:this.compareYear,
-          HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
+          HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:this.selectFestival===3?5:'',
           StatisticsDate:date || this.lastDay,
         }
       }
@@ -1335,7 +1506,7 @@ export default {
         pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
         curYear:this.curYear,
         compareYear:this.compareYear,
-        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
+        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:this.selectFestival===3?5:'',
         StatisticsDate:date || this.lastDay,
         businessRegion:1,
       }
@@ -1393,7 +1564,7 @@ export default {
         pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
         curYear:this.curYear,
         compareYear:this.compareYear,
-        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
+        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:this.selectFestival===3?5:'',
         StatisticsDate:date || this.lastDay,
         businessTrade:1
       }
diff --git a/pages/nationalPage/testPage.vue b/pages/nationalPage/testPage.vue
index b43cf16..a715031 100644
--- a/pages/nationalPage/testPage.vue
+++ b/pages/nationalPage/testPage.vue
@@ -52,44 +52,88 @@
         </div>
 
         <div class="allPkBox">
-          <div :class="selectFestival===0?'boxBg springBox':selectFestival===1?'boxBg qmBox':selectFestival===2?'boxBg labourBox':''"></div>
+          <div :class="selectFestival===0?'boxBg springBox':
+          selectFestival===1?'boxBg qmBox':
+          selectFestival===2?'boxBg labourBox':
+          selectFestival===3?'boxBg labourBox':
+          ''"></div>
           <div class="pkContent">
             <div class="contentTop">
 <!--              <img class="titleImg" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png" />-->
-              <img class="titleImg" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmSumData.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png':''" />
+              <img class="titleImg" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png':
+              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmSumData.png':
+              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png':
+              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png':
+              ''" />
             </div>
             <div class="pkBox">
-              <div class="leftBox">
+              <div :class="selectFestival===0?'leftBox springLeftBox':
+              selectFestival===1?'leftBox qmLeftBox':
+              selectFestival===2?'leftBox labourLeftBox':
+              selectFestival===3?'leftBox dragonBoatLeftBox':
+              ''">
                 <text class="value">{{giveTrendObj.curYearRevenue?$util.getMoney(giveTrendObj.curYearRevenue / 10000):'0.00'}}</text>
                 <text class="label">2024年/万元</text>
               </div>
-              <div class="rightBox">
+              <div :class="selectFestival===0?'rightBox springRightBox':
+              selectFestival===1?'rightBox qmRightBox':
+              selectFestival===2?'rightBox labourRightBox':
+              selectFestival===3?'rightBox dragonBoatRightBox':
+              ''">
                 <text class="value">{{giveTrendObj.lYearRevenue?$util.getMoney(giveTrendObj.lYearRevenue / 10000):'0.00'}}</text>
                 <text class="label">2023年/万元</text>
               </div>
-              <img class="pkLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png"/>
+              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png':
+              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk1st.png':
+              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS1st.png':
+              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS1st.png':
+              ''"/>
             </div>
             <div class="pkBox">
-              <div class="leftBox revenueLeft">
+              <div :class="selectFestival===0?'leftBox revenueLeft':
+              selectFestival===1?'leftBox qmRevenueLeft':
+              selectFestival===2?'leftBox labourRevenueLeft':
+              selectFestival===3?'leftBox dragonBoatRevenueLeft':
+              ''">
                 <text class="value">{{giveTrendObj.curYearAccount?$util.getMoney(giveTrendObj.curYearAccount / 10000):'0.00'}}</text>
                 <text class="label">2024年/万元</text>
               </div>
-              <div class="rightBox revenueRight">
+              <div :class="selectFestival===0?'rightBox revenueRight':
+              selectFestival===1?'rightBox qmRevenueRight':
+              selectFestival===2?'rightBox labourRevenueRight':
+              selectFestival===3?'rightBox dragonBoatRevenueRight':
+              ''">
                 <text class="value">{{giveTrendObj.lYearAccount?$util.getMoney(giveTrendObj.lYearAccount / 10000):'0.00'}}</text>
                 <text class="label">2023年/万元</text>
               </div>
-              <img class="pkLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueVS.png"/>
+              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueVS.png':
+              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk2st.png':
+              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS2st.png':
+              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS2st.png':
+              ''"/>
             </div>
             <div class="pkBox" style="margin-bottom: 20px">
-              <div class="leftBox carLeft">
+              <div :class="selectFestival===0?'leftBox carLeft':
+              selectFestival===1?'leftBox qmCarLeft':
+              selectFestival===2?'leftBox labourCarLeft':
+              selectFestival===3?'leftBox dragonBoatCarLeft':
+              ''">
                 <text class="value">{{giveTrendObj.curYearBayonet?$util.getMoney(giveTrendObj.curYearBayonet / 10000):'0.00'}}</text>
                 <text class="label">2024年/万辆</text>
               </div>
-              <div class="rightBox carRight">
+              <div :class="selectFestival===0?'rightBox carRight':
+              selectFestival===1?'rightBox qmCarRight':
+              selectFestival===2?'rightBox labourCarRight':
+              selectFestival===3?'rightBox dragonBoatCarRight':
+              '' ">
                 <text class="value">{{giveTrendObj.lYearBayonet?$util.getMoney(giveTrendObj.lYearBayonet / 10000):'0.00'}}</text>
                 <text class="label">2023年/万辆</text>
               </div>
-              <img class="pkLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carVS.png"/>
+              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carVS.png':
+              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk3st.png':
+              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS3st.png':
+              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS3st.png':
+              ''"/>
             </div>
           </div>
         </div>
@@ -169,6 +213,8 @@ export default {
       this.howDayNumber = 5
     }else if (this.selectFestival===2){
       this.howDayNumber = 7
+    }else if (this.selectFestival===3){
+      this.howDayNumber = 5
     }
     this.handleGetData()
   },
@@ -180,7 +226,7 @@ export default {
       const req = {
         pushProvinceCode:'340000',
         StatisticsDate: this.lastDay,
-        holidayType: this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
+        holidayType: this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:this.selectFestival===3?5:'',
         curYear:2024,
         compareYear:2023,
       }
@@ -259,6 +305,13 @@ export default {
         for(let i = 1;i<=7;i++){
           dateList2.push(`第${i}天`)
         }
+      }else if (this.selectFestival===3){
+        for(let i = 1;i<=5;i++){
+          dateList.push(`第${i}天`)
+        }
+        for(let i = 1;i<=5;i++){
+          dateList2.push(i)
+        }
       }
 
       let max = 0
@@ -325,7 +378,8 @@ export default {
             tradDate:list,
             howDayNumber:this.howDayNumber,
             selectFestival: this.selectFestival,
-            realDateList: ['2024-04-30','2024-05-01','2024-05-02','2024-05-03','2024-05-04','2024-05-05','2024-05-06']
+            // realDateList: ['2024-04-30','2024-05-01','2024-05-02','2024-05-03','2024-05-04','2024-05-05','2024-05-06']//劳动节
+            realDateList: ['2024-06-07','2024-06-08','2024-06-09','2024-06-10','2024-06-11']
           },
           {
             name:`23年`,
@@ -334,7 +388,8 @@ export default {
             tradDate:list,
             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: ['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']
           },
         ],
         max:Number(max.toFixed(2)),
@@ -350,7 +405,8 @@ export default {
             tradDate:list,
             howDayNumber:this.howDayNumber,
             selectFestival: this.selectFestival,
-            realDateList: ['2024-04-30','2024-05-01','2024-05-02','2024-05-03','2024-05-04','2024-05-05','2024-05-06']
+            // realDateList: ['2024-04-30','2024-05-01','2024-05-02','2024-05-03','2024-05-04','2024-05-05','2024-05-06']//劳动节
+            realDateList: ['2024-06-07','2024-06-08','2024-06-09','2024-06-10','2024-06-11']
           },
           {
             name:`23年`,
@@ -359,7 +415,8 @@ export default {
             tradDate:list,
             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: ['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']
           },
         ],
         max:Number(max.toFixed(2)),
@@ -665,6 +722,7 @@ export default {
               flex-direction: column;
               position: absolute;
             }
+
             .leftBox{
               left: 0;top: 0;
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/leftRed.png");
@@ -685,6 +743,15 @@ export default {
                 line-height: 40rpx;
               }
             }
+            .springLeftBox{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/leftRed.png");
+            }
+            .qmLeftBox{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg1st.png");
+            }
+            .labourLeftBox{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo1.png");
+            }
             .rightBox{
               right: 0;top: 0;
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rightPink.png");
@@ -706,9 +773,36 @@ export default {
                 line-height: 40rpx;
               }
             }
+            .springRightBox{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rightPink.png");
+            }
+            .qmRightBox{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg2st.png");
+              .value{
+                color: #2D7E72!important;
+              }
+              .label{
+                color: #2D7E72!important;
+              }
+            }
+            .labourRightBox{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo2.png");
+              .value{
+                color: #E17900!important;
+              }
+              .label{
+                color: #E17900!important;
+              }
+            }
             .revenueLeft{
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueLeft.png");
             }
+            .qmRevenueLeft{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg3st.png");
+            }
+            .labourRevenueLeft{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo3.png");
+            }
             .revenueRight{
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueRight.png");
               .value{
@@ -718,9 +812,33 @@ export default {
                 color: #D48F00;
               }
             }
+            .qmRevenueRight{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg4st.png");
+              .value{
+                color: #3873DD;
+              }
+              .label{
+                color: #3873DD;
+              }
+            }
+            .labourRevenueRight{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo4.png");
+              .value{
+                color: #F0490E;
+              }
+              .label{
+                color: #F0490E;
+              }
+            }
             .carLeft{
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carLeft.png");
             }
+            .qmCarLeft{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg5st.png");
+            }
+            .labourCarLeft{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo5.png");
+            }
             .carRight{
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carRight.png");
               .value{
@@ -730,6 +848,24 @@ export default {
                 color: #3873DD;
               }
             }
+            .qmCarRight{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg6st.png");
+              .value{
+                color: #0793BB;
+              }
+              .label{
+                color: #0793BB;
+              }
+            }
+            .labourCarRight{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo6.png");
+              .value{
+                color: #A59301;
+              }
+              .label{
+                color: #A59301;
+              }
+            }
           }
         }
       }