diff --git a/pages/commercialBI/specialCase.vue b/pages/commercialBI/specialCase.vue
index 5cf8d36..7a8ac2a 100644
--- a/pages/commercialBI/specialCase.vue
+++ b/pages/commercialBI/specialCase.vue
@@ -18,18 +18,18 @@
       <div class="topBox">
         <div class="boxLeft">
           <div class="dimensionBox">
-            <div class="dimensionItem" :class="selectDimension === 1 ? 'selectDimension' : ''"
-              @click="handleDimension(1)">实时预警</div>
-            <div class="dimensionItem" v-if="isShowFestivalTab" :class="selectDimension === 2 ? 'selectDimension' : ''"
-              @click="handleDimension(2)">节日同期</div>
             <div class="dimensionItem" v-if="isShowFestivalTab" :class="selectDimension === 3 ? 'selectDimension' : ''"
               @click="handleDimension(3)">昨日对比</div>
+            <div class="dimensionItem" v-if="isShowFestivalTab" :class="selectDimension === 2 ? 'selectDimension' : ''"
+              @click="handleDimension(2)">节日同期</div>
+            <div class="dimensionItem" :class="selectDimension === 1 ? 'selectDimension' : ''"
+              @click="handleDimension(1)">实时预警</div>
           </div>
           <!--            注: 1个小时入区流量比5月同一时间流量增幅150%以上且每小时入区车辆超过100辆-->
           <span class="notice" v-if="selectTab === 1">{{ selectDimension === 1 ? `注:
             1个小时入区流量比上月同一时间流量增幅150%以上且每小时入区车辆超过100辆` : selectDimension === 2 ? `注: 1个小时入区流量比去年节日同期增幅情况` : `注:
             1个小时入区流量比昨日同时段增幅情况`
-            }}</span>
+          }}</span>
           <span class="notice" v-if="selectTab === 2">{{ selectDimension === 1 ? `注: 前20个从今日零时起至今流量与月均同时段增幅情况` :
             selectDimension === 2 ? `注: 前20个从节日零时起至今流量与去年节日同期增幅情况` : `注: 前20个从今日零时起至今流量与昨日同时段增幅情况` }}</span>
         </div>
@@ -82,7 +82,7 @@
         </div>
 
         <scroll-view class="listBigBox"
-          :style="{ height: selectTab === 1 ? 'calc(100ch - 320px)' : 'calc(100ch - 356px)' }" :scroll-y="true">
+          :style="{ height: selectTab === 1 ? 'calc(100vh - 340px)' : 'calc(100vh - 340px)' }" :scroll-y="true">
           <div class="listItem" v-for="(item, index) in tableList" :key="index">
             <div class="itemLeft">
               <image class="bg" src="https://eshangtech.com/ShopICO/ahyd-BID/car/itemLeftBg.svg" />
@@ -120,21 +120,14 @@
                       </view>
               </div>
               <div class="rightBottom">
-                <span class="distance">{{ item.SERVERPART_DISTANCE ? item.SERVERPART_DISTANCE + 'km' : '' }}</span>
-                <span class="address">{{ item.OWNERUNIT_NAME ? item.OWNERUNIT_NAME + 'km' : '' }}</span>
-                <!--                <view class="rightBottomItem">-->
-                <!--                  <text class="itemLabel">当前车流 /辆</text>-->
-                <!--                  <text class="itemValue">{{ item.VEHICLE_COUNT  || '-'}}</text>-->
-                <!--                </view>-->
-                <!--                <view class="rightBottomItem">-->
-                <!--                  <text class="itemLabel">月均车流 /辆</text>-->
-                <!--                  <text class="itemValue">{{item.MONTHVEHICLE_COUNT || '-'}}</text>-->
-                <!--                </view>-->
-                <view class="goMap" @click="handleGoMap(item)">
-                  <image class="mapIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/car/navigation.svg" />
-                  <text class="mapText">导航</text>
-                </view>
-
+                <div class="actionRow">
+                  <text class="distance">{{ item.SERVERPART_DISTANCE ? item.SERVERPART_DISTANCE + 'km' : '-' }}</text>
+                  <view class="goMap" @click="handleGoMap(item)">
+                    <image class="mapIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/car/navigation.svg" />
+                    <text class="mapText">导航</text>
+                  </view>
+                </div>
+                <text class="address">{{ item.OWNERUNIT_NAME || '-' }}</text>
               </div>
             </div>
           </div>
