From 9f2e1de9a13b69745a209536122b063d3c3bc86d Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Mon, 29 Apr 2024 18:57:26 +0800
Subject: [PATCH] update

---
 pages/index/index.vue                         |   7 +-
 .../js_sdk/u-charts/config-ucharts.js         | 108 ++++++++---
 pages/nationalPage/rankPage.vue               |  41 +++-
 pages/nationalPage/springTravel.vue           | 177 +++++++++++++-----
 pages/nationalPage/testPage.vue               |  53 ++++--
 5 files changed, 293 insertions(+), 93 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index d6e69de..bc6c2ce 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1029,9 +1029,10 @@
           <view class="funItemContent">
             <view class="funIconBox">
 <!--              <image class="funIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelLogo.svg"/>-->
-              <image class="funIcon" :src="isShowFestival==='spring'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelLogo.svg':isShowFestival==='qm'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmIcon.png':''"/>
+              <image class="funIcon" :src="isShowFestival==='spring'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelLogo.svg':isShowFestival==='qm'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmIcon.png':isShowFestival==='labour'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourLogo.png':''"/>
             </view>
-                        <text class="funText">节日特刊</text>
+                        <text class="funText">劳动节</text>
+<!--                        <text class="funText">节日特刊</text>-->
 <!--            <text class="funText">平安春运</text>-->
 <!--            <text class="funText">{{ isShowFestival==='spring'?'平安春运':isShowFestival==='qm'?'清明节':'' }}</text>-->
           </view>
@@ -1599,7 +1600,7 @@ export default {
       currentMoney:'',
       showMoreFixed:false,// 显示悬浮框
       profitSharingList:[],// 分润占比旁边的list
-      isShowFestival:'spring',// 显示的节日
+      isShowFestival:'labour',// 显示的节日
       oldSwiperIndex: 0,// 移动swiper 等待1秒钟 如果保持一致就请求 不一致就return
     }
   },
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 31bbfc7..216bedb 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
@@ -172,44 +172,95 @@ const cfu = {
 		  console.log('index',index)
 		  console.log('opts',opts)
 
-		  // return item.name
-		  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
-		  console.log('data',data)
-		  console.log('day',day)
+		  let type = opts.series[0].selectFestival
+		  if (type===0){
+			  // return item.name
+			  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
+			  console.log('data',data)
+			  console.log('day',day)
 
-		  if (item.name==='23年'){
-			  if (index<day){
-				  return item.name + "：" + getMoney(data / 10000,2) + '万元'
+			  if (item.name==='23年'){
+				  if (index<day){
+					  return item.name + "：" + getMoney(data / 10000,2) + '万元'
+				  }else{
+					  let indexList = "6,8,14,15,20,22,24,25,29,30"
+					  let dateList = opts.series.filter(subItem=> subItem.name === item.name)[0].tradDate
+					  let realDate
+					  if (index===6 ||index===8 ||index===14 ||index===15 ||index===20 ||index===22 ||index===24 ||index===25 ||index===29 ||index===30){
+						  realDate = dateList[index]
+					  }
+					  return item.name + "：" + getMoney(data / 10000,2) + '万元' + `，${realDate?realDate:''}`
+				  }
 			  }else{
 				  let indexList = "6,8,14,15,20,22,24,25,29,30"
+				  // let indexList = "8,9,15,16,21,23,25,26,30,31"
 				  let dateList = opts.series.filter(subItem=> subItem.name === item.name)[0].tradDate
+				  console.log('dateList',dateList)
 				  let realDate
 				  if (index===6 ||index===8 ||index===14 ||index===15 ||index===20 ||index===22 ||index===24 ||index===25 ||index===29 ||index===30){
 					  realDate = dateList[index]
 				  }
-				  return item.name + "：" + getMoney(data / 10000,2) + '万元' + `，${realDate?realDate:''}`
-			  }
-
-
-		  }else{
-			  let indexList = "6,8,14,15,20,22,24,25,29,30"
-			  // let indexList = "8,9,15,16,21,23,25,26,30,31"
-			  let dateList = opts.series.filter(subItem=> subItem.name === item.name)[0].tradDate
-			  console.log('dateList',dateList)
-			  let realDate
-			  if (index===6 ||index===8 ||index===14 ||index===15 ||index===20 ||index===22 ||index===24 ||index===25 ||index===29 ||index===30){
-				  realDate = dateList[index]
+				  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 add = Number(((curData/compareData)-1)*100).toFixed(2)
+				  if (index<day){
+					  return `${item.name}：${getMoney(data / 10000,2)}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}，${realDate?realDate:''}`
+				  }else{
+					  return ' '
+				  }
 			  }
+		  }else if(type===1){
+			  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 (index<day){
-				  return `${item.name}：${getMoney(data / 10000,2)}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}，${realDate?realDate:''}`
+			  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?'(清明节)':''}`
+				  }else{
+					  return `${curDate}：`
+				  }
 			  }else{
-				  return ' '
+				  return `${festivalType===2?realDate:item.name}：${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(清明节)':''}`
+			  }
+		  } else if(type===2){
+			  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+'%':''}${festivalType===1 && index===1?'(清明节)':''}`
+				  }else{
+					  return `${curDate}：`
+				  }
+			  }else{
+				  return `${realDate}：${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(清明节)':''}`
 			  }
 		  }
+
 	  },
 	  "entryCarNumber":function (item, category, index, opts){
 		  console.log('item',item)
@@ -226,15 +277,20 @@ const cfu = {
 		  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 `${item.name}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${festivalType===1 && index===1?'(清明节)':''}`
+				  return `${festivalType===2?curDate:item.name}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${festivalType===1 && index===1?'(清明节)':''}`
 			  }else{
-				  return ' '
+				  return `${curDate}：`
 			  }
 		  }else{
-			  return `${item.name}：${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(清明节)':''}`
+			  return `${festivalType===2?realDate:item.name}：${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(清明节)':''}`
 		  }
 
 	  },
diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue
index d7b4247..52df8f0 100644
--- a/pages/nationalPage/rankPage.vue
+++ b/pages/nationalPage/rankPage.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="main">
-    <div :class="selectFestival===0?'top springTop':selectFestival===1?'top qmTop':''">
-      <div :class="selectFestival===0?'header headerSpring':selectFestival===1?'header headerQm':'' " :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
+    <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'}">
         <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':''">
+        <div :class="selectFestival===0?'revenueDetailTitleBox springTitleBox':selectFestival===1?'revenueDetailTitleBox qmTitleBox':selectFestival===2?'revenueDetailTitleBox labourTitleBox':''">
           <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':''"/>
+            <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':''"/>
             <!--          <text class="modalUnit">{{selectDateText || ''}}</text>-->
             <text class="modalUnit">{{`/统计到${allDateDay || ''}`}}</text>
           </div>
@@ -27,7 +27,7 @@
 <!--            <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':''" :scrollIntoView="currentScroll" :scroll-with-animation="true">
+            <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':selectFestival===1?'navList qmNav':selectFestival===2?'navList labourNav':''" :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 +35,7 @@
           <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':''}"></div>
+                <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#D14702':''}"></div>
                 <text class="modalText">{{ type===1?'对客销售':type===2?'营业收入':type===3?'入区车流':'' }}</text>
                 <text class="modalUnit">{{type===3?'/万辆':'/万元'}}</text>
               </div>
@@ -244,6 +244,8 @@ export default {
       }
     }else if (this.selectFestival===1){
       this.currentScroll = 'item'+ this.lastDay
+    }else if (this.selectFestival===2){
+      this.currentScroll = 'item'+ this.lastDay
     }
 
 
@@ -279,6 +281,15 @@ export default {
         this.howDayNumber = 5
         this.currentScroll = 'item'+ '2024-04-07'
       }
