From 77c50cc1fe1d8de638c47260bae7542b2de5f880 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 4 Jan 2024 16:34:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A1=E7=AE=97=E6=80=BB=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/order/order/index.vue | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index eeb06105f..a959924af 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -77,8 +77,12 @@
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
                 v-hasPermi="['order:order:export']">导出
             </el-button>
-            <div v-for="totalDate in totalDateList">
-                {{ totalDate.dateDescription }}期间，总用电量{{totalDate.sumUsedElectricity}}度，总消费金额{{ totalDate.sumOrderAmount }}元，总结算金额{{totalDate.sumSettleAmount}}元
+            <div >
+                <ul>
+                    <li v-for="totalDate in totalDateList" >
+                        {{ totalDate.dateDescription }}期间，总用电量{{totalDate.sumUsedElectricity}}度，总消费金额{{ totalDate.sumOrderAmount }}元，总结算金额{{totalDate.sumSettleAmount}}元
+                    </li>
+                </ul>
             </div>
             <el-popover placement="top-start" width="400" trigger="click">
                 <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
@@ -379,10 +383,12 @@ export default {
         getOrderTotalData() {
             totalData(this.queryParams).then((response) => {
                 console.log("getOrderTotalData", response);
-                this.dateDescription = response.data.dateDescription;
-                this.sumOrderAmount = response.data.sumOrderAmount;
-                this.sumUsedElectricity = response.data.sumUsedElectricity;
-                this.sumSettleAmount = response.data.sumSettleAmount;
+                // this.dateDescription = response.data.dateDescription;
+                // this.sumOrderAmount = response.data.sumOrderAmount;
+                // this.sumUsedElectricity = response.data.sumUsedElectricity;
+                // this.sumSettleAmount = response.data.sumSettleAmount;
+
+                this.totalDateList = response.data;
             });
         },
         // 取消按钮