@@ -167,8 +160,8 @@ export default {
       seat: {},// 当前用户的经纬度位置
       serviceList: [],// 服务区列表
       sortType: 1,// 1正序 2倒序
-      sortNumber: 1,// 1当月 2月均 3增幅
-      selectDimension: 1, // 1: 实时车流, 2: 节日对比, 3: 昨日对比
+      sortNumber: 3,// 1当月 2月均 3增幅
+      selectDimension: 3, // 1: 实时车流, 2: 节日对比, 3: 昨日对比
       festivalList: [
         { label: "25年元旦", start: "2024-12-31", end: "2025-01-02", value: "1", currentYear: 2025, compareYear: 2024 },
         { label: "25年春运", start: "2025-01-14", end: "2025-02-22", value: "2", currentYear: 2025, compareYear: 2024 },
@@ -574,6 +567,7 @@ export default {
       left: 16px;
       top: 100px;
       width: calc(100% - 32px);
+      height: 170rpx;
       display: flex;
       justify-content: space-between;
       align-items: center;
@@ -624,6 +618,7 @@ export default {
           color: #FFFFFF;
           line-height: 16px;
           display: inline-block;
+          height: 70rpx;
         }
       }
 
@@ -719,6 +714,7 @@ export default {
 
     .contentList {
       width: 100%;
+      height: calc(100% - 108rpx);
       box-sizing: border-box;
       padding: 0 32rpx;
 
@@ -1055,215 +1051,225 @@ export default {
 
           .rightBottom {
             display: flex;
-            justify-content: space-between;
-            align-items: center;
+            flex-direction: column;
+            margin-top: 16rpx;
 
-            .distance {
-              display: inline-block;
-              width: 120rpx;
-              overflow: hidden;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-              font-size: 24rpx;
-              font-family: PingFangSC, PingFang SC;
-              font-weight: 400;
-              color: #786B6C;
-              line-height: 36rpx;
+            .actionRow {
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              width: 100%;
+              margin-bottom: 8rpx;
+
+              .distance {
+                font-size: 24rpx;
+                font-family: DINAlternate-Bold, DINAlternate;
+                font-weight: bold;
+                color: #786B6C;
+                line-height: normal;
+              }
+
+              .goMap {
+                display: flex;
+                align-items: center;
+                padding: 6rpx 20rpx;
+                background: linear-gradient(135deg, #4983FD 0%, #2A6DFF 100%);
+                box-sizing: border-box;
+                border-radius: 24rpx;
+                box-shadow: 0 4rpx 8rpx rgba(73, 131, 253, 0.2);
+
+                .mapIcon {
+                  width: 24rpx;
+                  height: 24rpx;
+                  margin-right: 8rpx;
+                }
+
+                .mapText {
+                  color: #fff;
+                  font-size: 22rpx;
+                  font-weight: 500;
+                  line-height: normal;
+                }
+
+                &:active {
+                  opacity: 0.8;
+                  transform: scale(0.95);
+                }
+              }
             }
 
             .address {
               font-size: 24rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
-              color: #786B6C;
-              line-height: 36rpx;
-              display: inline-block;
-              width: 200rpx;
-              overflow: hidden;
+              color: #9A9A9A;
+              line-height: normal;
               white-space: nowrap;
+              overflow: hidden;
               text-overflow: ellipsis;
+              width: 100%;
+            }
+          }
+
+          .rightBottomItem {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+
+            .itemLabel {
+              font-size: 24rpx;
+              font-family: PingFangSC, PingFang SC;
+              font-weight: 400;
+              color: #9A9A9A;
+              line-height: 36rpx;
             }
 
-            .goMap {
-              display: flex;
-              align-items: center;
-              padding: 4rpx 8rpx;
-              background: #4e92f6;
-              box-sizing: border-box;
-              border-radius: 8rpx;
-
-              .mapIcon {
-                width: 20rpx;
-                height: 20rpx;
-                margin-right: 6rpx;
-              }
-
-              .mapText {
-                color: #fff;
-                font-size: 22rpx;
-              }
+            .itemValue {
+              font-size: 28rpx;
+              font-family: DINAlternate, DINAlternate;
+              font-weight: bold;
+              color: #160002;
+              line-height: 32rpx;
+              margin-top: 8rpx;
             }
 
-            .rightBottomItem {
-              display: flex;
-              flex-direction: column;
-              align-items: center;
-
-              .itemLabel {
-                font-size: 24rpx;
-                font-family: PingFangSC, PingFang SC;
-                font-weight: 400;
-                color: #9A9A9A;
-                line-height: 36rpx;
-              }
-
-              .itemValue {
-                font-size: 28rpx;
-                font-family: DINAlternate, DINAlternate;
-                font-weight: bold;
-                color: #160002;
-                line-height: 32rpx;
-                margin-top: 8rpx;
-              }
-
-            }
           }
         }
       }
-
-      //.listItem{
-      //  margin-bottom: 12px;
-      //  border: 1px solid #D9DBE0;
-      //  border-radius: 8px;
-      //  position: relative;
-      //  .bg{
-      //    position: absolute;
-      //    right: 0;top: 0;
-      //    width: 97px;
-      //    height: 97px;
-      //  }
-      //  .listBox{
-      //    width: 100%;
-      //    box-sizing: border-box;
-      //    padding: 12px 16px;
-      //    background: linear-gradient(314deg, #EAEFFF 0%, #F3F5FF 32%, #F5FCFF 50%, #F0F7FF 67%, #DBE5FF 100%);
-      //    border-bottom: 1px solid #D9DBE0;
-      //    border-radius: 8px;
-      //    .itemTop{
-      //      width: 100%;
-      //      display: flex;
-      //      justify-content: space-between;
-      //      align-items: center;
-      //      .itemLeft{
-      //        display: inline-block;
-      //        padding: 4px 12px;
-      //        background: rgba(26, 95, 255, 0.1);
-      //        border-radius: 14px;
-      //        .itemFixed{
-      //          width: 12px;
-      //          height: 14px;
-      //          margin-right: 4px;
-      //        }
-      //        .serverName{
-      //          font-size: 16px;
-      //          font-family: DINAlternate-Bold, DINAlternate;
-      //          font-weight: bold;
-      //          white-space: nowrap;
-      //          color: #1A5FFF;
-      //          line-height: 22px
-      //        }
-      //      }
-      //      .itemRight{
-      //        display: flex;
-      //        align-items: center;
-      //        .entryRate{
-      //          display: flex;
-      //          flex-direction: column;
-      //          .entryValue{
-      //            font-size: 16px;
-      //            font-family: DINAlternate-Bold, DINAlternate;
-      //            font-weight: bold;
-      //            color: red;
-      //            line-height: 24px;
-      //            white-space: nowrap;
-      //          }
-      //          .entryLabel{
-      //            font-size: 14px;
-      //            font-family: PingFangSC-Regular, PingFang SC;
-      //            font-weight: 400;
-      //            color: #786B6C;
-      //            line-height: 20px;
-      //          }
-      //        }
-      //        .img{
-      //          width: 26px;
-      //          height: 14px;
-      //        }
-      //
-      //      }
-      //    }
-      //    .itemDetail{
-      //      margin-top: 16px;
-      //      width: 100%;
-      //      display: flex;
-      //      justify-content: space-between;
-      //      align-items: center;
-      //      .message{
-      //        display: flex;
-      //        flex-direction: column;
-      //        .cirRate{
-      //          width: 40px;
-      //          height: 40px;
-      //        }
-      //        .label{
-      //          font-size: 14px;
-      //          font-family: PingFangSC-Regular, PingFang SC;
-      //          font-weight: 400;
-      //          color: #786B6C;
-      //          line-height: 20px
-      //        }
-      //        .value{
-      //          font-size: 20px;
-      //          font-family: DINAlternate-Bold, DINAlternate;
-      //          font-weight: bold;
-      //          color: #160002;
-      //          line-height: 24px;
-      //          white-space: nowrap;
-      //        }
-      //      }
-      //    }
-      //  }
-      //  .childList{
-      //    border-radius: 8px 8px 0 0;
-      //    box-sizing: border-box;
-      //    margin-left: 16px;
-      //    width: calc(100% - 32px);
-      //    display: flex;
-      //    align-items: center;
-      //    justify-content: space-between;
-      //    padding: 8px;
-      //    .childItem{
-      //      width: calc(100% / 3);
-      //      display: flex;
-      //      flex-direction: column;
-      //      .childLabel{
-      //        font-size: 14px;
-      //        font-family: PingFangSC-Regular, PingFang SC;
-      //        font-weight: 400;
-      //        color: #786B6C;
-      //        line-height: 20px
-      //      }
-      //      .childValue{
-      //        font-size: 18px;
-      //        font-family: DINAlternate-Bold, DINAlternate;
-      //        font-weight: bold;
-      //        color: #160002;
-      //        line-height: 24px;
-      //      }
-      //    }
-      //  }
-      //}
     }
+
+    //.listItem{
+    //  margin-bottom: 12px;
+    //  border: 1px solid #D9DBE0;
+    //  border-radius: 8px;
+    //  position: relative;
+    //  .bg{
+    //    position: absolute;
+    //    right: 0;top: 0;
+    //    width: 97px;
+    //    height: 97px;
+    //  }
+    //  .listBox{
+    //    width: 100%;
+    //    box-sizing: border-box;
+    //    padding: 12px 16px;
+    //    background: linear-gradient(314deg, #EAEFFF 0%, #F3F5FF 32%, #F5FCFF 50%, #F0F7FF 67%, #DBE5FF 100%);
+    //    border-bottom: 1px solid #D9DBE0;
+    //    border-radius: 8px;
+    //    .itemTop{
+    //      width: 100%;
+    //      display: flex;
+    //      justify-content: space-between;
+    //      align-items: center;
+    //      .itemLeft{
+    //        display: inline-block;
+    //        padding: 4px 12px;
+    //        background: rgba(26, 95, 255, 0.1);
+    //        border-radius: 14px;
+    //        .itemFixed{
+    //          width: 12px;
+    //          height: 14px;
+    //          margin-right: 4px;
+    //        }
+    //        .serverName{
+    //          font-size: 16px;
+    //          font-family: DINAlternate-Bold, DINAlternate;
+    //          font-weight: bold;
+    //          white-space: nowrap;
+    //          color: #1A5FFF;
+    //          line-height: 22px
+    //        }
+    //      }
+    //      .itemRight{
+    //        display: flex;
+    //        align-items: center;
+    //        .entryRate{
+    //          display: flex;
+    //          flex-direction: column;
+    //          .entryValue{
+    //            font-size: 16px;
+    //            font-family: DINAlternate-Bold, DINAlternate;
+    //            font-weight: bold;
+    //            color: red;
+    //            line-height: 24px;
+    //            white-space: nowrap;
+    //          }
+    //          .entryLabel{
+    //            font-size: 14px;
+    //            font-family: PingFangSC-Regular, PingFang SC;
+    //            font-weight: 400;
+    //            color: #786B6C;
+    //            line-height: 20px;
+    //          }
+    //        }
+    //        .img{
+    //          width: 26px;
+    //          height: 14px;
+    //        }
+    //
+    //      }
+    //    }
+    //    .itemDetail{
+    //      margin-top: 16px;
+    //      width: 100%;
+    //      display: flex;
+    //      justify-content: space-between;
+    //      align-items: center;
+    //      .message{
+    //        display: flex;
+    //        flex-direction: column;
+    //        .cirRate{
+    //          width: 40px;
+    //          height: 40px;
+    //        }
+    //        .label{
+    //          font-size: 14px;
+    //          font-family: PingFangSC-Regular, PingFang SC;
+    //          font-weight: 400;
+    //          color: #786B6C;
+    //          line-height: 20px
+    //        }
+    //        .value{
+    //          font-size: 20px;
+    //          font-family: DINAlternate-Bold, DINAlternate;
+    //          font-weight: bold;
+    //          color: #160002;
+    //          line-height: 24px;
+    //          white-space: nowrap;
+    //        }
+    //      }
+    //    }
+    //  }
+    //  .childList{
+    //    border-radius: 8px 8px 0 0;
+    //    box-sizing: border-box;
+    //    margin-left: 16px;
+    //    width: calc(100% - 32px);
+    //    display: flex;
+    //    align-items: center;
+    //    justify-content: space-between;
+    //    padding: 8px;
+    //    .childItem{
+    //      width: calc(100% / 3);
+    //      display: flex;
+    //      flex-direction: column;
+    //      .childLabel{
+    //        font-size: 14px;
+    //        font-family: PingFangSC-Regular, PingFang SC;
+    //        font-weight: 400;
+    //        color: #786B6C;
+    //        line-height: 20px
+    //      }
+    //      .childValue{
+    //        font-size: 18px;
+    //        font-family: DINAlternate-Bold, DINAlternate;
+    //        font-weight: bold;
+    //        color: #160002;
+    //        line-height: 24px;
+    //      }
+    //    }
+    //  }
+    //}
   }
 }
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index dfba613..789802e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -8,13 +8,13 @@
     <!--  刚开始的悬浮广告  -->
     <view class="advertisement" v-if="showAdvertisement">
       <view :class="isShowCloseAnimal
-        ? 'advertisementNormalContent advertisementContent' 
+        ? 'advertisementNormalContent advertisementContent'
         : 'advertisementNormalContent'
         ">
         <!--        <span class="text">2024年五一假期预测</span>-->
         <img class="topImg" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/advertisementTitle.png" />
         <div style="
-            display: inline-block;
+            display: inline-block;  
             width: 200px;
             height: 400px;
             overflow: hidden;
@@ -1229,11 +1229,12 @@
                                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/examine/reduce.svg'
                                         : ''
                                       " />
-                                    <text class="otherDetailAddValue">{{
-                                      showTableData.yearYoY
-                                        ? showTableData.yearYoY + "%"
-                                        : ""
-                                    }}</text>
+                                    <text class="otherDetailAddValue"
+                                      :style="{ color: showTableData.yearYoY > 0 ? '#e83944' : showTableData.yearYoY < 0 ? '#0E9976' : '' }">{{
+                                        showTableData.yearYoY
+                                          ? showTableData.yearYoY + "%"
+                                          : ""
+                                      }}</text>
                                   </view>
                                   <view class="otherDetailAddLabel">同比</view>
                                 </view>
@@ -3259,7 +3260,7 @@
                   <div class="warningBox">
                     <image class="warningIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carIcon.svg" />
                     <div class="trafficBox">
-                      <text class="trafficCar">车流预警</text>
+                      <text class="trafficCar">{{ isShowFestival ? '昨日车流对比' : '车流预警' }}</text>
                       <text class="trafficUnit"> /Top3</text>
                       <!--                <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/carMoreIcon.svg"/>-->
                     </div>
@@ -4151,48 +4152,64 @@ export default {
           title: "元旦",
           startTime: "2025-12-31",
           endTime: "2026-01-04",
+          curYear: 2026,
+          lastYear: 2025
         }, //
         spring: {
           name: "spring",
           title: "平安春运",
           startTime: "2026-02-02",
           endTime: "2026-03-14",
+          curYear: 2026,
+          lastYear: 2025
         }, // 春运
         qm: {
           name: "qm",
           title: "清明节",
           startTime: "2026-04-03",
           endTime: "2026-04-07",
+          curYear: 2026,
+          lastYear: 2025
         }, // 清明节
         labour: {
           name: "labour",
           title: "劳动节",
           startTime: "2026-04-30",
           endTime: "2026-05-06",
+          curYear: 2026,
+          lastYear: 2025
         }, // 劳动节
         dragonBoat: {
           name: "dragonBoat",
           title: "端午节",
           startTime: "2026-06-18",
           endTime: "2026-06-22",
+          curYear: 2026,
+          lastYear: 2025
         },
         summerHoliday: {
           name: "summerHoliday",
           title: "火热暑运",
           startTime: "2026-06-30",
           endTime: "2026-08-31",
+          curYear: 2026,
+          lastYear: 2025
         }, // 暑假
         midAutumn: {
           name: "midAutumn",
           title: "中秋节",
           startTime: "2026-09-24",
           endTime: "2026-09-28",
+          curYear: 2026,
+          lastYear: 2025
         }, // 中秋节
         nationalDay: {
           name: "nationalDay",
           title: "国庆节",
           startTime: "2026-09-30", // 说要提早两天显示节日的图标 没有数据也没关系 2024-09-30
           endTime: "2026-10-08",
+          curYear: 2026,
+          lastYear: 2025
         }, // 国庆节
         // spring: {
         //   name: "spring",
@@ -4237,6 +4254,7 @@ export default {
         //   endTime: "2025-10-09",
         // }, // 国庆节 
       }, // 2024年的全部节日
+      currentFestivalObj: {},// 当前选择的节日
       allselectVersion3Obj: {}, //累计
       selectVersion3Obj: {}, //正常
       smallTab: 1, // 演示版的几个显示样式
@@ -4297,6 +4315,22 @@ export default {
 
 
           if (!this.isReturn) {
+
+            for (let key in this.festivalObj) {
+              let obj = this.festivalObj[key];
+              if (
+                new Date(obj.startTime).getTime() <= new Date(this.lastDay).getTime() &&
+                new Date(this.lastDay).getTime() < new Date(obj.endTime).getTime()
+              ) {
+                this.isShowFestival = obj.name
+                this.currentFestivalObj = obj
+              }
+            }
+            if (!this.isShowFestival) {
+              this.isShowFestival = "other";
+            }
+            uni.setStorageSync("festival", this.isShowFestival);
+
             this.getData(this.option);
             this.handleNoticeMonth();
             this.handleNoticeYear();
@@ -4362,7 +4396,8 @@ export default {
         new Date(obj.startTime).getTime() <= new Date(this.lastDay).getTime() &&
         new Date(this.lastDay).getTime() < new Date(obj.endTime).getTime()
       ) {
-        this.isShowFestival = obj.name;
+        this.isShowFestival = obj.name
+        this.currentFestivalObj = obj
       }
     }
     if (!this.isShowFestival) {
@@ -4631,7 +4666,7 @@ export default {
       let m = date.getMonth() + 1;
       const req = {
         calcType: 1, //计算方式：1【当月】，2【累计】
-        pushProvinceCode: this.useInfo.userData.ProvinceCode || "340000",
+        pushProvinceCode: this.useInfo.userData ? this.useInfo.userData.ProvinceCode : "340000",
         curYear: y, //本年年份
         compareYear: y - 1, //历年年份
         StatisticsMonth: this.selectMonth, //结算月份
@@ -4643,7 +4678,7 @@ export default {
       );
       const allReq = {
         calcType: 2, //计算方式：1【当月】，2【累计】
-        pushProvinceCode: this.useInfo.userData.ProvinceCode || "340000",
+        pushProvinceCode: this.useInfo.userData ? this.useInfo.userData.ProvinceCode : "340000",
         curYear: y, //本年年份
         compareYear: y - 1, //历年年份
         StatisticsMonth: this.selectMonth, //结算月份
@@ -4805,7 +4840,7 @@ export default {
     // 拿到国庆数据
     async handleGetNationalData() {
       let req = {
-        pushProvinceCode: this.useInfo.userData.ProvinceCode || "340000",
+        pushProvinceCode: this.useInfo.userData ? this.useInfo.userData.ProvinceCode : "340000",
         StatisticsEndDate: this.lastDay,
         ShowGrowthRate: true,
       };
@@ -5166,7 +5201,7 @@ export default {
     // 实时营收
     handleRealRevenue() {
       let req = {
-        pushProvinceCode: this.useInfo.userData.ProvinceCode || "340000",
+        pushProvinceCode: this.useInfo.userData ? this.useInfo.userData.ProvinceCode : "340000",
         StatisticsDate: this.nowDay,
       };
       request
@@ -5191,44 +5226,89 @@ export default {
         d = "0" + d;
       }
 
-      const req = {
-        // this.single
-        StatisticsDate:
-          h === 0
-            ? moment(`${y}-${m}-${d}`).subtract(1, "day").format("YYYY-MM-DD")
-            : `${y}-${m}-${d}`,
-        StatisticsHour: h === 0 ? 23 : h - 1,
-        StatisticsType: 1,
-        ShowCount: 20,
-      };
-      request
-        .$webGet("CommercialApi/BigData/GetBayonetWarning", req)
-        .then((res) => {
-          if (res.Result_Data.List && res.Result_Data.List.length > 0) {
-            this.special = true;
-          }
-          res.Result_Data.List.forEach((item) => {
-            item.name = item.SERVERPART_NAME.split("服务区")[0];
-          });
-          let list = JSON.parse(JSON.stringify(res.Result_Data.List));
-          for (let i = 0; i <= list.length - 1; i++) {
-            for (let j = 0; j <= list.length - i - 1; j++) {
-              if (
-                list[j] &&
-                list[j + 1] &&
-                list[j].VEHICLE_COUNT !== null &&
-                list[j + 1].VEHICLE_COUNT !== null
-              ) {
-                if (list[j].VEHICLE_COUNT < list[j + 1].VEHICLE_COUNT) {
-                  let temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
+      console.log('this.currentFestivalObj', this.currentFestivalObj);
+
+      // 判断一下因为首页现在要昨日的  那么就是得 看看有没有节日 有节日才输出
+      if (!this.isShowFestival) {
+        const req = {
+          // this.single
+          StatisticsDate:
+            h === 0
+              ? moment(`${y}-${m}-${d}`).subtract(1, "day").format("YYYY-MM-DD")
+              : `${y}-${m}-${d}`,
+          StatisticsHour: h === 0 ? 23 : h - 1,
+          StatisticsType: 1,
+          ShowCount: 20,
+
+        };
+        request
+          .$webGet("CommercialApi/BigData/GetBayonetWarning", req)
+          .then((res) => {
+            if (res.Result_Data.List && res.Result_Data.List.length > 0) {
+              this.special = true;
+            }
+            res.Result_Data.List.forEach((item) => {
+              item.name = item.SERVERPART_NAME.split("服务区")[0];
+            });
+            let list = JSON.parse(JSON.stringify(res.Result_Data.List));
+            for (let i = 0; i <= list.length - 1; i++) {
+              for (let j = 0; j <= list.length - i - 1; j++) {
+                if (
+                  list[j] &&
+                  list[j + 1] &&
+                  list[j].VEHICLE_COUNT !== null &&
+                  list[j + 1].VEHICLE_COUNT !== null
+                ) {
+                  if (list[j].VEHICLE_COUNT < list[j + 1].VEHICLE_COUNT) {
+                    let temp = list[j];
+                    list[j] = list[j + 1];
+                    list[j + 1] = temp;
+                  }
                 }
               }
             }
+            this.warningList = list.slice(0, 3);
+          });
+      } else {
+        let holidayObj = {
+          "newYearDay": 1,
+          "spring": 2,
+          "qm": 3,
+          "labour": 4,
+          "dragonBoat": 5,
+          "summerHoliday": 6,
+          "midAutumn": 7,
+          "nationalDay": 8,
+        }
+        // 到这里说明 首页是节假日 
+        let req = {
+          StatisticsDate:
+            h === 0
+              ? moment(`${y}-${m}-${d}`).subtract(1, "day").format("YYYY-MM-DD")
+              : `${y}-${m}-${d}`,
+          StatisticsHour: h === 0 ? 23 : h - 1,
+          StatisticsType: 5, // 1: 预警, 2: 排行
+          HolidayType: holidayObj[this.isShowFestival],
+          curYear: this.currentFestivalObj.curYear,
+          compareYear: this.currentFestivalObj.lastYear,
+          ShowCount: 20,
+        }
+        console.log('fjdjafjsa', req);
+
+        request.$webGet('CommercialApi/BigData/GetHolidayBayonetWarning', req).then((res) => {
+          const list = res.Result_Data.List || [];
+          if (list.length > 0) {
+            this.special = true;
+            // 预处理名称
+            list.forEach((item) => {
+              item.name = item.SERVERPART_NAME ? item.SERVERPART_NAME.split("服务区")[0] : "";
+            });
+            // 使用原生 sort 降序排序
+            list.sort((a, b) => (b.VEHICLE_RATE || 0) - (a.VEHICLE_RATE || 0));
           }
           this.warningList = list.slice(0, 3);
-        });
+        })
+      }
     },
     handleGoMap() {
       this.$util.toNextRoute("navigateTo", "/pages/map/index?type=index");
@@ -5556,7 +5636,7 @@ export default {
         DataType: 1,
         StartMonth: date,
         EndMonth: date,
-        provinceCode: this.useInfo.userData.ProvinceCode || "340000",
+        provinceCode: this.useInfo.userData ? this.useInfo.userData.ProvinceCode : "340000",
       };
 
       request
@@ -5605,7 +5685,7 @@ export default {
       const req = {
         StartDate: obj && obj.start ? obj.start : this.lastDay,
         EndDate: obj && obj.end ? obj.end : this.lastDay,
-        provinceCode: this.useInfo.userData.ProvinceCode || "340000",
+        provinceCode: this.useInfo.userData ? this.useInfo.userData.ProvinceCode : "340000",
       };
       request
         .$webGet("CommercialApi/Examine/GetPatrolAnalysis", req)
@@ -5661,20 +5741,20 @@ export default {
       if (type) {
         if (nowDate.getMonth() + 1 === this.selectMonth) {
           req = {
-            pushProvinceCode: this.useInfo.userData.ProvinceCode || "340000",
+            pushProvinceCode: this.useInfo.userData ? this.useInfo.userData.ProvinceCode : "340000",
             StatisticsMonth: `${nowDate.getFullYear()}${month}`,
             StatisticsDate: this.lastDay,
           };
         } else {
           req = {
-            pushProvinceCode: this.useInfo.userData.ProvinceCode || "340000",
+            pushProvinceCode: this.useInfo.userData ? this.useInfo.userData.ProvinceCode : "340000",
             StatisticsMonth: `${nowDate.getFullYear()}${month}`,
             StatisticsDate: this.lastDay,
           };
         }
       } else {
         req = {
-          pushProvinceCode: this.useInfo.userData.ProvinceCode || "340000",
+          pushProvinceCode: this.useInfo.userData ? this.useInfo.userData.ProvinceCode : "340000",
           StatisticsMonth: `${nowDate.getFullYear()}${month}`,
           StatisticsDate: type ? null : this.lastDay,
         };
@@ -5929,7 +6009,7 @@ export default {
         time = `${y}${m}`;
       }
       const req = {
-        Province_Code: this.useInfo.userData.ProvinceCode || "340000",
+        Province_Code: this.useInfo.userData ? this.useInfo.userData.ProvinceCode : "340000",
         Statistics_Date: time,
       };
       request
diff --git a/pages/nationalPage/merchantRevenue.vue b/pages/nationalPage/merchantRevenue.vue
index bfe1574..6410d5a 100644
--- a/pages/nationalPage/merchantRevenue.vue
+++ b/pages/nationalPage/merchantRevenue.vue
@@ -31,11 +31,12 @@
                   : selectFestival === 8
                     ? 'header headerNationalDay'
                     : ''
-        " :style="{ height: menu.height + menu.top + 'px', top: 0 + 'px' }">
-        <image :style="{ bottom: (statusBarHeight - 24) / 4 + 'px' }" class="backArrow"
+        " :style="{ height: menu.height + menu.top + 24 + 'px', top: 0 + 'px' }">
+        <image :style="{ top: menu.top + '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">
+        <div v-if="showSpring" class="picker" @click="handleGoMap"
+          :style="{ top: (menu.bottom - menu.height) - (40 - menu.height) + 'px' }">
           <div class="selectService">
             <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
             <view class="select">
@@ -53,10 +54,13 @@
           </div>
         </div>
 
-        <view v-else class="seachBox" :style="{ height: menu.height + 'px' }" @click="handleGoMap">
-          <image class="searchIcon" src="/static/images/seach/searchIcon.svg" />
+        <view v-else class="seachBox" :style="{ top: (menu.bottom - menu.height) - (40 - menu.height) + 'px' }"
+          @click="handleGoMap">
+          <image class="searchIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/searchIconService.svg" />
           <text class="searchText">请输入想看的服务区</text>
         </view>
+        <image v-if="selectFestival === 1 || selectFestival === 2" class="titleSvg" :style="{ bottom: '-20rpx' }"
+          src="https://eshangtech.com/ShopICO/ahyd-BID/examine/serviceDetail.svg" />
       </div>
 
       <!--      <scroll-view :style="{top:menu.bottom + 24 + 'px' }" scroll-x="true" class="headerNavList" :scrollIntoView="currentServerPart" :scroll-with-animation="true">-->
@@ -84,7 +88,7 @@
           <div class="left">
             <!--            <img class="detailLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png"/>-->
             <img class="detailLogo" :src="selectFestival === 1 || selectFestival === 2
-              ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png'
+              ? 'https://eshangtech.com/ShopICO/ahyd-BID/examine/merchantRevenue.png'
               : selectFestival === 3
                 ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmServicepartDetail.png'
                 : selectFestival === 4
@@ -892,6 +896,7 @@ export default {
         bottom: 0;
         left: 60px;
         width: 400rpx;
+        height: 80rpx;
         background: #fff;
         border-radius: 32rpx;
         margin-left: 16rpx;
@@ -916,10 +921,18 @@ export default {
         }
       }
 
+
+      .titleSvg {
+        width: 208rpx;
+        height: 48rpx;
+        position: absolute;
+        left: 40rpx;
+      }
+
       .picker {
         position: absolute;
-        bottom: 0;
-        left: 40px;
+        // bottom: 0;
+        left: 45px;
 
         .selectService {
           display: flex;
@@ -1082,8 +1095,8 @@ export default {
 
         .left {
           .detailLogo {
-            width: 178rpx;
-            height: 32rpx;
+            width: 138rpx;
+            height: 30rpx;
           }
 
           .modalUnit {
diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue
index 030bef4..60db332 100644
--- a/pages/nationalPage/rankPage.vue
+++ b/pages/nationalPage/rankPage.vue
@@ -34,6 +34,9 @@
         " :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" />
+        <image v-if="selectFestival === 1 || selectFestival === 2"
+          :style="{ bottom: (statusBarHeight - 24) / 4 + 'px' }" class="titleSvg"
+          src="https://eshangtech.com/ShopICO/ahyd-BID/examine/customerSales.svg" />
       </div>
     </div>
 
@@ -1085,7 +1088,15 @@ export default {
         margin-right: 16px;
         position: absolute;
       }
+
+      .titleSvg {
+        width: 166rpx;
+        height: 48rpx;
+        position: absolute;
+        left: 100rpx;
+      }
     }
+
   }
 
   .contentPage {
diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue
index 4503983..037e218 100644
--- a/pages/nationalPage/springTravel.vue
+++ b/pages/nationalPage/springTravel.vue
@@ -536,60 +536,60 @@
                         </div>
                       </div>
                     </div>
-                    <!--  餐饮客房  -->
+                    <!--  餐饮  -->
                     <div class="bigBox">
                       <div class="row">
                         <div class="valueItem son" :style="{
                           width: 'calc(100% - 430rpx)',
                           textAlign: 'left',
                         }">
-                          餐饮客房
+                          餐饮
                         </div>
                         <div class="valueItemBox" style="width: 110rpx">
                           {{
-                            pageData.curYearSCRevenue.data
+                            pageData.curYearSRRevenue.data
                               ? $util.getMoney(
-                                pageData.curYearSCRevenue.data / 10000
+                                pageData.curYearSRRevenue.data / 10000
                               )
                               : "0.00"
                           }}
                         </div>
                         <div class="valueItemBox" style="width: 110rpx">
                           {{
-                            pageData.lYearSCRevenue.data
+                            pageData.lYearSRRevenue.data
                               ? $util.getMoney(
-                                pageData.lYearSCRevenue.data / 10000
+                                pageData.lYearSRRevenue.data / 10000
                               )
                               : "0.00"
                           }}
                         </div>
                         <div class="addItem" style="width: 110rpx">
                           <span>{{
-                            GRORevenueNumber > 0
+                            SRRevenueNumber > 0
                               ? "+"
-                              : GRORevenueNumber < 0 ? "" : "" }}</span>
-                              <span>{{ `${GRORevenueNumber || "-"}` }}</span>
+                              : SRRevenueNumber < 0 ? "" : "" }}</span>
+                              <span>{{ `${SRRevenueNumber || "-"}` }}</span>
                         </div>
                         <div class="addItem" style="width: 110rpx">
                           <span :style="{
                             color:
-                              GRORevenueAdd > 0
+                              SRRevenueAdd > 0
                                 ? '#E83944'
-                                : GRORevenueAdd < 0
+                                : SRRevenueAdd < 0
                                   ? '#0E9976'
                                   : '',
                           }">{{
-                            GRORevenueAdd > 0
+                            SRRevenueAdd > 0
                               ? "+"
-                              : GRORevenueAdd < 0 ? "" : "" }}</span>
+                              : SRRevenueAdd < 0 ? "" : "" }}</span>
                               <span :style="{
                                 color:
-                                  GRORevenueAdd > 0
+                                  SRRevenueAdd > 0
                                     ? '#E83944'
-                                    : GRORevenueAdd < 0
+                                    : SRRevenueAdd < 0
                                       ? '#0E9976'
                                       : '',
-                              }">{{ `${GRORevenueAdd || "-"}%` }}</span>
+                              }">{{ `${SRRevenueAdd || "-"}%` }}</span>
                         </div>
                       </div>
                       <div class="row" style="margin-top: 16rpx" v-if="false">
@@ -622,6 +622,64 @@
                         </div>
                       </div>
                     </div>
+                    <!-- 客房 -->
+                    <div class="bigBox">
+                      <div class="row">
+                        <div class="valueItem son" :style="{
+                          width: 'calc(100% - 430rpx)',
+                          textAlign: 'left',
+                        }">
+                          客房
+                        </div>
+                        <div class="valueItemBox" style="width: 110rpx">
+                          {{
+                            pageData.curYearGRORevenue.data
+                              ? $util.getMoney(
+                                pageData.curYearGRORevenue.data / 10000
+                              )
+                              : "0.00"
+                          }}
+                        </div>
+                        <div class="valueItemBox" style="width: 110rpx">
+                          {{
+                            pageData.lYearGRORevenue.data
+                              ? $util.getMoney(
+                                pageData.lYearGRORevenue.data / 10000
+                              )
+                              : "0.00"
+                          }}
+                        </div>
+                        <div class="addItem" style="width: 110rpx">
+                          <span>{{
+                            lYearGRORevenueNumber > 0
+                              ? "+"
+                              : lYearGRORevenueNumber < 0 ? "" : "" }}</span>
+                              <span>{{ `${lYearGRORevenueNumber || "-"}` }}</span>
+                        </div>
+                        <div class="addItem" style="width: 110rpx">
+                          <span :style="{
+                            color:
+                              lYearGRORevenueAdd > 0
+                                ? '#E83944'
+                                : lYearGRORevenueAdd < 0
+                                  ? '#0E9976'
+                                  : '',
+                          }">{{
+                            lYearGRORevenueAdd > 0
+                              ? "+"
+                              : lYearGRORevenueAdd < 0 ? "" : "" }}</span>
+                              <span :style="{
+                                color:
+                                  lYearGRORevenueAdd > 0
+                                    ? '#E83944'
+                                    : lYearGRORevenueAdd < 0
+                                      ? '#0E9976'
+                                      : '',
+                              }">{{ `${lYearGRORevenueAdd || "-"}%` }}</span>
+                        </div>
+                      </div>
+                    </div>
+
                     <!--  外包  -->
                     <div class="bigBox">
                       <div class="row">
@@ -1113,60 +1171,117 @@
                         </div>
                       </div>
                     </div>
-                    <!--  餐饮客房  -->
+                    <!--  餐饮  -->
                     <div class="bigBox">
                       <div class="row">
                         <div class="valueItem son" :style="{
                           width: 'calc(100% - 430rpx)',
                           textAlign: 'left',
                         }">
-                          餐饮客房
+                          餐饮
                         </div>
                         <div class="valueItemBox" style="width: 110rpx">
                           {{
-                            pageData.curYearSCAccount.data
+                            pageData.curYearSRAccount.data
                               ? $util.getMoney(
-                                pageData.curYearSCAccount.data / 10000
+                                pageData.curYearSRAccount.data / 10000
                               )
                               : "0.00"
                           }}
                         </div>
                         <div class="valueItemBox" style="width: 110rpx">
                           {{
-                            pageData.lYearSCAccount.data
+                            pageData.lYearSRAccount.data
                               ? $util.getMoney(
-                                pageData.lYearSCAccount.data / 10000
+                                pageData.lYearSRAccount.data / 10000
                               )
                               : "0.00"
                           }}
                         </div>
                         <div class="addItem" style="width: 110rpx">
                           <span>{{
-                            tradeSCAAccountNumber > 0
+                            SRAccountAccountNumber > 0
                               ? "+"
-                              : tradeSCAAccountNumber < 0 ? "" : "" }}</span>
-                              <span>{{ `${tradeSCAAccountNumber || "-"}` }}</span>
+                              : SRAccountAccountNumber < 0 ? "" : "" }}</span>
+                              <span>{{ `${SRAccountAccountNumber || "-"}` }}</span>
                         </div>
                         <div class="addItem" style="width: 110rpx">
                           <span :style="{
                             color:
-                              tradeSCAAccountAdd > 0
+                              SRAccountAccountAdd > 0
                                 ? '#E83944'
-                                : tradeSCAAccountAdd < 0
+                                : SRAccountAccountAdd < 0
                                   ? '#0E9976'
                                   : '',
                           }">{{
-                            tradeSCAAccountAdd > 0
+                            SRAccountAccountAdd > 0
                               ? "+"
-                              : tradeSCAAccountAdd < 0 ? "" : "" }}</span>
+                              : SRAccountAccountAdd < 0 ? "" : "" }}</span>
                               <span :style="{
                                 color:
