优化

src/views/dataStatistics/rechargeStatistics/index.vue

@@ -4,6 +4,9 @@
     <summaryStatistics></summaryStatistics>
     <Search :search="moreSearch" :reset="moreReset">
       <template v-slot:body>
+        <div v-if="rolesIdentify.includes('optimizer')" class="w-full m-3 text-gray-500">
+          *列表统计的是所有小程序对应日期的数据
+        </div>
         <el-form-item label="时间">
           <el-date-picker unlink-panels clearable @change="timeChange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
             v-model="query.time" type="daterange" :shortcuts="shortcuts" range-separator="To" start-placeholder="开始时间"

src/views/dataStatistics/rechargeStatistics/summaryStatistics.vue

@@ -1,208 +1,213 @@
 <template>
-  <div class="flex w-full card-wrapper">
-    <el-card class="box-card" shadow="hover" v-action="'statistic.chargeTJ.todayCharge'">
-      <template #header>
-        <div class="flex items-center justify-between card-header">
-          <div class="flex items-center">
-            <span>今日充值</span>
-            <el-tooltip placement="top">
-              <template #content>
-                截至当前时间，今日累计充值<br />
-              </template>
-              <el-icon>
-                <InfoFilled />
-              </el-icon>
-            </el-tooltip>
-          </div>
-          <p class="text-red-300">{{ timer.seconds }}s后刷新</p>
-        </div>
-      </template>
-      <div class="money-wrapper">￥{{ todayChargeData.pay_money ?? '-' }}</div>
-      <div class="flex items-center justify-between">
-        <div>
-          <p class="text-lg font-bold">普通充值</p>
-          <div>
-            <span class="text-sm">已支付：</span>
-            <span class="text-base">{{ todayChargeData.common_pay_count ?? '-' }}单</span>
-          </div>
-          <div>
-            <span class="text-sm">未支付：</span>
-            <span class="text-base">{{ todayChargeData.common_unpay_count ?? '-' }}单</span>
-          </div>
-          <div>
-            <span class="text-sm">支付率：</span>
-            <span class="text-base">{{ todayChargeData.company_pay_rate ?? '-' }}</span>
-          </div>
-        </div>
-        <div>
-          <p class="text-lg font-bold">会员充值</p>
-          <div>
-            <span class="text-sm">已支付：</span>
-            <span class="text-base">{{ todayChargeData.vip_pay_count ?? '-' }}单</span>
-          </div>
-          <div>
-            <span class="text-sm">未支付：</span>
-            <span class="text-base">{{ todayChargeData.vip_unpay_count ?? '-' }}单</span>
-          </div>
-          <div>
-            <span class="text-sm">支付率：</span>
-            <span class="text-base">{{ todayChargeData.vip_pay_rate ?? '-' }}</span>
-          </div>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="box-card" shadow="hover" v-action="'statistic.chargeTJ.currentMonthCharge'">
-      <template #header>
-        <div class="flex items-center justify-between card-header">
-          <div class="flex items-center">
-            <span>本月充值</span>
-            <el-tooltip placement="top">
-              <template #content>
-                本月截至昨日的累计充值金额<br />
-              </template>
-              <el-icon>
-                <InfoFilled />
-              </el-icon>
-            </el-tooltip>
-            <span class="ml-2 text-red-300">(不包含当日)</span>
-          </div>
-        </div>
-      </template>
-      <div class="money-wrapper">￥{{ currentMonthChargeData.pay_money ?? '-' }}</div>
-      <div class="flex items-center justify-between">
-        <div>
-          <p class="text-lg font-bold">普通充值</p>
-          <div>
-            <span class="text-sm">已支付：</span>
-            <span class="text-base">{{ currentMonthChargeData.common_pay_count ?? '-' }}单</span>
-          </div>
-          <div>
-            <span class="text-sm">未支付：</span>
-            <span class="text-base">{{ currentMonthChargeData.common_unpay_count ?? '-' }}单</span>
-          </div>
-          <div>
-            <span class="text-sm">支付率：</span>
-            <span class="text-base">{{ currentMonthChargeData.company_pay_rate ?? '-' }}</span>
-          </div>
-        </div>
-        <div>
-          <p class="text-lg font-bold">会员充值</p>
-          <div>
-            <span class="text-sm">已支付：</span>
-            <span class="text-base">{{ currentMonthChargeData.vip_pay_count ?? '-' }}单</span>
-          </div>
-          <div>
-            <span class="text-sm">未支付：</span>
-            <span class="text-base">{{ currentMonthChargeData.vip_unpay_count ?? '-' }}单</span>
-          </div>
-          <div>
-            <span class="text-sm">支付率：</span>
-            <span class="text-base">{{ currentMonthChargeData.vip_pay_rate ?? '-' }}</span>
-          </div>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="box-card" shadow="hover" v-action="'statistic.chargeTJ.lastMonthCharge'">
-      <template #header>
-        <div class="flex items-center justify-between card-header">
-          <div class="flex items-center">
-            <span>上月充值</span>
-            <el-tooltip placement="top">
-              <template #content>
-                上月的累计充值<br />
-              </template>
-              <el-icon>
-                <InfoFilled />
-              </el-icon>
-            </el-tooltip>
-          </div>
-        </div>
-      </template>
-      <div class="money-wrapper">￥{{ lastMonthChargeData.pay_money ?? '-' }}</div>
-      <div class="flex items-center justify-between">
-        <div>
-          <p class="text-lg font-bold">普通充值</p>
-          <div>
-            <span class="text-sm">已支付：</span>
-            <span class="text-base">{{ lastMonthChargeData.common_pay_count ?? '-' }}单</span>
+  <div class="w-full card-wrapper">
+    <div v-if="rolesIdentify.includes('optimizer')" class="w-full text-gray-500">
+      *上半部分统计的是当前小程序的数据
+    </div>
+    <div class="flex ">
+      <el-card class="box-card" shadow="hover" v-action="'statistic.chargeTJ.todayCharge'">
+        <template #header>
+          <div class="flex items-center justify-between card-header">
+            <div class="flex items-center">
+              <span>今日充值</span>
+              <el-tooltip placement="top">
+                <template #content>
+                  截至当前时间，今日累计充值<br />
+                </template>
+                <el-icon>
+                  <InfoFilled />
+                </el-icon>
+              </el-tooltip>
+            </div>
+            <p class="text-red-300">{{ timer.seconds }}s后刷新</p>
           </div>
