From b23d07cf20297f3d36ad3f9051ba4af394a80053 Mon Sep 17 00:00:00 2001
From: ylj20011123 <YLJ>
Date: Tue, 29 Jul 2025 19:42:40 +0800
Subject: [PATCH] update

---
 pages/everdayRenven/AnhuiIndex.vue | 333 +++++++++--------------------
 1 file changed, 105 insertions(+), 228 deletions(-)

diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue
index 06d5edb..7863ec1 100644
--- a/pages/everdayRenven/AnhuiIndex.vue
+++ b/pages/everdayRenven/AnhuiIndex.vue
@@ -1,205 +1,110 @@
 <template>
   <div>
     <view class="page-body" v-if="showPage">
-      <AnhHead
-        :today="today"
-        :headMsg="headMsg"
-        :lastDay="lastDay"
-        :groupType="theRequest && theRequest.GroupType"
-        :provinceCode="theRequest && theRequest.ProvinceCode"
-        @bindDateChange="bindDateChange"
-        :isup="isup"
-        :nowDay="nowDay"
-        :selectDate="theRequest && theRequest.time"
-        @toggle="toggleCard"
-      ></AnhHead>
+      <AnhHead :today="today" :headMsg="headMsg" :lastDay="lastDay" :groupType="theRequest && theRequest.GroupType"
+        :provinceCode="theRequest && theRequest.ProvinceCode" @bindDateChange="bindDateChange" :isup="isup"
+        :nowDay="nowDay" :selectDate="theRequest && theRequest.time" @toggle="toggleCard"></AnhHead>
       <!--营收占比的上面组件	-->
       <view style="background-color: #fff">
         <!--安徽省 昨日营收占比 -->
         <div v-if="theRequest && theRequest.GroupType != 1010">
           <div class="uni-inline-item modle-title">
-            <image
-              :src="
-                theRequest.ProvinceCode == 530000
-                  ? '/static/images/revenue/type-operation530000.svg'
-                  : '/static/images/revenue/type-operation.png'
-              "
-              mode="aspectFit"
-            ></image>
+            <image :src="theRequest.ProvinceCode == 530000
+              ? '/static/images/revenue/type-operation530000.svg'
+              : '/static/images/revenue/type-operation.png'
+              " mode="aspectFit"></image>
             <text class="strong-text">营收占比</text>
           </div>
           <view class="box-operation">
             <div class="operation-tab-box">
-              <div
-                class="operation-tab-unit"
-                @tap="selectTab('nowTab', 1)"
-                v-if="theRequest.ProvinceCode == 340000"
-                :class="{ active: nowTab == 1 }"
-              >
+              <div class="operation-tab-unit" @tap="selectTab('nowTab', 1)" v-if="theRequest.ProvinceCode == 340000"
+                :class="{ active: nowTab == 1 }">
                 经营模式
               </div>
-              <div
-                class="operation-tab-unit"
-                @tap="selectTab('nowTab', 2)"
-                :class="{ active: nowTab == 2 }"
-              >
+              <div class="operation-tab-unit" @tap="selectTab('nowTab', 2)" :class="{ active: nowTab == 2 }">
                 经营业态
               </div>
-              <div
-                class="operation-tab-unit"
-                @tap="selectTab('nowTab', 3)"
-                v-if="areaProgress && areaProgress.length > 0"
-                :class="{ active: nowTab == 3 }"
-              >
+              <div class="operation-tab-unit" @tap="selectTab('nowTab', 3)"
+                v-if="areaProgress && areaProgress.length > 0" :class="{ active: nowTab == 3 }">
                 区域营收
               </div>
-              <div
-                class="operation-tab-unit"
-                @tap="selectTab('nowTab', 4)"
-                v-if="
-                  theRequest.ProvinceCode == 340000 &&
-                  theRequest.GroupType == 1000
-                "
-                :class="{ active: nowTab == 4 }"
-              >
+              <div class="operation-tab-unit" @tap="selectTab('nowTab', 4)" v-if="
+                theRequest.ProvinceCode == 340000 &&
+                theRequest.GroupType == 1000
+              " :class="{ active: nowTab == 4 }">
                 车流分析
               </div>
             </div>
             <div class="operation-content-box">