-                                  tradeSCAAccountAdd > 0
+                                  SRAccountAccountAdd > 0
                                     ? '#E83944'
-                                    : tradeSCAAccountAdd < 0
+                                    : SRAccountAccountAdd < 0
                                       ? '#0E9976'
                                       : '',
-                              }">{{ `${tradeSCAAccountAdd || "-"}%` }}</span>
+                              }">{{ `${SRAccountAccountAdd || "-"}%` }}</span>
+                        </div>
+                      </div>
+                    </div>
+                    <!-- 客房 -->
+                    <div class="bigBox">
+                      <div class="row">
+                        <div class="valueItem son" :style="{
+                          width: 'calc(100% - 430rpx)',
+                          textAlign: 'left',
+                        }">
+                          客房
+                        </div>
+                        <div class="valueItemBox" style="width: 110rpx">
+                          {{
+                            pageData.curYearGROAccount.data
+                              ? $util.getMoney(
+                                pageData.curYearGROAccount.data / 10000
+                              )
+                              : "0.00"
+                          }}
+                        </div>
+                        <div class="valueItemBox" style="width: 110rpx">
+                          {{
+                            pageData.lYearGROAccount.data
+                              ? $util.getMoney(
+                                pageData.lYearGROAccount.data / 10000
+                              )
+                              : "0.00"
+                          }}
+                        </div>
+                        <div class="addItem" style="width: 110rpx">
+                          <span>{{
+                            radeSCAAccountNumber > 0
+                              ? "+"
+                              : radeSCAAccountNumber < 0 ? "" : "" }}</span>
+                              <span>{{ `${radeSCAAccountNumber || "-"}` }}</span>
+                        </div>
+                        <div class="addItem" style="width: 110rpx">
+                          <span :style="{
+                            color:
+                              radeSCAAccountAdd > 0
+                                ? '#E83944'
+                                : radeSCAAccountAdd < 0
+                                  ? '#0E9976'
+                                  : '',
+                          }">{{
+                            radeSCAAccountAdd > 0
+                              ? "+"
+                              : radeSCAAccountAdd < 0 ? "" : "" }}</span>
+                              <span :style="{
+                                color:
+                                  radeSCAAccountAdd > 0
+                                    ? '#E83944'
+                                    : radeSCAAccountAdd < 0
+                                      ? '#0E9976'
+                                      : '',
+                              }">{{ `${radeSCAAccountAdd || "-"}%` }}</span>
                         </div>
                       </div>
                     </div>
