Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

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() {