From 3b3f7b237194b30d16757a5ef18bb05c4cb059b8 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 10 Feb 2025 12:21:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=99=BA=E8=81=AA=E8=AE=B0=E8=B4=A6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E7=BB=93=E7=AE=97=E5=8D=A1=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E3=80=81POS=E6=9C=BA=E7=BB=9F=E8=AE=A1=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invest/debitCardAnalysis/index.vue | 68 ++++++++++---------
 src/views/invest/posStatics/index.vue        | 70 +++++++++++---------
 2 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/src/views/invest/debitCardAnalysis/index.vue b/src/views/invest/debitCardAnalysis/index.vue
index 589d90f..973eacd 100644
--- a/src/views/invest/debitCardAnalysis/index.vue
+++ b/src/views/invest/debitCardAnalysis/index.vue
@@ -2,6 +2,28 @@
   <div class="app-container">
     <div class="main-con" style="height: calc(100% - 0rem)">
       <div class="summary-con" style="height: 115px">
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">今日结算</div>
+            <div>
+              <span class="num">{{ debitCardAnalysis.todayCount }}</span> <span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">今日收款</div>
+            <div>
+              <span class="num">{{ debitCardAnalysis.todayAmount }}</span> <span class="unit"></span>
+            </div>
+          </div>
+        </div>
         <div class="right-con">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
@@ -46,28 +68,6 @@
             </div>
           </div>
         </div>
-        <div class="right-con">
-          <div class="img">
-            <img src="@/assets/images/average.png" alt="" />
-          </div>
-          <div class="item-wrap">
-            <div class="title">近3月结算</div>
-            <div>
-              <span class="num">{{ debitCardAnalysis.threeMonthCount }}</span> <span class="unit">次</span>
-            </div>
-          </div>
-        </div>
-        <div class="right-con">
-          <div class="img">
-            <img src="@/assets/images/average.png" alt="" />
-          </div>
-          <div class="item-wrap">
-            <div class="title">近3月收款</div>
-            <div>
-              <span class="num">{{ debitCardAnalysis.threeMonthAmount }}</span> <span class="unit"></span>
-            </div>
-          </div>
-        </div>
       </div>
       <div class="summary-con" style="height: 110px">
         <div class="right-con">
@@ -119,9 +119,9 @@
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">近2年结算</div>
+            <div class="title">总结算次数</div>
             <div>
-              <span class="num">{{ debitCardAnalysis.twoYearCount }}</span> <span class="unit">次</span>
+              <span class="num">{{ debitCardAnalysis.totalCount }}</span> <span class="unit">次</span>
             </div>
           </div>
         </div>
@@ -130,9 +130,9 @@
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">近2年收款</div>
+            <div class="title">总收款金额</div>
             <div>
-              <span class="num">{{ debitCardAnalysis.twoYearAmount }}</span> <span class="unit"></span>
+              <span class="num">{{ debitCardAnalysis.totalAmount }}</span> <span class="unit"></span>
             </div>
           </div>
         </div>
@@ -157,16 +157,20 @@
             </template>
           </el-table-column>
           <el-table-column label="结算卡" align="center" prop="nameCode" />
-          <el-table-column label="近7日结算次数" align="center" prop="sevenDayCount" />
-          <el-table-column label="近7日收款金额" align="center" prop="sevenDayAmount" />
+          <el-table-column label="今日结算次数" align="center" prop="todayCount" />
+          <el-table-column label="今日收款金额" align="center" prop="todayAmount" />
+          <!-- <el-table-column label="近7日结算" align="center" prop="sevenDayCount" />
+          <el-table-column label="近7日收款" align="center" prop="sevenDayAmount" /> -->
           <el-table-column label="近1月结算次数" align="center" prop="oneMonthCount" />
           <el-table-column label="近1月收款金额" align="center" prop="oneMonthAmount" />
-          <el-table-column label="近3月结算次数" align="center" prop="threeMonthCount" />
-          <el-table-column label="近3月收款金额" align="center" prop="threeMonthAmount" />
+          <!-- <el-table-column label="近3月结算" align="center" prop="threeMonthCount" />
+          <el-table-column label="近3月收款" align="center" prop="threeMonthAmount" /> -->
           <el-table-column label="近6月结算次数" align="center" prop="sixMonthCount" />
           <el-table-column label="近6月收款金额" align="center" prop="sixMonthAmount" />
-          <el-table-column label="近2年结算次数" align="center" prop="twoYearCount" />
-          <el-table-column label="近2年收款金额" align="center" prop="twoYearAmount" />
+          <el-table-column label="近1年结算次数" align="center" prop="oneYearCount" />
+          <el-table-column label="近1年收款金额" align="center" prop="oneYearAmount" />
+          <el-table-column label="总结算次数" align="center" prop="totalCount" />
+          <el-table-column label="总收款金额" align="center" prop="totalAmount" />
         </el-table>
       </div>
     </div>