-              <div
-                v-show="nowTab == 1"
-                v-if="
-                  modelProgress &&
-                  modelProgress.length > 0 &&
-                  theRequest.ProvinceCode == 340000
-                "
-              >
-                <canvas
-                  canvas-id="modelCont"
-                  id="modelCont"
-                  class="operation-content"
-                  @touchstart="touchPie($event, 'modelCont')"
-                ></canvas>
+              <div v-show="nowTab == 1" v-if="
+                modelProgress &&
+                modelProgress.length > 0 &&
+                theRequest.ProvinceCode == 340000
+              ">
+                <canvas canvas-id="modelCont" id="modelCont" class="operation-content"
+                  @touchstart="touchPie($event, 'modelCont')"></canvas>
                 <div>
-                  <div
-                    class="operation-c-list"
-                    v-for="(item, o) in modelProgress"
-                    :key="o"
-                  >
+                  <div class="operation-c-list" v-for="(item, o) in modelProgress" :key="o">
                     <div class="operation-cl-unit">
                       <text>{{ item.name }} {{ item.bili }}%</text>
                       <text>{{ item.data }}元</text>
                     </div>
                     <div class="progress">
-                      <div
-                        class="bgO"
-                        :style="{ width: item.bili + '%' }"
-                      ></div>
+                      <div class="bgO" :style="{ width: item.bili + '%' }"></div>
                     </div>
                   </div>
                 </div>
               </div>
-              <div
-                v-show="nowTab == 2"
-                v-if="regionProgress && regionProgress.length > 0"
-              >
-                <canvas
-                  canvas-id="businessCont"
-                  id="businessCont"
-                  class="operation-content"
-                  @touchstart="touchPie($event, 'businessCont')"
-                ></canvas>
+              <div v-show="nowTab == 2" v-if="regionProgress && regionProgress.length > 0">
+                <canvas canvas-id="businessCont" id="businessCont" class="operation-content"
+                  @touchstart="touchPie($event, 'businessCont')"></canvas>
                 <div>
-                  <div
-                    class="operation-c-list"
-                    v-for="(item, o) in regionProgress"
-                    :key="o"
-                  >
+                  <div class="operation-c-list" v-for="(item, o) in regionProgress" :key="o">
                     <div class="operation-cl-unit">
                       <text>{{ item.name }} {{ item.bili }}%</text>
                       <text>{{ item.data }}元</text>
                     </div>
                     <div class="progress">
-                      <div
-                        class="bgO"
-                        :style="{ width: item.bili + '%' }"
-                      ></div>
+                      <div class="bgO" :style="{ width: item.bili + '%' }"></div>
                     </div>
                   </div>
                 </div>
               </div>
-              <div
-                v-show="nowTab == 3"
-                v-if="areaProgress && areaProgress.length > 0"
-              >
-                <canvas
-                  canvas-id="areaCont"
-                  id="areaCont"
-                  class="operation-content"
-                  @touchstart="touchPie($event, 'areaCont')"
-                ></canvas>
+              <div v-show="nowTab == 3" v-if="areaProgress && areaProgress.length > 0">
+                <canvas canvas-id="areaCont" id="areaCont" class="operation-content"
+                  @touchstart="touchPie($event, 'areaCont')"></canvas>
                 <div>
-                  <div
-                    class="operation-c-list"
-                    v-for="(item, o) in areaProgress"
-                    :key="o"
-                  >
+                  <div class="operation-c-list" v-for="(item, o) in areaProgress" :key="o">
                     <div class="operation-cl-unit">
                       <text>{{ item.name }} {{ item.bili }}%</text>
                       <text>{{ item.data }}元</text>
                     </div>
                     <div class="progress">
-                      <div
-                        class="bgO"
-                        :style="{ width: item.bili + '%' }"
-                      ></div>
+                      <div class="bgO" :style="{ width: item.bili + '%' }"></div>
                     </div>
                   </div>
                 </div>
               </div>
-              <div
-                v-show="nowTab == 4"
-                v-if="bayonetProgress && bayonetProgress.length > 0"
-              >
+              <div v-show="nowTab == 4" v-if="bayonetProgress && bayonetProgress.length > 0">
                 <div>
-                  <div
-                    class="operation-c-list"
-                    v-for="(item, o) in bayonetProgress"
-                    :key="o"
-                  >
+                  <div class="operation-c-list" v-for="(item, o) in bayonetProgress" :key="o">
                     <div class="operation-cl-unit">
                       <text>{{ item.name }}</text>
                     </div>