+        </template>
+        <div class="money-wrapper">￥{{ todayChargeData.pay_money ?? '-' }}</div>
+        <div class="flex items-center justify-between">
           <div>
-            <span class="text-sm">未支付：</span>
-            <span class="text-base">{{ lastMonthChargeData.common_unpay_count ?? '-' }}单</span>
+            <p class="text-lg font-bold">普通充值</p>
+            <div>
+              <span class="text-sm">已支付：</span>
+              <span class="text-base">{{ todayChargeData.common_pay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">未支付：</span>
+              <span class="text-base">{{ todayChargeData.common_unpay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">支付率：</span>
+              <span class="text-base">{{ todayChargeData.company_pay_rate ?? '-' }}</span>
+            </div>
           </div>
           <div>
-            <span class="text-sm">支付率：</span>
-            <span class="text-base">{{ lastMonthChargeData.company_pay_rate ?? '-' }}</span>
+            <p class="text-lg font-bold">会员充值</p>
+            <div>
+              <span class="text-sm">已支付：</span>
+              <span class="text-base">{{ todayChargeData.vip_pay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">未支付：</span>
+              <span class="text-base">{{ todayChargeData.vip_unpay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">支付率：</span>
+              <span class="text-base">{{ todayChargeData.vip_pay_rate ?? '-' }}</span>
+            </div>
           </div>
         </div>
-        <div>
-          <p class="text-lg font-bold">会员充值</p>
-          <div>
-            <span class="text-sm">已支付：</span>
-            <span class="text-base">{{ lastMonthChargeData.vip_pay_count ?? '-' }}单</span>
+      </el-card>
+      <el-card class="box-card" shadow="hover" v-action="'statistic.chargeTJ.currentMonthCharge'">
+        <template #header>
+          <div class="flex items-center justify-between card-header">
+            <div class="flex items-center">
+              <span>本月充值</span>
+              <el-tooltip placement="top">
+                <template #content>
+                  本月截至昨日的累计充值金额<br />
+                </template>
+                <el-icon>
+                  <InfoFilled />
+                </el-icon>
+              </el-tooltip>
+              <span class="ml-2 text-red-300">(不包含当日)</span>
+            </div>
           </div>
+        </template>
+        <div class="money-wrapper">￥{{ currentMonthChargeData.pay_money ?? '-' }}</div>
+        <div class="flex items-center justify-between">
           <div>
-            <span class="text-sm">未支付：</span>
-            <span class="text-base">{{ lastMonthChargeData.vip_unpay_count ?? '-' }}单</span>
+            <p class="text-lg font-bold">普通充值</p>
+            <div>
+              <span class="text-sm">已支付：</span>
+              <span class="text-base">{{ currentMonthChargeData.common_pay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">未支付：</span>
+              <span class="text-base">{{ currentMonthChargeData.common_unpay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">支付率：</span>
+              <span class="text-base">{{ currentMonthChargeData.company_pay_rate ?? '-' }}</span>
+            </div>
           </div>
           <div>
-            <span class="text-sm">支付率：</span>
-            <span class="text-base">{{ lastMonthChargeData.vip_pay_rate ?? '-' }}</span>
+            <p class="text-lg font-bold">会员充值</p>
+            <div>
+              <span class="text-sm">已支付：</span>
+              <span class="text-base">{{ currentMonthChargeData.vip_pay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">未支付：</span>
+              <span class="text-base">{{ currentMonthChargeData.vip_unpay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">支付率：</span>
+              <span class="text-base">{{ currentMonthChargeData.vip_pay_rate ?? '-' }}</span>
+            </div>
           </div>
         </div>
-      </div>
-    </el-card>
-    <el-card class="box-card" shadow="hover" v-action="'statistic.chargeTJ.totalCharge'">
-      <template #header>
-        <div class="flex items-center justify-between card-header">
-          <div class="flex items-center">
-            <span>累计充值</span>
-            <el-tooltip placement="top">
-              <template #content>
-                昨日及之前的所有累计充值金额<br />
-              </template>
-              <el-icon>
-                <InfoFilled />
-              </el-icon>
-            </el-tooltip>
-            <span class="ml-2 text-red-300">(不包含当日)</span>
+      </el-card>
+      <el-card class="box-card" shadow="hover" v-action="'statistic.chargeTJ.lastMonthCharge'">
+        <template #header>
+          <div class="flex items-center justify-between card-header">
+            <div class="flex items-center">
+              <span>上月充值</span>
+              <el-tooltip placement="top">
+                <template #content>
+                  上月的累计充值<br />
+                </template>
+                <el-icon>
+                  <InfoFilled />
+                </el-icon>
+              </el-tooltip>
+            </div>
           </div>
-        </div>
-      </template>
-      <div class="money-wrapper">￥{{ totalChargeData.pay_money ?? '-' }}</div>
-      <div class="flex items-center justify-between">
-        <div>
-          <p class="text-lg font-bold">普通充值</p>
+        </template>
+        <div class="money-wrapper">￥{{ lastMonthChargeData.pay_money ?? '-' }}</div>
+        <div class="flex items-center justify-between">
           <div>
-            <span class="text-sm">已支付：</span>
-            <span class="text-base">{{ totalChargeData.common_pay_count ?? '-' }}单</span>
+            <p class="text-lg font-bold">普通充值</p>
+            <div>
+              <span class="text-sm">已支付：</span>
+              <span class="text-base">{{ lastMonthChargeData.common_pay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">未支付：</span>
+              <span class="text-base">{{ lastMonthChargeData.common_unpay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">支付率：</span>
+              <span class="text-base">{{ lastMonthChargeData.company_pay_rate ?? '-' }}</span>
+            </div>
           </div>
           <div>
-            <span class="text-sm">未支付：</span>
-            <span class="text-base">{{ totalChargeData.common_unpay_count ?? '-' }}单</span>
-          </div>
-          <div>
-            <span class="text-sm">支付率：</span>
-            <span class="text-base">{{ totalChargeData.company_pay_rate ?? '-' }}</span>
+            <p class="text-lg font-bold">会员充值</p>
+            <div>
+              <span class="text-sm">已支付：</span>
+              <span class="text-base">{{ lastMonthChargeData.vip_pay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">未支付：</span>
+              <span class="text-base">{{ lastMonthChargeData.vip_unpay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">支付率：</span>
+              <span class="text-base">{{ lastMonthChargeData.vip_pay_rate ?? '-' }}</span>
+            </div>
           </div>
         </div>
-        <div>
-          <p class="text-lg font-bold">会员充值</p>
-          <div>
-            <span class="text-sm">已支付：</span>
-            <span class="text-base">{{ totalChargeData.vip_pay_count ?? '-' }}单</span>
+      </el-card>
+      <el-card class="box-card" shadow="hover" v-action="'statistic.chargeTJ.totalCharge'">
+        <template #header>
+          <div class="flex items-center justify-between card-header">
+            <div class="flex items-center">
+              <span>累计充值</span>
+              <el-tooltip placement="top">
+                <template #content>
+                  昨日及之前的所有累计充值金额<br />
+                </template>
+                <el-icon>
+                  <InfoFilled />
+                </el-icon>
+              </el-tooltip>
+              <span class="ml-2 text-red-300">(不包含当日)</span>
+            </div>
           </div>
+        </template>
+        <div class="money-wrapper">￥{{ totalChargeData.pay_money ?? '-' }}</div>
+        <div class="flex items-center justify-between">
           <div>
-            <span class="text-sm">未支付：</span>
-            <span class="text-base">{{ totalChargeData.vip_unpay_count ?? '-' }}单</span>
+            <p class="text-lg font-bold">普通充值</p>
+            <div>
+              <span class="text-sm">已支付：</span>
+              <span class="text-base">{{ totalChargeData.common_pay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">未支付：</span>
+              <span class="text-base">{{ totalChargeData.common_unpay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">支付率：</span>
+              <span class="text-base">{{ totalChargeData.company_pay_rate ?? '-' }}</span>
+            </div>
           </div>
           <div>
-            <span class="text-sm">支付率：</span>
-            <span class="text-base">{{ totalChargeData.vip_pay_rate ?? '-' }}</span>
+            <p class="text-lg font-bold">会员充值</p>
+            <div>
+              <span class="text-sm">已支付：</span>
+              <span class="text-base">{{ totalChargeData.vip_pay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">未支付：</span>
+              <span class="text-base">{{ totalChargeData.vip_unpay_count ?? '-' }}单</span>
+            </div>
+            <div>
+              <span class="text-sm">支付率：</span>
+              <span class="text-base">{{ totalChargeData.vip_pay_rate ?? '-' }}</span>
+            </div>
           </div>
         </div>
-      </div>
-    </el-card>
+      </el-card>
+    </div>
   </div>
 </template>