diff --git a/src/views/invest/posStatics/index.vue b/src/views/invest/posStatics/index.vue
index 5d75a0c..98c3195 100644
--- a/src/views/invest/posStatics/index.vue
+++ b/src/views/invest/posStatics/index.vue
@@ -2,6 +2,28 @@
   <div class="app-container">
     <div class="main-con" style="height: calc(100% - 0rem)">
       <div class="summary-con" style="height: 115px">
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">今日交易</div>
+            <div>
+              <span class="num">{{ debitCardAnalysis.todayCount }}</span> <span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="center-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">今日刷卡</div>
+            <div>
+              <span class="num">{{ debitCardAnalysis.todayAmount }}</span>
+            </div>
+          </div>
+        </div>
         <div class="right-con">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
@@ -29,7 +51,7 @@
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">近1月交易</div>
+            <div class="title">近1月交易次数</div>
             <div>
               <span class="num">{{ debitCardAnalysis.oneMonthCount }}</span> <span class="unit">次</span>
             </div>
@@ -46,28 +68,6 @@
             </div>
           </div>
         </div>
-        <div class="right-con">
-          <div class="img">
-            <img src="@/assets/images/average.png" alt="" />
-          </div>
-          <div class="item-wrap">
-            <div class="title">近3月交易</div>
-            <div>
-              <span class="num">{{ debitCardAnalysis.threeMonthCount }}</span> <span class="unit">次</span>
-            </div>
-          </div>
-        </div>
-        <div class="right-con">
-          <div class="img">
-            <img src="@/assets/images/average.png" alt="" />
-          </div>
-          <div class="item-wrap">
-            <div class="title">近3月刷卡</div>
-            <div>
-              <span class="num">{{ debitCardAnalysis.threeMonthAmount }}</span> <span class="unit"></span>
-            </div>
-          </div>
-        </div>
       </div>
       <div class="summary-con" style="height: 110px">
         <div class="right-con">
@@ -119,9 +119,9 @@
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">近2年交易</div>
+            <div class="title">总交易次数</div>
             <div>
-              <span class="num">{{ debitCardAnalysis.twoYearCount }}</span> <span class="unit">次</span>
+              <span class="num">{{ debitCardAnalysis.totalCount }}</span> <span class="unit">次</span>
             </div>
           </div>
         </div>
@@ -130,9 +130,9 @@
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">近2年刷卡</div>
+            <div class="title">总刷卡金额</div>
             <div>
-              <span class="num">{{ debitCardAnalysis.twoYearAmount }}</span> <span class="unit"></span>
+              <span class="num">{{ debitCardAnalysis.totalAmount }}</span> <span class="unit"></span>
             </div>
           </div>
         </div>
@@ -157,16 +157,20 @@
             </template>
           </el-table-column>
           <el-table-column label="POS机" align="center" prop="nameCode" />
-          <el-table-column label="近7日交易次数" align="center" prop="sevenDayCount" />
-          <el-table-column label="近7日刷卡金额" align="center" prop="sevenDayAmount" />
+          <el-table-column label="今日交易次数" align="center" prop="todayCount" />
+          <el-table-column label="今日刷卡金额" align="center" prop="todayAmount" />
+          <!-- <el-table-column label="近7日交易次数" align="center" prop="sevenDayCount" />
+          <el-table-column label="近7日刷卡金额" align="center" prop="sevenDayAmount" /> -->
           <el-table-column label="近1月交易次数" align="center" prop="oneMonthCount" />
           <el-table-column label="近1月刷卡金额" align="center" prop="oneMonthAmount" />
-          <el-table-column label="近3月交易次数" align="center" prop="threeMonthCount" />
-          <el-table-column label="近3月刷卡金额" align="center" prop="threeMonthAmount" />
+          <!-- <el-table-column label="近3月交易次数" align="center" prop="threeMonthCount" />
+          <el-table-column label="近3月刷卡金额" align="center" prop="threeMonthAmount" /> -->
           <el-table-column label="近6月交易次数" align="center" prop="sixMonthCount" />
           <el-table-column label="近6月刷卡金额" align="center" prop="sixMonthAmount" />
-          <el-table-column label="近2年交易次数" align="center" prop="twoYearCount" />
-          <el-table-column label="近2年刷卡金额" align="center" prop="twoYearAmount" />
+          <el-table-column label="近1年交易次数" align="center" prop="oneYearCount" />
+          <el-table-column label="近1年刷卡金额" align="center" prop="oneYearAmount" />
+          <el-table-column label="总交易次数" align="center" prop="totalCount" />
+          <el-table-column label="总刷卡金额" align="center" prop="totalAmount" />
         </el-table>
       </div>
     </div>