From 4177f48cb295a53050eb81ec6da38de67a46e726 Mon Sep 17 00:00:00 2001
From: huangzhen <monsieurhuang@126.com>
Date: Tue, 4 Nov 2025 16:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home.vue | 62 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 8 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index ee8a264..0118edf 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="dashboard">
     <h2 class="page-title">营养监控项目运营核心数据总览</h2>
-
+    <h4 class="time-title">{{ stResourceBasicStats.updateTime || '暂无数据'}}</h4>
     <div class="cards">
       <!-- 基础资源 -->
       <section class="card">
@@ -122,7 +122,7 @@
                   </div>
                   <div class="sub-col">
                     <span>总用餐热量：</span><span class="num">{{ fmtNum(stOperationCoreStats.mealEnergy) }}</span><span>
-                      mcal</span>
+                      Mcal</span>
                   </div>
                 </div>
               </div>
@@ -161,12 +161,12 @@
           <ul class="list">
             <li class="item">
               <div class="item-content">
-                <div class="item-title"><span class="sq"></span>人均指标</div>
+                <div class="item-title"><span class="sq"></span>人均指标<span class="unit">(单位:重量g/热量kcal)</span></div>
 
                 <div class="group">
                   <div class="item-sub group-title">日平均(本周/上周)</div>
                   <div class="sub-row indent">