@@ -1954,57 +2069,110 @@
                           }">{{ `${revenueStoreAdd || "-"}%` }}</span>
                     </div>
                   </div>
-                  <!--  餐饮及客房  -->
+                  <!--  餐饮  -->
                   <div class="row">
                     <div class="valueItem son" :style="{
                       width: 'calc(100% - 430rpx)',
                       textAlign: 'left',
                     }">
-                      餐饮及客房
+                      餐饮
                     </div>
                     <div class="compareItem" style="width: 110rpx">
                       {{
-                        pageData.curYearSCRevenue.value
+                        pageData.curYearSRRevenue.value
                           ? $util.getMoney(
-                            pageData.curYearSCRevenue.value / 10000
+                            pageData.curYearSRRevenue.value / 10000
                           )
                           : "0.00"
                       }}
                     </div>
                     <div class="compareItem" style="width: 110rpx">
                       {{
-                        pageData.lYearSCRevenue.value
+                        pageData.lYearSRRevenue.value
                           ? $util.getMoney(
-                            pageData.lYearSCRevenue.value / 10000
+                            pageData.lYearSRRevenue.value / 10000
                           )
                           : "0.00"
                       }}
                     </div>
                     <div class="compareItem" style="width: 110rpx">
                       <span>{{
-                        revenueSCANumber > 0
+                        SRRevenueNumberDay > 0
                           ? "+"
-                          : revenueSCANumber < 0 ? "" : "" }}</span>
-                          <span>{{ `${revenueSCANumber || "-"}` }}</span>
+                          : SRRevenueNumberDay < 0 ? "" : "" }}</span>
+                          <span>{{ `${SRRevenueNumberDay || "-"}` }}</span>
                     </div>
                     <div class="addItem" style="width: 110rpx">
                       <span :style="{
                         color:
