From b3695ecb581cd4573e49e0deb09de6899b09c707 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 24 Jan 2025 10:25:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creditInstallmentAnalysis/index.vue       | 59 ++++++++++++++----
 src/views/invest/onlineLendAnalysis/index.vue | 60 +++++++++++++++----
 2 files changed, 96 insertions(+), 23 deletions(-)

diff --git a/src/views/invest/creditInstallmentAnalysis/index.vue b/src/views/invest/creditInstallmentAnalysis/index.vue
index 427d63d..b771a95 100644
--- a/src/views/invest/creditInstallmentAnalysis/index.vue
+++ b/src/views/invest/creditInstallmentAnalysis/index.vue
@@ -53,8 +53,8 @@
         <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
       </div>
     </div>
-    <div class="main-con" style="height: calc(100% - 2.05rem)">
-      <div class="summary-con">
+    <div class="main-con" style="height: calc(100% - 1.45rem)">
+      <div class="summary-con" style="height: 115px">
         <div class="center-con">
           <div class="img">
             <img src="@/assets/images/accumulate.png" alt="" />
@@ -72,7 +72,7 @@
             <img src="@/assets/images/accumulate.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">未结清分期（本息）</div>
+            <div class="title">未结清（本息）</div>
             <div>
               <span class="num">{{ historyObj.unClearedDetail }}</span> <span class="unit"></span>
             </div>
@@ -84,7 +84,32 @@
             <img src="@/assets/images/accumulate.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">当期应还金额</div>
+            <div class="title">未结清本金</div>
+            <div>
+              <span class="num">{{ historyObj.unClearedPrincipal }}</span> <span class="unit"></span>
+            </div>
+          </div>
+        </div>
+
+        <div class="center-con">
+          <div class="img">
+            <img src="@/assets/images/accumulate.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">未结清利息</div>
+            <div>
+              <span class="num">{{ historyObj.unClearedInterest }}</span> <span class="unit"></span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="summary-con" style="height: 110px">
+        <div class="center-con">
+          <div class="img">
+            <img src="@/assets/images/accumulate.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">当期应还本息</div>
             <div>
               <span class="num">{{ historyObj.dueDetail }}</span> <span class="unit"></span>
             </div>
@@ -96,24 +121,36 @@
             <img src="@/assets/images/accumulate.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">当期已还金额</div>
+            <div class="title">当期已还本息</div>
             <div>
               <span class="num">{{ historyObj.repaidDetail }}</span> <span class="unit"></span>
             </div>
           </div>
         </div>
 
-        <div class="right-con">
+        <div class="center-con">
           <div class="img">
-            <img src="@/assets/images/average.png" alt="" />
+            <img src="@/assets/images/accumulate.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">当期待还金额</div>
+            <div class="title">当期待还本息</div>
             <div>
               <span class="num">{{ historyObj.leftDetail }}</span> <span class="unit"></span>
             </div>
           </div>
         </div>
+
+        <div class="center-con">
+          <div class="img">
+            <img src="@/assets/images/accumulate.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">当期利息</div>
+            <div>
+              <span class="num">{{ historyObj.dueInterest }}</span> <span class="unit"></span>
+            </div>
+          </div>
+        </div>
       </div>
       <div class="title-con">
         <div class="title">信用卡分期还款计划</div>
@@ -126,9 +163,9 @@
         </div>
       </div>
       <div class="content-con">
-        <div v-show="radioVal === '柱状图'" class="chart" id="chartBar" style="height: calc(100% - 170px)"></div>
-        <div v-show="radioVal === '折线图'" class="chart" id="chartLine" style="height: calc(100% - 170px)"></div>
-        <el-table v-show="radioVal === '表格'" v-loading="loading" :data="historyObj.tableHistoryDetailList" height="calc(100% - 170px)">
+        <div v-show="radioVal === '柱状图'" class="chart" id="chartBar" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <div v-show="radioVal === '折线图'" class="chart" id="chartLine" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <el-table v-show="radioVal === '表格'" v-loading="loading" :data="historyObj.tableHistoryDetailList" height="calc(100% - 245px)">
           <el-table-column label="序号" width="50" type="index" align="center">
             <template #default="scope">
               <span>{{ scope.$index + 1 }}</span>
