首页历史统计新增 历史记录对比

manager/src/views/home/home.vue

@@ -2,9 +2,7 @@
   <div>
     <!-- 统计 -->
     <div class="card">
-      <h4>
+      <h4>基本信息</h4>
-        基本信息
-      </h4>
       <div class="count-list flex">
         <div class="count-item" @click="navigateTo('managerGoods')">
           <div>
@@ -23,7 +21,6 @@
             <div class="counts">{{ homeData.memberNum || 0 }}</div>
             <div>会员数量</div>
           </div>
-
         </div>
         <div class="count-item" @click="navigateTo('orderList')">
           <div>
@@ -33,7 +30,6 @@
             <div class="counts">{{ homeData.orderNum || 0 }}</div>
             <div>订单数量</div>
           </div>
-
         </div>
         <div class="count-item" @click="navigateTo('shopList')">
           <div>
@@ -43,7 +39,6 @@
             <div class="counts">{{ homeData.storeNum || 0 }}</div>
             <div>店铺数量</div>
           </div>
-
         </div>
       </div>
     </div>
@@ -69,7 +64,9 @@
           <div>待审核售后</div>
         </div>
         <div class="todo-item">
-          <div class="counts">{{$store.state.notices.distributionCash|| 0}}</div>
+          <div class="counts">
+            {{ $store.state.notices.distributionCash || 0 }}
+          </div>
           <div>待审核分销提现</div>
         </div>
         <div class="todo-item" @click="navigateTo('accountStatementBill')">
@@ -90,23 +87,16 @@
             </span>
           </div>
           <div class="flow-wrapper">
-            <h4>
+            <h4>流量概括</h4>
-              流量概括
-            </h4>
             <div class="card flow-box flex">
               <div class="flow-box-item">
-                <div>
+                <div>今日访客数</div>
-                  今日访客数
-                </div>
                 <div class="counts">
-
                   {{ homeData.todayUV || 0 }}
                 </div>
               </div>
               <div class="flow-box-item">
-                <div>
+                <div>昨日访客数</div>
-                  昨日访客数
-                </div>
                 <div class="counts">
                   {{ homeData.yesterdayUV || 0 }}
                 </div>
@@ -115,17 +105,13 @@
 
             <div class="flow-splice flex">
               <div class="flow-box-splice">
-                <div>
+                <div>前七日访客数</div>
-                  前七日访客数
-                </div>
                 <div class="counts">
                   {{ homeData.lastSevenUV || 0 }}
                 </div>
               </div>
               <div class="flow-box-splice">
-                <div>
+                <div>前三十日访客数</div>
-                  前三十日访客数
-                </div>
                 <div class="counts">
                   {{ homeData.lastThirtyUV || 0 }}
                 </div>
@@ -142,7 +128,9 @@
             </div>
             <div class="today-item">
               <div>今日交易额</div>
-              <span v-if="homeData.todayOrderPrice">￥{{homeData.todayOrderPrice  | unitPrice}}</span>
+              <span v-if="homeData.todayOrderPrice"
+                >￥{{ homeData.todayOrderPrice | unitPrice }}</span
+              >
               <span v-else>￥0.00</span>
             </div>
             <div class="today-item">
@@ -188,16 +176,22 @@
     <!-- top10商品 -->
     <div class="card transform">
       <h4>热卖商品TOP10</h4>
-      <Table stripe :columns="tophotGoodsColumns" :data="topHotGoodsData"></Table>
+      <Table
+        stripe
+        :columns="tophotGoodsColumns"
+        :data="topHotGoodsData"
+      ></Table>
     </div>
 
     <!-- top10店铺 -->
     <div class="card transform">
       <h4>热卖店铺TOP10</h4>
-      <Table stripe :columns="tophotShopsColumns" :data="topHotShopsData"></Table>
+      <Table
-
+        stripe
+        :columns="tophotShopsColumns"
+        :data="topHotShopsData"
+      ></Table>
     </div>
-    
   </div>
 </template>
 
@@ -217,7 +211,7 @@ export default {
       // 测试数据
       test: {
         a: "test",
-        languages:[]
+        languages: [],
       },
       // 测试数据结束
       tophotShopsColumns: [
@@ -418,6 +412,7 @@ export default {
 
       let data = [...uv, ...pv];
 
+      console.log("pv", data);
       this.pvChart.data(data);
       this.pvChart.scale({
         activeQuantity: {
@@ -491,13 +486,31 @@ export default {
     initHistoryMemberChart() {
       // 默认已经加载 legend-filter 交互
       let data = this.chartList;
-
+      let num = [];
+      let lastNum = [];
       data.forEach((item) => {
-        item.title = "历史在线人数";
+        num.push({
-        item.date = item.date.substring(5);
+          date: item.date.substring(5),
+          title: "最近48小时",
+          num: item.num,
+          res: item.num,
         });
-      this.historyMemberChart.data(data);
 
+        lastNum.push({
+          date: item.date.substring(5),
+          title: "历史记录",
+          lastNum: item.lastNum || 0,
+          res: item.lastNum || 0,
+        });
+      });
+      let params = [...num, ...lastNum];
+      this.historyMemberChart.data(params);
+      this.historyMemberChart.scale({
+        activeQuantity: {
+          range: [0, 1],
+          nice: true,
+        },
+      });
       this.historyMemberChart.tooltip({
         showCrosshairs: true,
         shared: true,
@@ -505,14 +518,15 @@ export default {
 
       this.historyMemberChart
         .line()
-        .position("date*num")
+        .position("date*res")
-        .color("title", ["#ffaa71"])
+        .color("title", ["#ffaa71", "#398AB9"])
+        .label("res")
         .shape("smooth");
-
       this.historyMemberChart
         .point()
-        .position("date*num")
+        .position("date*res")
-        .color("title", ["#ffaa71"])
+        .color("title", ["#ffaa71", "#398AB9"])
+        .label("res")
         .shape("circle");
       this.historyMemberChart.render();
     },