-                          revenueSCAAdd > 0
+                          SRRevenueAddDay > 0
                             ? '#E83944'
-                            : revenueSCAAdd < 0
+                            : SRRevenueAddDay < 0
                               ? '#0E9976'
                               : '',
                       }">{{
-                        revenueSCAAdd > 0 ? "+" : revenueSCAAdd < 0 ? "" : "" }}</span>
+                        SRRevenueAddDay > 0 ? "+" : SRRevenueAddDay < 0 ? "" : "" }}</span>
                           <span :style="{
                             color:
-                              revenueSCAAdd > 0
+                              SRRevenueAddDay > 0
                                 ? '#E83944'
-                                : revenueSCAAdd < 0
+                                : SRRevenueAddDay < 0
                                   ? '#0E9976'
                                   : '',
-                          }">{{ `${revenueSCAAdd || "-"}%` }}</span>
+                          }">{{ `${SRRevenueAddDay || "-"}%` }}</span>
+                    </div>
+                  </div>
+                  <!--  客房  -->
+                  <div class="row">
+                    <div class="valueItem son" :style="{
+                      width: 'calc(100% - 430rpx)',
+                      textAlign: 'left',
+                    }">
+                      客房
+                    </div>
+                    <div class="compareItem" style="width: 110rpx">
+                      {{
+                        pageData.curYearGRORevenue.value
+                          ? $util.getMoney(
+                            pageData.curYearGRORevenue.value / 10000
+                          )
+                          : "0.00"
+                      }}
+                    </div>
+                    <div class="compareItem" style="width: 110rpx">
+                      {{
+                        pageData.lYearGRORevenue.value
+                          ? $util.getMoney(
+                            pageData.lYearGRORevenue.value / 10000
+                          )
+                          : "0.00"
+                      }}
+                    </div>
+                    <div class="compareItem" style="width: 110rpx">
+                      <span>{{
+                        GRORevenueNumberDay > 0
+                          ? "+"
+                          : GRORevenueNumberDay < 0 ? "" : "" }}</span>
+                          <span>{{ `${GRORevenueNumberDay || "-"}` }}</span>
+                    </div>
+                    <div class="addItem" style="width: 110rpx">
+                      <span :style="{
+                        color:
+                          GRORevenueAddDay > 0
+                            ? '#E83944'
+                            : GRORevenueAddDay < 0
+                              ? '#0E9976'
+                              : '',
+                      }">{{
+                        GRORevenueAddDay > 0 ? "+" : GRORevenueAddDay < 0 ? "" : "" }}</span>
+                          <span :style="{
+                            color:
+                              GRORevenueAddDay > 0
+                                ? '#E83944'
+                                : GRORevenueAddDay < 0
+                                  ? '#0E9976'
+                                  : '',
+                          }">{{ `${GRORevenueAddDay || "-"}%` }}</span>
                     </div>
                   </div>
                   <!-- 外包-->
