From 2616750409e1424a4707f623f123c3b269f9f7f1 Mon Sep 17 00:00:00 2001
From: JS-LM <2497833386@QQ.com>
Date: Tue, 6 Jun 2023 09:53:52 +0800
Subject: [PATCH 1/4] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E6=97=A5?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/pile/station/detail.vue  | 12 ++++--
 .../src/views/pile/station/orderReport.vue    | 37 +++++++++++--------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/jsowell-ui/src/views/pile/station/detail.vue b/jsowell-ui/src/views/pile/station/detail.vue
index 316304ba1..56faeb8e8 100644
--- a/jsowell-ui/src/views/pile/station/detail.vue
+++ b/jsowell-ui/src/views/pile/station/detail.vue
@@ -137,7 +137,7 @@
       </el-tab-pane>
 
       <el-tab-pane label="订单日报" name="orderReport">
-
+        <order-report ref="orderReport"></order-report>
       </el-tab-pane>
     </el-tabs>
 
@@ -162,16 +162,17 @@ import connectorList from "./connectorList.vue";
 import pileList from "./pileList.vue";
 import MapContainer from "../../../components/MapContainer/MapContainer.vue";
 import stationOrderList from "@/views/pile/station/stationOrderList";
-import stationWhiteList from "@/views/pile/station/stationWhiteList";
+import stationWhiteList from "@/views/pile/station/stationWhiteList"; 
 import {
   getStationInfo,
   updateStationQRCodePrefix,
   getSettingByStationId,
   updateSettingByStationId,
   pushStationInfo,
-  getSettingInfo
+  getSettingInfo,
 } from "@/api/pile/station";
 import Whitelist from "@/views/pile/station/stationWhiteList";