diff --git a/src/views/invest/onlineLendAnalysis/index.vue b/src/views/invest/onlineLendAnalysis/index.vue
index 84f4016..06e91b1 100644
--- a/src/views/invest/onlineLendAnalysis/index.vue
+++ b/src/views/invest/onlineLendAnalysis/index.vue
@@ -53,8 +53,8 @@
         <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
       </div>
     </div>
-    <div class="main-con" style="height: calc(100% - 2.05rem)">
-      <div class="summary-con">
+    <div class="main-con" style="height: calc(100% - 1.45rem)">
+      <div class="summary-con" style="height: 115px">
         <div class="center-con">
           <div class="img">
             <img src="@/assets/images/accumulate.png" alt="" />
@@ -72,7 +72,7 @@
             <img src="@/assets/images/accumulate.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">未结清贷款（本息）</div>
+            <div class="title">未结清（本息）</div>
             <div>
               <span class="num">{{ historyObj.unClearedDetail }}</span> <span class="unit"></span>
             </div>
@@ -84,9 +84,9 @@
             <img src="@/assets/images/accumulate.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">当期应还金额</div>
+            <div class="title">未结清本金</div>
             <div>
-              <span class="num">{{ historyObj.dueDetail }}</span> <span class="unit"></span>
+              <span class="num">{{ historyObj.unClearedPrincipal }}</span> <span class="unit"></span>
             </div>
           </div>
         </div>
@@ -96,24 +96,60 @@
             <img src="@/assets/images/accumulate.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">当期已还金额</div>
+            <div class="title">未结清利息</div>
+            <div>
+              <span class="num">{{ historyObj.unClearedInterest }}</span> <span class="unit"></span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="summary-con" style="height: 110px">
+        <div class="center-con">
+          <div class="img">
+            <img src="@/assets/images/accumulate.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">当期应还本息</div>
+            <div>
+              <span class="num">{{ historyObj.dueDetail }}</span> <span class="unit"></span>
+            </div>
+          </div>
+        </div>
+        <div class="center-con">
+          <div class="img">
+            <img src="@/assets/images/accumulate.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">当期已还本息</div>
             <div>
               <span class="num">{{ historyObj.repaidDetail }}</span> <span class="unit"></span>
             </div>
           </div>
         </div>
 
-        <div class="right-con">
+        <div class="center-con">
           <div class="img">
-            <img src="@/assets/images/average.png" alt="" />
+            <img src="@/assets/images/accumulate.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">当期待还金额</div>
+            <div class="title">当期待还本息</div>
             <div>
               <span class="num">{{ historyObj.leftDetail }}</span> <span class="unit"></span>
             </div>
           </div>
         </div>
+
+        <div class="center-con">
+          <div class="img">
+            <img src="@/assets/images/accumulate.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">当期利息</div>
+            <div>
+              <span class="num">{{ historyObj.dueInterest }}</span> <span class="unit"></span>
+            </div>
+          </div>
+        </div>
       </div>
       <div class="title-con">
         <div class="title">贷款还款计划</div>
@@ -126,9 +162,9 @@
         </div>
       </div>
       <div class="content-con">
-        <div v-show="radioVal === '柱状图'" class="chart" id="chartBar" style="height: calc(100% - 170px)"></div>
-        <div v-show="radioVal === '折线图'" class="chart" id="chartLine" style="height: calc(100% - 170px)"></div>
-        <el-table v-show="radioVal === '表格'" v-loading="loading" :data="historyObj.tableHistoryDetailList" height="calc(100% - 170px)">
+        <div v-show="radioVal === '柱状图'" class="chart" id="chartBar" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <div v-show="radioVal === '折线图'" class="chart" id="chartLine" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <el-table v-show="radioVal === '表格'" v-loading="loading" :data="historyObj.tableHistoryDetailList" height="calc(100% - 245px)">
           <el-table-column label="序号" width="50" type="index" align="center">
             <template #default="scope">
               <span>{{ scope.$index + 1 }}</span>