@@ -2483,59 +2651,114 @@
                           }">{{ `${inComeDailyStoreAdd || "-"}%` }}</span>
                     </div>
                   </div>
-                  <!--  餐饮及客房  -->
+                  <!--  餐饮  -->
                   <div class="row">
                     <div class="valueItem son" :style="{
                       width: 'calc(100% - 430rpx)',
                       textAlign: 'left',
                     }">
-                      餐饮及客房
+                      餐饮
                     </div>
                     <div class="compareItem" style="width: 110rpx">
                       {{
-                        pageData.curYearSCAccount.value
+                        pageData.curYearSRAccount.value
                           ? $util.getMoney(
-                            pageData.curYearSCAccount.value / 10000
+                            pageData.curYearSRAccount.value / 10000
                           )
                           : "0.00"
                       }}
                     </div>
                     <div class="compareItem" style="width: 110rpx">
                       {{
-                        pageData.lYearSCAccount.value
+                        pageData.lYearSRAccount.value
                           ? $util.getMoney(
-                            pageData.lYearSCAccount.value / 10000
+                            pageData.lYearSRAccount.value / 10000
                           )
                           : "0.00"
                       }}
                     </div>
                     <div class="compareItem" style="width: 110rpx">
                       <span>{{
-                        inComeDailyFoodNumber > 0
+                        inComeDailyFoodNumberDay > 0
                           ? "+"
-                          : inComeDailyFoodNumber < 0 ? "" : "" }}</span>
-                          <span>{{ `${inComeDailyFoodNumber || "-"}` }}</span>
+                          : inComeDailyFoodNumberDay < 0 ? "" : "" }}</span>
+                          <span>{{ `${inComeDailyFoodNumberDay || "-"}` }}</span>
                     </div>
                     <div class="addItem" style="width: 110rpx">
                       <span :style="{
                         color:
