Преглед на файлове

fix: 走势图总金额改为订单实收金额,汇总标签改「总订单实收金额」

skyline преди 3 дни
родител
ревизия
1f64624924
променени са 1 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 6 6
      admin-web-new/src/views/admin/dashboard/index.vue

+ 6 - 6
admin-web-new/src/views/admin/dashboard/index.vue

@@ -123,7 +123,7 @@ const initLineChart = (dataList: Array<any>) => {
     item.seq = Number(item.statTime.join(""));
   });
 
-  state.homeOneExtra.totalIncome = dataList.reduce((k, v) => k + v.totalAmount, 0);
+  state.homeOneExtra.totalIncome = dataList.reduce((k, v) => k + v.amountReceived, 0);
   state.homeOneExtra.totalWashOrders = dataList.reduce((k, v) => k + v.totalOrders, 0);
 
   dataList.sort((a, b) => a.seq - b.seq);
@@ -141,13 +141,13 @@ const initLineChart = (dataList: Array<any>) => {
       trigger: "axis",
       formatter: (params: any) => {
         const bar = params.find((p: any) => p.seriesName === "洗车量");
-        const line = params.find((p: any) => p.seriesName === "总金额");
+        const line = params.find((p: any) => p.seriesName === "订单实收金额");
         const barVal = bar ? `${bar.value} 次` : "";
         const lineVal = line ? `¥${line.value}` : "";
         return `${params[0].axisValue}<br/>${barVal}<br/>${lineVal}`;
       }
     },
-    legend: { data: ["洗车量", "总金额"], right: 10, top: 5 },
+    legend: { data: ["洗车量", "订单实收金额"], right: 10, top: 5 },
     xAxis: {
       data: dataList.map(k => k.startTime),
       axisLine: { lineStyle: { color: state.charts.color } }
@@ -182,13 +182,13 @@ const initLineChart = (dataList: Array<any>) => {
         }
       },
       {
-        name: "总金额",
+        name: "订单实收金额",
         type: "line",
         symbolSize: 6,
         symbol: "circle",
         smooth: true,
         yAxisIndex: 1,
-        data: dataList.map(k => (k.totalAmount / 100).toFixed(2)),
+        data: dataList.map(k => (k.amountReceived / 100).toFixed(2)),
         lineStyle: { color: "#409EFF" },
         itemStyle: { color: "#409EFF", borderColor: "#409EFF" }
       }
@@ -388,7 +388,7 @@ watch(
               style="width: 280px"
             />
             <div class="chart-summary">
-              总收益:
+              总订单实收金额:
               <el-tag type="success" effect="plain" size="small">{{ fmtMoney(state.homeOneExtra.totalIncome) }}元</el-tag>
               总订单:
               <el-tag type="danger" effect="plain" size="small">{{ state.homeOneExtra.totalWashOrders }}笔</el-tag>