From d9b74181451b6dcd0bd9414d2d472c59099faa46 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 4 Jan 2024 16:31:05 +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-admin/src/main/resources/application-dev.yml | 8 ++++----
 jsowell-ui/src/views/order/order/index.vue           | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml
index 01a6c12db..d069fd943 100644
--- a/jsowell-admin/src/main/resources/application-dev.yml
+++ b/jsowell-admin/src/main/resources/application-dev.yml
@@ -36,10 +36,10 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: jsowell_dev
-#        url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: jsowell_prd_copy
+        #url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        #username: jsowell_dev
+        url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: jsowell_prd_copy
         password: 123456
       # 从库数据源
       slave:
diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index d97882fcc..eeb06105f 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -77,8 +77,8 @@
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
                 v-hasPermi="['order:order:export']">导出
             </el-button>
-            <div>
-                {{ dateDescription }}期间，总用电量{{sumUsedElectricity}}度，总消费金额{{ sumOrderAmount }}元，总结算金额{{sumSettleAmount}}元
+            <div v-for="totalDate in totalDateList">
+                {{ totalDate.dateDescription }}期间，总用电量{{totalDate.sumUsedElectricity}}度，总消费金额{{ totalDate.sumOrderAmount }}元，总结算金额{{totalDate.sumSettleAmount}}元
             </div>
             <el-popover placement="top-start" width="400" trigger="click">
                 <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
@@ -190,6 +190,7 @@ export default {
             checkedCities: [],
             cities: ["订单状态描述", "启动方式", "起始SOC", "终止SOC"],
             isIndeterminate: true,
+            totalDateList: [],
             dateDescription: "",
             sumOrderAmount: "",
             sumUsedElectricity: "",