-                          inComeDailyFoodAdd > 0
+                          inComeDailyFoodAddDay > 0
                             ? '#E83944'
-                            : inComeDailyFoodAdd < 0
+                            : inComeDailyFoodAddDay < 0
                               ? '#0E9976'
                               : '',
                       }">{{
-                        inComeDailyFoodAdd > 0
+                        inComeDailyFoodAddDay > 0
                           ? "+"
-                          : inComeDailyFoodAdd < 0 ? "" : "" }}</span>
+                          : inComeDailyFoodAddDay < 0 ? "" : "" }}</span>
                           <span :style="{
                             color:
-                              inComeDailyFoodAdd > 0
+                              inComeDailyFoodAddDay > 0
                                 ? '#E83944'
-                                : inComeDailyFoodAdd < 0
+                                : inComeDailyFoodAddDay < 0
                                   ? '#0E9976'
                                   : '',
-                          }">{{ `${inComeDailyFoodAdd || "-"}%` }}</span>
+                          }">{{ `${inComeDailyFoodAddDay || "-"}%` }}</span>
+                    </div>
+                  </div>
+                  <!--  客房  -->
+                  <div class="row">
+                    <div class="valueItem son" :style="{
+                      width: 'calc(100% - 430rpx)',
+                      textAlign: 'left',
+                    }">
+                      客房
+                    </div>
+                    <div class="compareItem" style="width: 110rpx">
+                      {{
+                        pageData.curYearGROAccount.value
+                          ? $util.getMoney(
+                            pageData.curYearGROAccount.value / 10000
+                          )
+                          : "0.00"
+                      }}
+                    </div>
+                    <div class="compareItem" style="width: 110rpx">
+                      {{
+                        pageData.lYearGROAccount.value
+                          ? $util.getMoney(
+                            pageData.lYearGROAccount.value / 10000
+                          )
+                          : "0.00"
+                      }}
+                    </div>
+                    <div class="compareItem" style="width: 110rpx">
+                      <span>{{
+                        inComeDailyRoomNumberDay > 0
+                          ? "+"
+                          : inComeDailyRoomNumberDay < 0 ? "" : "" }}</span>
+                          <span>{{ `${inComeDailyRoomNumberDay || "-"}` }}</span>
+                    </div>
+                    <div class="addItem" style="width: 110rpx">
+                      <span :style="{
+                        color:
+                          inComeDailyRoomAddDay > 0
+                            ? '#E83944'
+                            : inComeDailyRoomAddDay < 0
+                              ? '#0E9976'
+                              : '',
+                      }">{{
+                        inComeDailyRoomAddDay > 0
+                          ? "+"
+                          : inComeDailyRoomAddDay < 0 ? "" : "" }}</span>
+                          <span :style="{
+                            color:
+                              inComeDailyRoomAddDay > 0
+                                ? '#E83944'
+                                : inComeDailyRoomAddDay < 0
+                                  ? '#0E9976'
+                                  : '',
+                          }">{{ `${inComeDailyRoomAddDay || "-"}%` }}</span>
                     </div>
                   </div>
                   <!-- 外包-->