-                    <div
-                      style="padding: 10rpx"
-                      class="bayonet-c-list"
-                      v-for="(child, o) in item.list"
-                      :key="o"
-                    >
+                    <div style="padding: 10rpx" class="bayonet-c-list" v-for="(child, o) in item.list" :key="o">
                       <div class="operation-cl-unit1">
                         <text class="server">{{ child.name }}</text>
-                        <text class="type" style="color: #868686"
-                          >入区流量/断面流量</text
-                        >
-                        <text class="carType" style="color: #868686"
-                          >大/中/小型车</text
-                        >
+                        <text class="type" style="color: #868686">入区流量/断面流量</text>
+                        <text class="carType" style="color: #868686">大/中/小型车</text>
                       </div>
                       <ul class="bayonet-cell-area">
                         <li v-for="(childItem, o) in child.list" :key="o">
-                          <text class="server"
-                            >{{ childItem.name }}区:<text style="color: #ef884f"
-                              >{{ childItem.bili }}%</text
-                            ></text
-                          >
-                          <text class="type"
-                            >{{ childItem.data }}/{{ childItem.flow }}</text
-                          >
-                          <text class="carType"
-                            >{{ childItem.LargeVehicle_Count }}/{{
-                              childItem.MediumVehicle_Count
-                            }}/{{ childItem.MinVehicle_Count }}</text
-                          >
+                          <text class="server">{{ childItem.name }}区:<text style="color: #ef884f">{{ childItem.bili
+                          }}%</text></text>
+                          <text class="type">{{ childItem.data }}/{{ childItem.flow }}</text>
+                          <text class="carType">{{ childItem.LargeVehicle_Count }}/{{
+                            childItem.MediumVehicle_Count
+                            }}/{{ childItem.MinVehicle_Count }}</text>
                         </li>
                       </ul>
                       <!-- <div class="progress">
@@ -214,15 +119,9 @@
         </div>
 
         <!-- 昨日日结上传 -->
-        <div
-          class="uni-inline-item modle-title jc-between"
-          v-if="regionList.length > 0"
-        >
+        <div class="uni-inline-item modle-title jc-between" v-if="regionList.length > 0">
           <view class="uni-inline-item">
-            <image
-              src="/static/images/revenue/yestoday-region.png"
-              mode="aspectFit"
-            ></image>
+            <image src="/static/images/revenue/yestoday-region.png" mode="aspectFit"></image>
             <text class="strong-text">日结上传</text>
           </view>
           <view style="font-size: 26rpx">
@@ -230,15 +129,8 @@
             <span class="upload-count">{{ headMsg.uploadState }}</span>
           </view>
         </div>
-        <template
-          v-if="theRequest && theRequest.GroupType == 1020 && regionList.length"
-        >
-          <div
-            v-for="(item, i) in regionList[0].child"
-            :key="i"
-            class="region-cell"
-            @tap="toDetail(item)"
-          >
+        <template v-if="theRequest && theRequest.GroupType == 1020 && regionList.length">
+          <div v-for="(item, i) in regionList[0].child" :key="i" class="region-cell" @tap="toDetail(item)">
             <div class="region-cell-unit">
               <text>{{ item.serverpart_Name }}</text>
               <div class="ct01">
@@ -254,21 +146,18 @@
                 <text class="strong-text">{{
                   item.totalcount > item.uploadcount
                     ? $util.fmoney(
-                        (item.uploadcount / item.totalcount) * 100,
-                        2
-                      )
+                      (item.uploadcount / item.totalcount) * 100,
+                      2
+                    )
                     : 100
                 }}</text>
                 <text>%</text>
               </div>
             </div>
-            <div
-              class="region-cell-unit"
-              :class="{
-                'ct-red': item.uploadcount != item.totalcount,
-                'weisc-ico': item.uploadcount != item.totalcount,
-              }"
-            >
+            <div class="region-cell-unit" :class="{
+              'ct-red': item.uploadcount != item.totalcount,
+              'weisc-ico': item.uploadcount != item.totalcount,
+            }">
               {{ item.uploadcount + "/" + item.totalcount }}
             </div>
             <div class="region-cell-image">
@@ -296,39 +185,27 @@
                     <text class="strong-text">{{
                       item.totalcount > item.uploadcount
                         ? $util.fmoney(
-                            (item.uploadcount / item.totalcount) * 100,
-                            2
-                          )
+                          (item.uploadcount / item.totalcount) * 100,
+                          2
+                        )
                         : "100.00"
                     }}</text>
                     <text>%</text>
                   </div>
                 </div>