-                    <div class="sub-col">
+                    <!-- <div class="sub-col">
                       <span>重量：</span><span class="num">{{ stInsightPerCapitaStats.dailyAvgWeight || 0 }}</span><span>
                         g</span><span> / </span><span
                         :class="stInsightPerCapitaStats.dailyAvgWeightChange > 0 ? 'red' : 'green'">{{
@@ -177,6 +177,14 @@
                         kcal</span><span> / </span><span
                         :class="stInsightPerCapitaStats.dailyAvgEnergyChange > 0 ? 'red' : 'green'">{{
                           stInsightPerCapitaStats.dailyAvgEnergyChange || 0 }}</span><span> kcal</span>
+                    </div> -->
+                    <div class="sub-col">
+                      <span>重量：</span><span class="num">{{ stInsightPerCapitaStats.dailyAvgWeight || 0 }}</span><span>
+                        g</span><span> / </span><span class="num">{{ stInsightPerCapitaStats.dailyAvgWeightLast || 0 }}</span><span> g</span>
+                    </div>
+                    <div class="sub-col">
+                      <span>热量：</span><span class="num">{{ stInsightPerCapitaStats.dailyAvgEnergy || 0 }}</span><span>
+                        kcal</span><span> / </span><span class="num">{{ stInsightPerCapitaStats.dailyEnergyLast || 0 }}</span><span> kcal</span>
                     </div>
                   </div>
                 </div>
@@ -184,7 +192,7 @@
                 <div class="group">
                   <div class="item-sub group-title">早餐平均(本周/上周)</div>
                   <div class="sub-row indent">
-                    <div class="sub-col">
+                    <!-- <div class="sub-col">
                       <span>重量：</span><span class="num">{{ stInsightPerCapitaStats.morningAvgWeight || 0 }}</span><span>
                         g</span><span> / </span><span
                         :class="stInsightPerCapitaStats.morningAvgWeightChange > 0 ? 'red' : 'green'">{{
@@ -195,6 +203,14 @@
                         kcal</span><span> / </span><span
                         :class="stInsightPerCapitaStats.morningAvgEnergyChange > 0 ? 'red' : 'green'">{{
                           stInsightPerCapitaStats.morningAvgEnergyChange || 0 }}</span><span> kcal</span>
+                    </div> -->
+                    <div class="sub-col">
+                      <span>重量：</span><span class="num">{{ stInsightPerCapitaStats.morningAvgWeight || 0 }}</span><span>
+                        g</span><span> / </span><span class="num">{{ stInsightPerCapitaStats.breakfastAvgWeightLast || 0 }}</span><span> g</span>
+                    </div>
+                    <div class="sub-col">
+                      <span>热量：</span><span class="num">{{ stInsightPerCapitaStats.morningAvgEnergy || 0 }}</span><span>
+                        kcal</span><span> / </span><span class="num">{{ stInsightPerCapitaStats.breakfastEnergyLast || 0 }}</span><span> kcal</span>
                     </div>
                   </div>
                 </div>
@@ -202,7 +218,7 @@
                 <div class="group">
                   <div class="item-sub group-title">午餐平均(本周/上周)</div>
                   <div class="sub-row indent">
-                    <div class="sub-col">
+                    <!-- <div class="sub-col">
                       <span>重量：</span><span class="num">{{ stInsightPerCapitaStats.lunchAvgWeight || 0 }}</span><span>
                         g</span><span> / </span><span
                         :class="stInsightPerCapitaStats.lunchAvgWeightChange > 0 ? 'red' : 'green'">{{
@@ -213,6 +229,14 @@
                         kcal</span><span> / </span><span
                         :class="stInsightPerCapitaStats.lunchAvgEnergyChange > 0 ? 'red' : 'green'">{{
                           stInsightPerCapitaStats.lunchAvgEnergyChange || 0 }}</span><span> kcal</span>
+                    </div> -->
+                    <div class="sub-col">
+                      <span>重量：</span><span class="num">{{ stInsightPerCapitaStats.lunchAvgWeight || 0 }}</span><span>
+                        g</span><span> / </span><span class="num">{{ stInsightPerCapitaStats.lunchAvgAvgWeightLast || 0 }}</span><span> g</span>
+                    </div>
+                    <div class="sub-col">
+                      <span>热量：</span><span class="num">{{ stInsightPerCapitaStats.lunchAvgEnergy || 0 }}</span><span>
+                        kcal</span><span> / </span><span class="num">{{ stInsightPerCapitaStats.lunchEnergyLast || 0 }}</span><span> kcal</span>
                     </div>
                   </div>
                 </div>
@@ -220,7 +244,7 @@
                 <div class="group">
                   <div class="item-sub group-title">晚餐平均(本周/上周)</div>
                   <div class="sub-row indent">
-                    <div class="sub-col">
+                    <!-- <div class="sub-col">
                       <span>重量：</span><span class="num">{{ stInsightPerCapitaStats.dinnerAvgWeight || 0 }}</span><span>
                         g</span><span> / </span><span
                         :class="stInsightPerCapitaStats.dinnerAvgWeightChange > 0 ? 'red' : 'green'">{{
@@ -231,6 +255,14 @@
                         kcal</span><span> / </span><span
                         :class="stInsightPerCapitaStats.dinnerAvgEnergyChange > 0 ? 'red' : 'green'">{{
                           stInsightPerCapitaStats.dinnerAvgEnergyChange || 0 }}</span><span> kcal</span>
+                    </div> -->
+                    <div class="sub-col">
+                      <span>重量：</span><span class="num">{{ stInsightPerCapitaStats.dinnerAvgWeight || 0 }}</span><span>
+                        g</span><span> / </span><span class="num">{{ stInsightPerCapitaStats.dinnerAvgWeightLast || 0 }}</span><span> g</span>
+                    </div>
+                    <div class="sub-col">
+                      <span>热量：</span><span class="num">{{ stInsightPerCapitaStats.dinnerAvgEnergy || 0 }}</span><span>
+                        kcal</span><span> / </span><span class="num">{{ stInsightPerCapitaStats.dinnerEnergyLast || 0 }}</span><span> kcal</span>
                     </div>
                   </div>
                 </div>
@@ -309,7 +341,15 @@ export default {
   text-align: center;
   font-size: 36px;
   font-weight: 600;
-  margin: 12px 0 60px 0;
+  margin: 12px 0 20px 0;
+  color: #2b2b2b;
+}
+
+.time-title{
+  text-align: center;
+  font-size: 24px;
+  font-weight: 600;
+  margin: 12px 0 10px 0;
   color: #2b2b2b;
 }
 
@@ -380,6 +420,12 @@ export default {
   gap: 8px;
 }
 
+.unit{
+  font-size: 14px;
+  font-weight: normal;
+  color: #5a6678;
+}
+
 .sq {
   width: 8px;
   height: 8px;