@@ -3090,6 +3313,10 @@ export default {
       selfStoresRevenueAdd: 0, // 对客自营便利店增幅
       GRORevenueNumber: 0, // 对客餐饮+客房及其他增长
       GRORevenueAdd: 0, // 对客客房及其他增幅
+      SRRevenueNumber: 0,// 自营餐饮的增长
+      SRRevenueAdd: 0,// 自营餐饮的增幅
+      lYearGRORevenueNumber: 0,// 客房的增长
+      lYearGRORevenueAdd: 0,// 客房的增幅
       outsourceRevenueNumber: 0, // 对客外包增长
       outsourceRevenueAdd: 0, // 对客外包增幅
       leaseRevenueNumber: 0, // 对客租赁增长
@@ -3103,6 +3330,10 @@ export default {
       tradeStoresAccountAdd: 0, // 营业自营便利店增幅
       tradeSCAAccountNumber: 0, // 营业餐饮及客房增长
       tradeSCAAccountAdd: 0, // 营业餐饮及客房增幅
+      SRAccountAccountNumber: 0,// 餐饮的收入增长
+      SRAccountAccountAdd: 0,// 餐饮的收入增幅
+      radeSCAAccountNumber: 0,// 客房的收入增长
+      radeSCAAccountAdd: 0,// 客房的收入增幅
       outsourceAccountNumber: 0, // 营业外包增长
       outsourceAccountAdd: 0, // 营业外包增幅
       leaseAccountNumber: 0, // 营业租赁增长
@@ -3131,6 +3362,14 @@ export default {
       inComeDailyStoreNumber: 0, // 每日自营便利店增长
       inComeDailyFoodAdd: 0, // 每日自营餐饮及客房增幅
       inComeDailyFoodNumber: 0, // 每日自营餐饮及客房增长
+      SRRevenueNumberDay: 0,// 每日餐饮增长
+      SRRevenueAddDay: 0,// 每日餐饮增幅
+      GRORevenueNumberDay: 0,// 每日客房增长
+      GRORevenueAddDay: 0,// 每日客房增幅
+      inComeDailyFoodNumberDay: 0, // 每日餐饮收入增长
+      inComeDailyFoodAddDay: 0,// 每日餐饮收入增幅
+      inComeDailyRoomNumberDay: 0, // 每日客房收入增长
+      inComeDailyRoomAddDay: 0, // 每日客房收入增幅
       outsourceInComeDailyAdd: 0, // 每日外包营收增幅
       outsourceInComeDailyNumber: 0, // 每日外包营收增长
       leaseInComeDailyAdd: 0, // 每日租赁增幅
@@ -4146,6 +4385,44 @@ export default {
             100
           ).toFixed(2)
         );
+        // 自营餐饮的增长
+        this.SRRevenueNumber = Number(
+          (
+            (this.pageData.curYearSRRevenue.data -
+              this.pageData.lYearSRRevenue.data) /
+            10000
+          ).toFixed(2)
+        );
+
+        // 自营餐饮的增幅
+        this.SRRevenueAdd = Number(
+          (
+            (this.pageData.curYearSRRevenue.data /
+              this.pageData.lYearSRRevenue.data -
+              1) *
+            100
+          ).toFixed(2)
+        );
+
+
+        // 客房的增长
+        this.lYearGRORevenueNumber = Number(
+          (
+            (this.pageData.curYearGRORevenue.data -
+              this.pageData.lYearGRORevenue.data) /
+            10000
+          ).toFixed(2)
+        );
+        // 客房的增幅
+        this.lYearGRORevenueAdd = Number(
+          (
+            (this.pageData.curYearGRORevenue.data /
+              this.pageData.lYearGRORevenue.data -
+              1) *
+            100
+          ).toFixed(2)
+        );
+
         // this.GRORevenueAdd = 100
         // 对客外包增长
         this.outsourceRevenueNumber = Number(
@@ -4249,6 +4526,41 @@ export default {
             100
           ).toFixed(2)
         );
+        // 餐饮的收入增长
+        this.SRAccountAccountNumber = Number(
+          (
+            (this.pageData.curYearSRAccount.data -
+              this.pageData.lYearSRAccount.data) /
+            10000
+          ).toFixed(2)
+        );
+        // 餐饮的收入增幅
+        this.SRAccountAccountAdd = Number(
+          (
+            (this.pageData.curYearSRAccount.data /
+              this.pageData.lYearSRAccount.data -
+              1) *
+            100
+          ).toFixed(2)
+        );
+        // 客房的收入增长
+        this.radeSCAAccountNumber = Number(
+          (
+            (this.pageData.curYearGROAccount.data -
+              this.pageData.lYearGROAccount.data) /
+            10000
+          ).toFixed(2)
+        );
+        // 客房的收入增幅
+        this.radeSCAAccountAdd = Number(
+          (
+            (this.pageData.curYearGROAccount.data /
+              this.pageData.lYearGROAccount.data -
+              1) *
+            100
+          ).toFixed(2)
+        );
+
         // 营业外包增长
         this.outsourceAccountNumber = Number(
           (
@@ -4364,6 +4676,39 @@ export default {
             10000
           ).toFixed(2)
         );
+        // 自营餐饮的单日增长
+        this.SRRevenueNumberDay = Number(
+          (
+            (this.pageData.curYearSRRevenue.value -
+              this.pageData.lYearSRRevenue.value) /
+            10000
+          ).toFixed(2)
+        );
+        // 自营餐饮的单日增幅
+        this.SRRevenueAddDay = Number(
+          (
+            (this.pageData.curYearSRRevenue.value /
+              this.pageData.lYearSRRevenue.value -
+              1) *
+            100
+          ).toFixed(2)
+        );
+        // 客房单日增长
+        this.GRORevenueNumberDay = Number(
+          (
+            (this.pageData.curYearGRORevenue.value -
+              this.pageData.lYearGRORevenue.value) /
+            10000
+          ).toFixed(2)
+        );
+        // 客房单日增幅
+        this.GRORevenueAddDay = Number(
+          (
+            (this.pageData.curYearGRORevenue.value -
+              this.pageData.lYearGRORevenue.value) /
+            10000
+          ).toFixed(2)
+        );
         // 每日外包增幅
         this.outsourceDailyAdd = Number(
           (
@@ -4460,6 +4805,41 @@ export default {
             10000
           ).toFixed(2)
         );
+        // 每日自营餐饮
+        this.inComeDailyFoodNumberDay = Number(
+          (
+            (this.pageData.curYearSRAccount.value -
+              this.pageData.lYearSCAccount.value) /
+            10000
+          ).toFixed(2)
+        );
+        // 每日自营餐饮增幅
+        this.inComeDailyFoodAddDay = Number(
+          (
+            (this.pageData.curYearSRAccount.value /
+              this.pageData.lYearSRAccount.value -
+              1) *
+            100
+          ).toFixed(2)
+        );
+        // 客房每日增长
+        this.inComeDailyRoomNumberDay = Number(
+          (
+            (this.pageData.curYearGROAccount.value -
+              this.pageData.lYearGROAccount.value) /
+            10000
+          ).toFixed(2)
+        );
+        // 客房每日增幅
+        this.inComeDailyRoomAddDay = Number(
+          (
+            (this.pageData.curYearGROAccount.value /
+              this.pageData.lYearGROAccount.value -
+              1) *
+            100
+          ).toFixed(2)
+        );
+
         // 每日外包营收增幅
         this.outsourceInComeDailyAdd = Number(
           (
@@ -4813,6 +5193,10 @@ export default {
       this.selfStoresRevenueAdd = 0;
       this.GRORevenueNumber = 0;
       this.GRORevenueAdd = 0;
+      this.SRRevenueNumber = 0;
+      this.SRRevenueAdd = 0;
+      this.lYearGRORevenueNumber = 0;
+      this.lYearGRORevenueAdd = 0;
       this.outsourceRevenueNumber = 0;
       this.outsourceRevenueAdd = 0;
       this.leaseRevenueNumber = 0;
@@ -4824,6 +5208,8 @@ export default {
       this.tradeStoresAccountAdd = 0;
       this.tradeSCAAccountNumber = 0;
       this.tradeSCAAccountAdd = 0;
+      this.SRAccountAccountNumber = 0;
+      this.SRAccountAccountAdd = 0;
       this.outsourceAccountNumber = 0;
       this.outsourceAccountAdd = 0;
       this.leaseAccountNumber = 0;
@@ -4849,6 +5235,14 @@ export default {
       this.inComeDailyStoreNumber = 0;
       this.inComeDailyFoodAdd = 0;
       this.inComeDailyFoodNumber = 0;
+      this.SRRevenueNumberDay = 0;
+      this.SRRevenueAddDay = 0;
+      this.GRORevenueNumberDay = 0;
+      this.GRORevenueAddDay = 0;
+      this.inComeDailyFoodNumberDay = 0;
+      this.inComeDailyFoodAddDay = 0;
+      this.inComeDailyRoomNumberDay = 0;
+      this.inComeDailyRoomAddDay = 0;
       this.outsourceInComeDailyAdd = 0;
       this.outsourceInComeDailyNumber = 0;
       this.leaseInComeDailyAdd = 0;
@@ -4931,6 +5325,10 @@ export default {
       this.selfStoresRevenueAdd = null;
       this.GRORevenueNumber = null;
       this.GRORevenueAdd = null;
+      this.SRRevenueNumber = null;
+      this.SRRevenueAdd = null;
+      this.lYearGRORevenueNumber = null;
+      this.lYearGRORevenueAdd = null;
       this.outsourceRevenueNumber = null;
       this.outsourceRevenueAdd = null;
       this.leaseRevenueNumber = null;
@@ -4943,6 +5341,8 @@ export default {
       this.tradeStoresAccountAdd = null;
       this.tradeSCAAccountNumber = null;
       this.tradeSCAAccountAdd = null;
+      this.SRAccountAccountNumber = null;
+      this.SRAccountAccountAdd = null;
       this.outsourceAccountNumber = null;
       this.outsourceAccountAdd = null;
       this.leaseAccountNumber = null;
@@ -4969,6 +5369,14 @@ export default {
       this.inComeDailyStoreNumber = null;
       this.inComeDailyFoodAdd = null;
       this.inComeDailyFoodNumber = null;
+      this.SRRevenueNumberDay = null;
+      this.SRRevenueAddDay = null;
+      this.GRORevenueNumberDay = null;
+      this.GRORevenueAddDay = null;
+      this.inComeDailyFoodNumberDay = null;
+      this.inComeDailyFoodAddDay = null;
+      this.inComeDailyRoomNumberDay = null;
+      this.inComeDailyRoomAddDay = null;
       this.outsourceInComeDailyAdd = null;
       this.outsourceInComeDailyNumber = null;
       this.leaseInComeDailyAdd = null;