From 79d57005045820c9f388bc75bfa5d83eddfbdcf6 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 2 Jun 2021 16:06:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B9=B3=E5=8F=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A6=96=E9=A1=B5=E8=8E=B7=E5=8F=96=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/api/member.js       | 13 ++++--
 manager/src/views/home/home.vue | 71 ++++++++++++++++++++++++++++++---
 2 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/manager/src/api/member.js b/manager/src/api/member.js
index 8f07de09..fbce5ce1 100644
--- a/manager/src/api/member.js
+++ b/manager/src/api/member.js
@@ -98,11 +98,16 @@ export const getMemberStatistics = params => {
 };
 
 
-
 // 获取会员注册统计列表
 export const getStatisticsList = params => {
   return getRequest("/statistics/view/list", params);
 };
+
+// 获取会员历史流量
+export const historyMemberChartList = () => {
+  return getRequest("/statistics/view/online/history");
+}
+
 //查询会员数量
 export const getMemberNum = params => {
   return getRequest("/member/num", params);
@@ -121,15 +126,15 @@ export const removeMemberAddress = (id) => {
 }
 //添加会员收货地址
 export const addMemberAddress = (params) => {
-  return postRequest(`/member/address`,params)
+  return postRequest(`/member/address`, params)
 }
 //修改会员收货地址
 export const editMemberAddress = (params) => {
-  return putRequest(`/member/address`,params)
+  return putRequest(`/member/address`, params)
 }
 //查询会员预存款
 export const getMemberWallet = (params) => {
-  return getRequest(`/members/wallet`,params)
+  return getRequest(`/members/wallet`, params)
 }
 
 
diff --git a/manager/src/views/home/home.vue b/manager/src/views/home/home.vue
index 2802c29e..3f340a8c 100644
--- a/manager/src/views/home/home.vue
+++ b/manager/src/views/home/home.vue
@@ -172,14 +172,22 @@
         </div>
       </div>
     </div>
+
+    <!-- chart -->
+    <div class="card transform">
+      <div>
+        <h4>最近48小时在线人数（整点为准）</h4>
+        <div id="historyMemberChart"></div>
+      </div>
+    </div>
     <!-- chart -->
     <div class="charts  flex">
       <div class="chart-item">
-        <h4>流量统计</h4>
+        <h4>流量走势</h4>
         <div id="pvChart"></div>
       </div>
       <div class="chart-item">
-        <h4>交易统计</h4>
+        <h4>交易趋势</h4>
         <div id="orderChart"></div>
       </div>
     </div>
@@ -279,6 +287,7 @@ export default {
       homeData: "", // 首页数据
       pvChart: "", // 流量统计
       orderChart: "", // 订单统计
+      historyMemberChart: "", // 最近会员流量统计
       params: { // 请求参数
         searchType: "LAST_SEVEN",
       },
@@ -308,13 +317,13 @@ export default {
     },
     // top10热卖商品
     async toHotGoods() {
-      let res = await hotGoods();
+      let res = await hotGoods(this.params);
       res.success ? (this.topHotGoodsData = res.result) : "";
     },
 
     // top10热卖店铺
     async topHotShops() {
-      let res = await hotShops();
+      let res = await hotShops(this.params);
       res.success ? (this.topHotShopsData = res.result) : "";
     },
     // 今日待办
@@ -323,6 +332,7 @@ export default {
       res.success ? (this.awaitTodoData = res.result) : "";
     },
 
+    //首页统计数据
     async getHomeData() {
       let res = await homeStatistics();
       if (res.success) {
@@ -358,6 +368,7 @@ export default {
       }
     },
 
+
     initOrderChart() {
       // 默认已经加载 legend-filter 交互
       let data = this.chartList;
@@ -393,6 +404,9 @@ export default {
       this.orderChart.render();
     },
 
+
+
+
     // 浏览量统计图
     initPvChart() {
       let uv = [];
@@ -465,8 +479,54 @@ export default {
           this.initPvChart();
         }
       });
-    },
+    }, // 实例化会员流量图表
+    async initHistoryMemberChartList() {
+      const res = await API_Member.historyMemberChartList();
+      if (res.success) {
+        this.chartList = res.result;
 
+        if (!this.historyMemberChart) {
+          this.historyMemberChart = new Chart({
+            container: "historyMemberChart",
+            autoFit: true,
+            height: 500,
+            padding: [70, 35, 70, 35],
+          });
+        }
+
+        this.initHistoryMemberChart();
+      }
+    },
+    initHistoryMemberChart(){
+      // 默认已经加载 legend-filter 交互
+      let data = this.chartList;
+
+      data.forEach((item) => {
+        item.title = "历史在线人数";
+      });
+      this.historyMemberChart.data(data);
+
+      console.error(data)
+      this.historyMemberChart.tooltip({
+        showCrosshairs: true,
+        shared: true,
+      });
+
+      this.historyMemberChart
+        .line()
+        .position("date*num")
+        .color("title",['#ffaa71'])
+        .shape("smooth")
+      ;
+
+      this.historyMemberChart
+        .point()
+        .position("date*num")
+        .color("title",['#ffaa71'])
+        .shape("circle")
+      ;
+      this.historyMemberChart.render();
+    },
     // 初始化信息
     init() {
       this.toHotGoods();
@@ -475,6 +535,7 @@ export default {
       this.getHomeData();
       this.getPvChart();
       this.initOrderChartList();
+      this.initHistoryMemberChartList();
     },
   },
   mounted() {