+import OrderReport from './orderReport.vue';
 
 export default {
   dicts: ["third_party_type"],
@@ -183,7 +184,8 @@ export default {
     Billing,
     MapContainer,
     stationOrderList,
-    stationWhiteList
+    stationWhiteList,
+    OrderReport
   },
   data() {
     return {
@@ -235,6 +237,8 @@ export default {
         this.$refs.stationInfo.queryStationInfo();
       } else if (name === "order") {
         this.$refs.order.dataLoading();
+      } else if (name === 'orderReport'){
+        this.$refs.orderReport.getList();
       }
     },
     queryStationInfo() {
diff --git a/jsowell-ui/src/views/pile/station/orderReport.vue b/jsowell-ui/src/views/pile/station/orderReport.vue
index ea142dd12..6ce299a58 100644
--- a/jsowell-ui/src/views/pile/station/orderReport.vue
+++ b/jsowell-ui/src/views/pile/station/orderReport.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="运营商id" prop="merchantId">
+      <!-- <el-form-item label="运营商id" prop="merchantId">
         <el-input
           v-model="queryParams.merchantId"
           placeholder="请输入运营商id"
@@ -72,16 +72,18 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="交易日期" prop="tradeDate">
-        <el-input
-          v-model="queryParams.tradeDate"
-          placeholder="请输入交易日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+    <el-date-picker
+      v-model="value"
+      type="daterange"
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期">
+    </el-date-picker>
       </el-form-item>
-      <el-form-item label="交易金额" prop="tradeAmount">
+      <!-- <el-form-item label="交易金额" prop="tradeAmount">
         <el-input
           v-model="queryParams.tradeAmount"
           placeholder="请输入交易金额"
@@ -96,14 +98,14 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -147,13 +149,13 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
+      <!-- <el-table-column label="主键" align="center" prop="id" /> -->
       <el-table-column label="运营商id" align="center" prop="merchantId" />
-      <el-table-column label="站点id" align="center" prop="stationId" />
+      <!-- <el-table-column label="站点id" align="center" prop="stationId" /> -->
       <el-table-column label="用电度数" align="center" prop="useElectricity" />
       <el-table-column label="充电次数" align="center" prop="chargeNum" />
       <el-table-column label="充电时长" align="center" prop="chargeTime" />
@@ -250,6 +252,7 @@ export default {
   name: "Report",
   data() {
     return {
+      value:'',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -293,13 +296,15 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
   },
   methods: {
     /** 查询结算订单报列表 */
     getList() {
       this.loading = true;
+      this.queryParams.stationId = this.$route.params.id
       listReport(this.queryParams).then(response => {
+        console.log('查询订单日报',response)
         this.reportList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -329,6 +334,7 @@ export default {
         createTime: null,
         delFlag: null
       };
+     
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -338,6 +344,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.value = null
       this.resetForm("queryForm");
       this.handleQuery();
     },

From c3f9992632020de44ee0d111a4b01d2ce3dc3236 Mon Sep 17 00:00:00 2001
From: JS-LM <2497833386@QQ.com>
Date: Tue, 6 Jun 2023 10:03:56 +0800
Subject: [PATCH 2/4] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E6=97=A5?=
 =?UTF-8?q?=E6=8A=A5=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/pile/station/orderReport.vue    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/jsowell-ui/src/views/pile/station/orderReport.vue b/jsowell-ui/src/views/pile/station/orderReport.vue
index 6ce299a58..74c267fcf 100644
--- a/jsowell-ui/src/views/pile/station/orderReport.vue
+++ b/jsowell-ui/src/views/pile/station/orderReport.vue
@@ -74,14 +74,17 @@
         />
       </el-form-item> -->
       <el-form-item label="交易日期" prop="tradeDate">
-
-    <el-date-picker
-      v-model="value"
-      type="daterange"
-      range-separator="至"
-      start-placeholder="开始日期"
-      end-placeholder="结束日期">
-    </el-date-picker>
+      <el-date-picker
+          v-model="value"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :default-time="['00:00:00', '23:59:59']"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :clearable=false
+        ></el-date-picker>
       </el-form-item>
       <!-- <el-form-item label="交易金额" prop="tradeAmount">
         <el-input
@@ -339,6 +342,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log('this.value 日期',this.value)
       this.queryParams.pageNum = 1;
       this.getList();
     },

From 8bd2871b76797504f7f9aa0bc6243e9d862e9997 Mon Sep 17 00:00:00 2001
From: JS-LM <2497833386@QQ.com>
Date: Tue, 6 Jun 2023 10:34:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?update=20=E7=94=A8=E6=88=B7=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/member/info/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jsowell-ui/src/views/member/info/index.vue b/jsowell-ui/src/views/member/info/index.vue
index 9db1f8f4d..6c53b7a54 100644
--- a/jsowell-ui/src/views/member/info/index.vue
+++ b/jsowell-ui/src/views/member/info/index.vue
@@ -92,7 +92,11 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="头像" align="center" prop="avatarUrl" />
+      <el-table-column label="头像" align="center" prop="avatarUrl" >
+      <template slot-scope="scope">
+        <img :src="scope.row.avatarUrl">
+      </template>
+      </el-table-column>
       <el-table-column label="手机号" align="center" prop="mobileNumber" />
       <el-table-column label="本金余额" align="center" prop="principalBalance" />
       <el-table-column label="赠送余额" align="center" prop="giftBalance" />

From 1fa43a2e13ccc40a2582600980d5e714a4b08887 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 6 Jun 2023 10:43:16 +0800
Subject: [PATCH 4/4] update

---
 jsowell-ui/src/views/pile/station/orderReport.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jsowell-ui/src/views/pile/station/orderReport.vue b/jsowell-ui/src/views/pile/station/orderReport.vue
index 74c267fcf..1331f18b0 100644
--- a/jsowell-ui/src/views/pile/station/orderReport.vue
+++ b/jsowell-ui/src/views/pile/station/orderReport.vue
@@ -157,8 +157,9 @@
     <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键" align="center" prop="id" /> -->
-      <el-table-column label="运营商id" align="center" prop="merchantId" />
+<!--      <el-table-column label="运营商id" align="center" prop="merchantId" />-->
       <!-- <el-table-column label="站点id" align="center" prop="stationId" /> -->
+      <el-table-column label="交易日期" align="center" prop="tradeDate" />
       <el-table-column label="用电度数" align="center" prop="useElectricity" />
       <el-table-column label="充电次数" align="center" prop="chargeNum" />
       <el-table-column label="充电时长" align="center" prop="chargeTime" />
@@ -166,7 +167,6 @@
       <el-table-column label="服务费金额" align="center" prop="serviceAmount" />
       <el-table-column label="收入金额" align="center" prop="totalAmount" />
       <el-table-column label="虚拟金额" align="center" prop="virtualAmount" />
-      <el-table-column label="交易日期" align="center" prop="tradeDate" />
       <el-table-column label="交易金额" align="center" prop="tradeAmount" />
       <el-table-column label="交易手续费" align="center" prop="tradeFee" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -337,7 +337,7 @@ export default {
         createTime: null,
         delFlag: null
       };
-     
+
       this.resetForm("form");
     },
     /** 搜索按钮操作 */