Merge remote-tracking branch 'origin/dev' into dev

src/pages/index/index.vue

@@ -113,7 +113,7 @@ const state = reactive({
   chartData: null,
   uChartsInstance: {},
   canvasList: [{
-    label: '总金额&服务费',
+    label: '充电量&实收服务费',
     id: 'charge-ele-total'
   },
    /* {
@@ -121,7 +121,7 @@ const state = reactive({
       id: 'elec-power'
     },*/
     {
-      label: '充电客户&订单',
+      label: '充电人数&订单',
       id: 'charge-user-order'
     },
     {
@@ -214,7 +214,7 @@ const loadTodayStat = () => {
   })
 
   //状态 '离线:0', '空闲:1', '已连接:2', '充电中:3', '预约中:4', '故障:255'
-  get(`/equipment/statEquipmentStatus?stationId=${stationId}`).then(res => {
+  get(`/connector/statConnectorStatus?stationId=${stationId}`).then(res => {
     drawDeviceStatusChart(res);
   })
 }
@@ -268,12 +268,12 @@ const drawServiceAndTotalMoneyChart = (stationId) => {
   }
   let categories = dataList.map(k => k.statDay.split('-').slice(1).join('-'));
   let series = [{
-    name: '总金额',
-    data: dataList.map(k => fmtMoney(k.totalMoney))
+    name: '充电量（kwh）',
+    data: dataList.map(k => k.totalPower)
   },
     {
-      name: '服务费',
-      data: dataList.map(k => fmtMoney(k.serviceMoney))
+      name: '实收服务费（元）',
+      data: dataList.map(k => fmtMoney(k.serviceMoney - k.discountAmount))
     }
   ]
   let options = {
@@ -437,7 +437,7 @@ const drawChargeUserChart = (stationId) => {
   }
   let categories = dataList.map(k => k.statDay.split('-').slice(1).join('-'));
   let series = [{
-    name: '人次',
+    name: '充电人数',
     data: dataList.map(k => k.chargeUsers)
   },
     {