-                <div
-                  class="region-cell-unit"
-                  :class="{ 'ct-red': item.uploadcount != item.totalcount }"
-                >
+                <div class="region-cell-unit" :class="{ 'ct-red': item.uploadcount != item.totalcount }">
                   {{ item.uploadcount + "/" + item.totalcount }}
                 </div>
                 <div class="region-cell-image">
-                  <text
-                    class="uni-icon-arrowright uni-icon"
-                    :class="{ active: item.show }"
-                  ></text>
+                  <text class="uni-icon-arrowright uni-icon" :class="{ active: item.show }"></text>
                 </div>
               </div>
               <ul class="region-cell-area" v-show="item.show">
-                <li
-                  v-for="(child, index) in item.child"
-                  :class="{ visited: child.visited }"
-                  :key="index"
-                  @tap="toDetail(child)"
-                >
+                <li v-for="(child, index) in item.child" :class="{ visited: child.visited }" :key="index"
+                  @tap="toDetail(child)">
                   <div>{{ child.serverpart_Name }}</div>
                   <div>{{ $util.fmoney(child.cashpay, 2) }}<text>元</text></div>
-                  <div
-                    :class="{ 'ct-red': child.uploadcount != child.totalcount }"
-                  >
+                  <div :class="{ 'ct-red': child.uploadcount != child.totalcount }">
                     {{ child.uploadcount + "/" + child.totalcount }}
                   </div>
                 </li>
@@ -337,34 +214,19 @@
           </div>
         </template>
         <template v-else>
-          <shopCell
-            v-for="(item, i) in regionList"
-            :key="i"
-            :item="item"
-            @toggleShow="toggleShow"
-            :i="i"
-          />
+          <shopCell v-for="(item, i) in regionList" :key="i" :item="item" @toggleShow="toggleShow" :i="i" />
         </template>
       </view>
-      <template v-if="theRequest && theRequest.ProvinceCode == 620000">
+      <template v-if="theRequest && theRequest.ProvinceCode == '620000' || theRequest.ProvinceCode == '530000'">
         <div class="uni-inline-item modle-title">
-          <image
-            src="/static/images/revenue/product-ranking.png"
-            mode="aspectFit"
-          ></image>
+          <image src="/static/images/revenue/product-ranking.png" mode="aspectFit"></image>
           <text class="strong-text">商品销售排行</text>
         </div>
-        <RankContent
-          :wechatPushSalesList="wechatPushSalesList"
-          v-if="!isLoading"
-        ></RankContent>
+        <RankContent :wechatPushSalesList="wechatPushSalesList" v-if="!isLoading"></RankContent>
       </template>
     </view>
     <div v-if="!showPage && !isLoading">
-      <noFound
-        :nodata="!showPage && !isLoading"
-        :text="'您暂无' + lastDay + '营收数据'"
-      />
+      <noFound :nodata="!showPage && !isLoading" :text="'您暂无' + lastDay + '营收数据'" />
     </div>
   </div>
 </template>
@@ -479,8 +341,8 @@ export default {
       let canToSeverpartIndex = !provinceId
         ? this.hasSeverpartIndexAuthority
         : this.PushAuthority.some((n) => {
-            return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1;
-          });
+          return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1;
+        });
 
       this.$util.toNextRoute(
         "navigateTo",
@@ -689,9 +551,9 @@ export default {
           totalData.diffBili =
             totalData.budgetAmount > 0
               ? this.$util.fmoney(
-                  (totalData.diffBudgetTotal / totalData.budgetAmount) * 100,
-                  2
-                )
+                (totalData.diffBudgetTotal / totalData.budgetAmount) * 100,
+                2
+              )
               : "100";
         }
       });
@@ -822,9 +684,9 @@ export default {
                 o.SectionFlow_Count == 0
                   ? 100
                   : _this.$util.fmoney(
-                      (o.Vehicle_Count / o.SectionFlow_Count) * 100,
-                      2
-                    ),
+                    (o.Vehicle_Count / o.SectionFlow_Count) * 100,
+                    2
+                  ),
               MinVehicle_Count: o.MinVehicle_Count,
               MediumVehicle_Count: o.MediumVehicle_Count,
               LargeVehicle_Count: o.LargeVehicle_Count,
