From 1760d3e83562f93efc1c2287abf633ef9759308e Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Sat, 18 Mar 2023 15:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E7=BB=93=E7=AE=97=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E9=87=91=E9=A2=9D=E5=92=8C=E5=85=85=E7=94=B5=E5=BA=A6?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/order/order/orderDetail.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index f2784b443..013a7b49b 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -9,11 +9,18 @@
       <el-dialog
         title="提示"
         :visible.sync="dialogVisible"
-        width="30%"
+        width="35%"
         >
         <span>平台收到充电桩传来的最后一次实时监测数据<br/></span>
-        <span v-if="lastMonitorData != null">时间:{{lastMonitorData.dateTime}}, 消费金额:{{lastMonitorData.chargingAmount}}, 充电度数:{{lastMonitorData.chargingDegree}}</span>
-        <el-empty v-if="lastMonitorData == null" :image-size="50" description="未查询到实时监测数据"/>
+
+        <el-table style="width: 100%" :data="monitorDataList" border>
+          <el-table-column prop="dateTime" label="时间" align="center"/>
+          <el-table-column prop="chargingAmount" label="消费金额" align="center"/>
+          <el-table-column prop="chargingDegree" label="充电度数" align="center"/>
+        </el-table>
+
+        <el-divider>下面可以输入自定义消费金额和充电度数</el-divider>
+
         <el-form :model="manualSettlementParam">
           <el-form-item label="消费金额" label-width="80px">
             <el-input v-model="manualSettlementParam.chargingAmount" autocomplete="off"></el-input>
@@ -208,6 +215,7 @@ export default {
       dialogVisible: false,
       // 最后一次实时监测数据
       lastMonitorData: {},
+      monitorDataList: [this.lastMonitorData],
       // 手动结算参数
       manualSettlementParam: {},
     };