+    }else if(this.selectFestival===2){
+      dayNumber = moment().diff("2024-04-29", "days")
+      if (dayNumber<=7){
+        this.howDayNumber = dayNumber
+      }else{
+        this.howDayNumber = 7
+        this.currentScroll = 'item'+ '2024-05-05'
+        this.lastDay = '2024-05-05'
+      }
     }
     let dateList = []
     for (let i = 1;i<=this.howDayNumber;i++){
@@ -286,6 +297,8 @@ export default {
         dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
       }else if(this.selectFestival===1){
         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-28").add(i, 'days').format("YYYY-MM-DD")})
       }
       // if (i<7){
       //   dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`})
@@ -333,7 +346,7 @@ export default {
         pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
         curYear: this.curYear,
         compareYear: this.compareYear,
-        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:'',
+        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
         StatisticsDate:time,
         businessRegion:1,
         SortStr:`${this.type===1?'revenue':this.type===2?'account':this.type===3?'bayonet':''} ${this.sortType===0?'asc':'desc'}`
@@ -622,6 +635,9 @@ export default {
   .qmTop{
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/smallQmBg.png");
   }
+  .labourTop{
+    background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png");
+  }
   .top{
     width: 100%;
     height: 324rpx;
@@ -636,6 +652,9 @@ export default {
     .headerQm{
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/smallQmBg.png");
     }
+    .headerLabour{
+      background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png");
+    }
     .header{
       position: fixed;
       width: 100%;
@@ -674,6 +693,9 @@ export default {
       .qmTitleBox{
         background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%);
       }
+      .labourTitleBox{
+        background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%);
+      }
       .revenueDetailTitleBox{
         width: 100%;
         height: 90rpx;
@@ -796,6 +818,11 @@ export default {
               color: #226C61!important;
             }
           }
+          .labourNav{
+            .selectItem {
+              color: #D14702!important;
+            }
+          }
         }
         .dateText{
           font-size: 24rpx;
diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue
index a7a73cb..13a5df6 100644
--- a/pages/nationalPage/springTravel.vue
+++ b/pages/nationalPage/springTravel.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="main">
-    <div :class="selectFestival===0?'top topSpring':selectFestival===1?'top qmFestival':''">
-      <div :class="selectFestival===0?'header headerSpring':selectFestival===1?'header headerQm':''" :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
+    <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'}">
         <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 +24,8 @@
       </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':'',height:selectFestival===0?'68rpx':selectFestival===1?'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':''"/>
-          <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':''"/>
+          <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':''"/>
         </div>
       </picker>
     </div>
@@ -34,13 +34,14 @@
       <div class="springTravelBox">
         <div class="overAllData">
           <!--  对客营收 -->
-          <div :class="selectFestival===0?'overAllDataTop springTop':selectFestival===1?'overAllDataTop qmTop':''">
+          <div :class="selectFestival===0?'overAllDataTop springTop':selectFestival===1?'overAllDataTop qmTop':selectFestival===2?'overAllDataTop labourTop':''">
             <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':''" />
+                <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':''" />
                 <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===2">/共统计节日数据7天</text>
               </div>
               <div class="typeChangeBox" v-if="!showSpring">
                 <div :class="pageType===1?'normal select':'normal'" @click="handleChangeType(1)">经营板块</div>
@@ -77,15 +78,15 @@
               </div>
             </div>
             <div class="pkBox">
-              <div :class="selectFestival===0?'leftBox springLeftBox':selectFestival===1?'leftBox qmLeftBox':''">
+              <div :class="selectFestival===0?'leftBox springLeftBox':selectFestival===1?'leftBox qmLeftBox':selectFestival===2?'leftBox labourLeftBox':''">
                 <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':''">
+              <div :class="selectFestival===0?'rightBox springRightBox':selectFestival===1?'rightBox qmRightBox':selectFestival===2?'rightBox labourRightBox':''">
                 <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':''"/>
+              <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':''"/>
             </div>
 
             <div class="otherListBox" v-if="isShowAllDetail">
@@ -281,15 +282,15 @@
           </div>
           <div class="overAllDataBottom">
             <div class="pkBox">
-              <div :class="selectFestival===0?'leftBox revenueLeft':selectFestival===1?'leftBox qmRevenueLeft':''">
+              <div :class="selectFestival===0?'leftBox revenueLeft':selectFestival===1?'leftBox qmRevenueLeft':selectFestival===2?'leftBox labourRevenueLeft':''">
                 <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':''">
+              <div :class="selectFestival===0?'rightBox revenueRight':selectFestival===1?'rightBox qmRevenueRight':selectFestival===2?'rightBox labourRevenueRight':''">
                 <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':''"/>
+              <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':''"/>
             </div>
 
             <div class="otherListBox"  v-if="isShowAllDetail">
@@ -439,15 +440,15 @@
           </div>
           <div class="overAllDataBottom">
             <div class="pkBox" style="margin-bottom: 20px">
-              <div :class="selectFestival===0?'leftBox carLeft':selectFestival===1?'leftBox qmCarLeft':''">
+              <div :class="selectFestival===0?'leftBox carLeft':selectFestival===1?'leftBox qmCarLeft':selectFestival===2?'leftBox labourCarLeft':''">
                 <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':'' ">
+              <div :class="selectFestival===0?'rightBox carRight':selectFestival===1?'rightBox qmCarRight':selectFestival===2?'rightBox labourCarRight':'' ">
                 <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':''"/>
+              <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':''"/>
             </div>
 
             <div class="otherListBox">
@@ -486,44 +487,44 @@
         </div>
 
         <div class="revenueDetail">
-          <div :class="selectFestival===0?'springTitleBox revenueDetailTitleBox':selectFestival===1?'qmTitleBox revenueDetailTitleBox':''">
+          <div :class="selectFestival===0?'springTitleBox revenueDetailTitleBox':selectFestival===1?'qmTitleBox revenueDetailTitleBox':selectFestival===2?'labourTitleBox 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':''"/>
+            <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="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':''"/>
+            <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':''"/>
           </div>
           <div class="revenueContent">
-            <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':selectFestival===1?'navList qmNav':''" :scrollIntoView="currentScroll" :scroll-with-animation="true">
+            <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':selectFestival===1?'navList qmNav':selectFestival===2?'navList qmNav':selectFestival===2?'navList labourNav':''" :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':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#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':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#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':''"/>
+                  <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':''"/>
                 </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':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#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':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#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':''"/>
+                  <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':''"/>
                 </div>
               </div>
 
@@ -643,14 +644,14 @@
             <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':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#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':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#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':''"/>
+                  <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':''"/>
                 </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>-->
@@ -665,14 +666,14 @@
               </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':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#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':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#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':''"/>
+                  <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':''"/>
                 </div>
               </div>
 
@@ -793,14 +794,14 @@
             <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':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#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':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#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':''"/>
+                  <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':''"/>
                 </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>-->
@@ -815,14 +816,14 @@
               </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':''}"></div>
+                  <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':selectFestival===1?'#3B9285':selectFestival===2?'#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':''}">服务区排名</span>
+                  <span class="moreText" :style="{color: selectFestival===0?'#ED3E48':selectFestival===1?'#226C61':selectFestival===2?'#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':''"/>
+                  <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':''"/>
                 </div>
               </div>
 
@@ -974,8 +975,8 @@ export default {
       entryCarDailyAdd:0,// 每日车流增幅
       entryCarDailyNumber:0,// 每日车流增长
 
-      selectFestival: 1,// 选择的节日
-      festivalList:[{label:'平安春运',value:1},{label:'清明节',value:2}],// 节日列表
+      selectFestival: 2,// 选择的节日
+      festivalList:[{label:'平安春运',value:1},{label:'清明节',value:2},{label:'劳动节',value:2}],// 节日列表
     }
   },
   async onLoad(query){
@@ -1007,6 +1008,8 @@ export default {
       this.currentScroll = 'item'+ '2024-03-05'
     }else if (this.selectFestival===1){
       this.currentScroll = 'item'+ this.lastDay
+    }else if (this.selectFestival===2){
+      this.currentScroll = 'item'+ this.lastDay
     }
     console.log('currentScroll',this.currentScroll)
     const lastDate = new Date(this.lastDay)
@@ -1025,10 +1028,13 @@ export default {
     //   dayNumber = 6 + lastDays
     // }
     if (this.selectFestival===0){
-      dayNumber = moment().diff("2024-01-26", "days")
+      dayNumber = moment().diff("2024-01-26", "days")// 春节
     }else if (this.selectFestival===1){
-      dayNumber = moment().diff("2024-04-03", "days")
+      dayNumber = moment().diff("2024-04-03", "days")// 清明
+    }else if (this.selectFestival===2){
+      dayNumber = moment().diff("2024-04-29", "days")// 劳动
     }
+    console.log('dayNumber',dayNumber)
     if (this.selectFestival===0){
       this.howDayNumber = dayNumber<=40?dayNumber:40
       this.lastDay = '2024-03-05'
@@ -1040,14 +1046,24 @@ export default {
         this.currentScroll = 'item'+ '2024-04-07'
         this.lastDay = '2024-04-07'
       }
-
+    }else if (this.selectFestival===2){
+      if (dayNumber<=7){
+        this.howDayNumber = dayNumber
+      }else{
+        this.howDayNumber = 7
+        this.currentScroll = 'item'+ '2024-05-05'
+        this.lastDay = '2024-05-05'
+      }
     }
+
     let dateList = []
     for (let i = 1;i<=this.howDayNumber;i++){
       if (this.selectFestival===0){
         dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
       }else if (this.selectFestival===1){
         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-28").add(i, 'days').format("YYYY-MM-DD")})
       }
       // if (i<7){
       //   dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`})
@@ -1100,6 +1116,7 @@ export default {
       this.handleResest()
       console.log('e',e)
       this.selectFestival = Number(e.detail.value)
+      this.scrollList = []
 
       if (this.selectFestival===0){
         this.currentScroll = 'item'+ '2024-03-05'
@@ -1112,6 +1129,8 @@ export default {
         dayNumber = moment().diff("2024-01-26", "days")
       }else if (this.selectFestival===1){
         dayNumber = moment().diff("2024-04-03", "days")
+      }else if (this.selectFestival===2){
+        dayNumber = moment().diff("2024-04-29", "days")// 劳动
       }
       if (this.selectFestival===0){
         if (dayNumber<=40){
@@ -1126,8 +1145,18 @@ export default {
           this.howDayNumber = dayNumber
         }else{
           this.howDayNumber = 3
+          this.currentScroll = 'item'+ '2024-04-05'
           this.lastDay = '2024-04-07'
         }
+      }else if (this.selectFestival===2){
+        // this.howDayNumber = dayNumber<=3?dayNumber:3
+        if (dayNumber<=7){
+          this.howDayNumber = dayNumber
+        }else{
+          this.howDayNumber = 7
+          this.currentScroll = 'item'+ '2024-05-05'
+          this.lastDay = '2024-05-05'
+        }
       }
       let dateList = []
       for (let i = 1;i<=this.howDayNumber;i++) {
@@ -1135,6 +1164,8 @@ export default {
           dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
         }else if (this.selectFestival===1){
           dateList.push({label:`第${i}天`,value:moment("2024-04-02").add(i, 'days').format("YYYY-MM-DD")})
+        }else if (this.selectFestival===1){
+          dateList.push({label:`第${i}天`,value:moment("2024-04-28").add(i, 'days').format("YYYY-MM-DD")})
         }
       }
       if (dateList && dateList.length>0){
@@ -1151,12 +1182,13 @@ export default {
     },
     async handleGetPageData(date){
       let req
+      // 判断有没有服务区
       if (this.springService){
         req = {
           pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
           curYear:this.curYear,
           compareYear:this.compareYear,
-          HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:'',
+          HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
           StatisticsDate:date || this.lastDay,
           ServerpartId:this.springService.Serverpart_ID
         }
@@ -1165,7 +1197,7 @@ export default {
           pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
           curYear:this.curYear,
           compareYear:this.compareYear,
-          HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:'',
+          HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
           StatisticsDate:date || this.lastDay,
         }
       }
@@ -1292,7 +1324,7 @@ export default {
         pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
         curYear:this.curYear,
         compareYear:this.compareYear,
-        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:'',
+        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
         StatisticsDate:date || this.lastDay,
         businessRegion:1,
       }
@@ -1350,7 +1382,7 @@ export default {
         pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
         curYear:this.curYear,
         compareYear:this.compareYear,
-        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:'',
+        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
         StatisticsDate:date || this.lastDay,
         businessTrade:1
       }
@@ -1595,6 +1627,9 @@ export default {
   .qmFestival{
     background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBackground.png") !important;
   }
+  .labourFestival{
+    background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png") !important;
+  }
   .top{
     width: 100%;
     height: 432rpx;
@@ -1613,6 +1648,9 @@ export default {
     .headerQm{
       background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBackground.png") !important;
     }
+    .headerLabour{
+      background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png") !important;
+    }
     .header{
       position: fixed;
       width: 100%;
@@ -1750,6 +1788,9 @@ export default {
         .qmTop{
           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%);
+        }
         .overAllDataTop{
           width: 100%;
           border-radius: 14rpx 14rpx 16rpx 16rpx;
@@ -2005,6 +2046,9 @@ export default {
             .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");
+            }
             .leftBox{
               left: 0;top: 0;
               //background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/leftRed.png");
@@ -2037,6 +2081,15 @@ export default {
                 color: #2D7E72!important;
               }
             }
+            .labourRightBox{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo2.png");
+              .value{
+                color: #E17900!important;
+              }
+              .label{
+                color: #E17900!important;
+              }
+            }
 
             .rightBox{
               right: 0;top: 0;
@@ -2065,6 +2118,9 @@ export default {
             .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{
@@ -2083,12 +2139,24 @@ export default {
                 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{
@@ -2107,6 +2175,15 @@ export default {
                 color: #0793BB;
               }
             }
+            .labourCarRight{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo6.png");
+              .value{
+                color: #A59301;
+              }
+              .label{
+                color: #A59301;
+              }
+            }
           }
 
           .otherListBox{
@@ -2271,6 +2348,9 @@ export default {
         .qmTitleBox{
           background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%);
         }
+        .labourTitleBox{
+          background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%);
+        }
         .revenueDetailTitleBox{
           width: 100%;
           height: 90rpx;
@@ -2347,6 +2427,11 @@ export default {
               color: #226C61;
             }
           }
+          .labourNav{
+            .selectItem{
+              color: #D14702;
+            }
+          }
           .dateText{
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
diff --git a/pages/nationalPage/testPage.vue b/pages/nationalPage/testPage.vue
index 771a3bd..bf3e463 100644
--- a/pages/nationalPage/testPage.vue
+++ b/pages/nationalPage/testPage.vue
@@ -26,7 +26,7 @@
           <div :class="selectFestival===0?'boxBg springBox':selectFestival===1?'boxBg qmBox':''"></div>
           <div class="contentBox">
 <!--            <img class="contentIcon" src=""/>-->
-            <img class="contentIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/imgDesc.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/trendChart.png':''"/>
+            <img class="contentIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/imgDesc.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/trendChart.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/larburTrendChart.png':''"/>
             <div class="contentText" v-if="selectFestival===0">
               根据历史大数据显示：<br/>
               <div style="text-indent: 2rem;font-size: 24rpx">
@@ -37,11 +37,11 @@
         </div>
 
         <div class="allPkBox">
-          <div :class="selectFestival===0?'boxBg springBox':selectFestival===1?'boxBg qmBox':''"></div>
+          <div :class="selectFestival===0?'boxBg springBox':selectFestival===1?'boxBg qmBox':selectFestival===2?'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':''" />
+              <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':''" />
             </div>
             <div class="pkBox">
               <div class="leftBox">
@@ -152,6 +152,8 @@ export default {
       this.howDayNumber = dayNumber
     }else if (this.selectFestival===1){
       this.howDayNumber = 5
+    }else if (this.selectFestival===2){
+      this.howDayNumber = 7
     }
     this.handleGetData()
   },
@@ -163,7 +165,7 @@ export default {
       const req = {
         pushProvinceCode:'340000',
         StatisticsDate: this.lastDay,
-        holidayType: this.selectFestival===0?2:this.selectFestival===1?3:'',
+        holidayType: this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:'',
         curYear:2024,
         compareYear:2023,
       }
@@ -171,6 +173,12 @@ export default {
       console.log('data',data)
       let dateList = []
       let dateList2 = []
+
+      // 去年的具体日期
+      let compareDateList = []
+      // 今年的具体日期
+      let curDateList = []
+
       let dataObj = data.Result_Data
       if (dataObj && dataObj.compareList && dataObj.compareList.length>0){
         dataObj.compareList.forEach(item=>{
@@ -179,6 +187,7 @@ export default {
           let d = date.getDate()
           let dateText = `${m}.${d}`
           item.easyDate = dateText
+          compareDateList.push(item.name)
         })
       }
       if (dataObj && dataObj.curList && dataObj.curList.length>0){
@@ -188,6 +197,7 @@ export default {
           let d = date.getDate()
           let dateText = `${m}.${d}`
           item.easyDate = dateText
+          curDateList.push(item.name)
         })
       }
       if (this.selectFestival===0){
@@ -227,6 +237,13 @@ export default {
         for(let i = 1;i<=5;i++){
           dateList2.push(i)
         }
+      }else if (this.selectFestival===2){
+        for(let i = 1;i<=7;i++){
+          dateList.push(`第${i}天`)
+        }
+        for(let i = 1;i<=7;i++){
+          dateList2.push(i)
+        }
       }
 
       let max = 0
@@ -286,7 +303,8 @@ export default {
             real:realCurList,
             tradDate:list,
             howDayNumber:this.howDayNumber,
-            selectFestival: this.selectFestival
+            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']
           },
           {
             name:`23年`,
@@ -294,10 +312,12 @@ export default {
             real:realCompareList,
             tradDate:list,
             howDayNumber:this.howDayNumber,
-            selectFestival: this.selectFestival
+            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']
           },
         ],
         max:Number(max.toFixed(2)),
+        selectFestival:this.selectFestival
       }
       let res2 = {
         categories: dateList2,
@@ -307,14 +327,18 @@ export default {
             data:curListList,
             real:realCurList,
             tradDate:list,
-            howDayNumber:this.howDayNumber
+            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']
           },
           {
             name:`23年`,
             data:compareList,
             real:realCompareList,
             tradDate:list,
-            howDayNumber:this.howDayNumber
+            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']
           },
         ],
         max:Number(max.toFixed(2)),
@@ -373,7 +397,7 @@ export default {
 
       let phoneInfo = uni.getStorageSync('phoneInfo')
       console.log('phoneInfo',phoneInfo)
-
+      let _this = this
       this.opts2 = {
         // width:phoneInfo.screenHeight+'px',
         // height:(2*phoneInfo.screenWidth)+'px',
@@ -401,11 +425,12 @@ export default {
         yAxis: {
           gridType: "dash",
           dashLength: 2,
-          splitNumber:6,
+          splitNumber:5,
           data: [
             {
               min: 0,
-              max:3000
+              // max:_this.selectFestival===2?2000:3000
+              max: 2000
             }
           ]
         },
@@ -516,6 +541,9 @@ export default {
         .qmBox{
           background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%);
         }
+        .labourBox{
+          background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%);
+        }
         .boxBg{
           z-index: 1;
           position: absolute;
@@ -566,6 +594,9 @@ export default {
         .qmBox{
           background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%);
         }
+        .labourBox{
+           background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%);
+         }
         .boxBg{
           z-index: 1;
           position: absolute;