@@ -842,9 +704,9 @@ export default {
               m.SectionFlow_Count == 0
                 ? 0
                 : _this.$util.fmoney(
-                    (m.Vehicle_Count / m.SectionFlow_Count) * 100,
-                    2
-                  ),
+                  (m.Vehicle_Count / m.SectionFlow_Count) * 100,
+                  2
+                ),
             list: _list,
           });
         });
@@ -876,6 +738,9 @@ export default {
         }
       );
 
+      console.log('getRankContentgetRankContentgetRankContentgetRankContent', time);
+
+
       if (data.Result_Code === 100 && data.Result_Data.TotalCount > 0) {
         this.wechatPushSalesList = {};
         data.Result_Data.List.forEach((n) => {
@@ -928,8 +793,11 @@ export default {
     if (this.theRequest.GroupType == 1010) {
       this.getDetail(this.theRequest);
     }
-    // 若省份为甘肃，则加载甘肃单品排行
-    if (this.theRequest.ProvinceCode == 620000) {
+    console.log('this.theRequestthis.theRequestthis.theRequest', this.theRequest);
+
+    // 若省份为甘肃，则加载甘肃单品排行 
+    // 再加个云南  要字符串
+    if (this.theRequest.ProvinceCode == "620000" || this.theRequest.ProvinceCode == "530000") {
       this.getRankContent();
     }
   },
@@ -1292,12 +1160,12 @@ text.fs12 {
   background-color: #f7f7f7;
 }
 
-.region-cell-area li > div {
+.region-cell-area li>div {
   flex: 2;
   font-size: 22rpx;
 }
 
-.region-cell-area li > div:nth-child(1) {
+.region-cell-area li>div:nth-child(1) {
   flex: 3;
   text-align: left;
 }
@@ -1309,20 +1177,24 @@ text.fs12 {
   overflow: auto;
   -webkit-overflow-scrolling: touch;
 }
+
 .bayonet-cell-area li {
   width: 100%;
 }
+
 .bayonet-cell-area li .server {
   width: 30%;
   display: inline-block;
   text-align: left;
   padding-left: 15rpx;
 }
+
 .bayonet-cell-area li .type {
   width: 35%;
   display: inline-block;
   text-align: center;
 }
+
 .bayonet-cell-area li .carType {
   width: 30%;
   display: inline-block;
@@ -1361,11 +1233,11 @@ text.fs12 {
   position: relative;
 }
 
-.bayonet-cell-area li > div {
+.bayonet-cell-area li>div {
   flex: 2;
 }
 
-.bayonet-cell-area li > div:nth-child(1) {
+.bayonet-cell-area li>div:nth-child(1) {
   flex: 3;
   text-align: left;
 }
@@ -1420,7 +1292,7 @@ text.fs12 {
   box-shadow: 1rpx 0rpx 6rpx 0px rgba(224, 224, 224, 0.54);
 }
 
-.revenue-line-box + .revenue-line-box {
+.revenue-line-box+.revenue-line-box {
   margin-top: 38rpx;
 }
 
@@ -1437,7 +1309,7 @@ text.fs12 {
   box-sizing: border-box;
 }
 
-.revenue-line-data + .revenue-line-data {
+.revenue-line-data+.revenue-line-data {
   margin-left: 24rpx;
 }
 
@@ -1586,28 +1458,33 @@ canvas.operation-content {
 .operation-c-list {
   padding: 16rpx 32rpx;
 }
+
 .operation-cl-unit {
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
+
 .operation-cl-unit1 {
   width: 100%;
   font-size: 26rpx;
   display: flex;
   justify-content: space-between;
 }
+
 .operation-cl-unit1 .server {
   width: 30%;
   display: inline-block;
   text-align: left;
   padding-left: 30rpx;
 }
+
 .operation-cl-unit1 .type {
   width: 40%;
   display: inline-block;
   text-align: left;
 }
+
 .operation-cl-unit1 .carType {
   width: 30%;
   display: inline-block;
@@ -1653,7 +1530,7 @@ canvas.operation-content {
   color: #fff;
 }
 
-.ranking-tab-box .ranking-tab-unit + .ranking-tab-unit {
+.ranking-tab-box .ranking-tab-unit+.ranking-tab-unit {
   border-left: 2rpx solid #565656;
 }