From 5103083726ec2f53a44e5193d84ba41631192ac9 Mon Sep 17 00:00:00 2001
From: haoliang <821644@qq.com>
Date: Tue, 19 May 2026 14:57:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E5=88=A0=E9=87=87=E9=9B=86=E6=9C=8D=E5=8A=A1=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87+=E8=BF=90=E8=A1=8C=E6=9C=BA=E5=BA=8A=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87+=E5=B7=A5=E4=BA=BA=E6=8E=92=E8=A1=8C=E5=90=AB0?=
 =?UTF-8?q?=E4=BA=A7=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dashboard/DashboardPage.vue     | 47 ++-----------------
 .../Impl/Dashboard/DashboardRepository.cs     |  4 +-
 2 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/frontend/src/views/dashboard/DashboardPage.vue b/frontend/src/views/dashboard/DashboardPage.vue
index 03de2db..480f5c0 100644
--- a/frontend/src/views/dashboard/DashboardPage.vue
+++ b/frontend/src/views/dashboard/DashboardPage.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="dashboard-page">
-    <!-- 第1行 — 4个统计卡片 -->
+    <!-- 第1行 — 3个统计卡片 -->
     <el-row :gutter="16" class="stat-row">
-      <el-col :span="6">
+      <el-col :span="8">
         <el-card shadow="hover">
           <div class="stat-card">
             <div class="stat-label">
@@ -15,7 +15,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="8">
         <el-card shadow="hover">
           <div class="stat-card">
             <div class="stat-label">
@@ -28,43 +28,6 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="6">
-        <el-card shadow="hover">
-          <div class="stat-card">
-            <div class="stat-label">
-              采集服务
-              <el-tooltip content="数据采集服务的运行状态。" placement="top">
-                <span class="info-icon">ⓘ</span>
-              </el-tooltip>
-            </div>
-            <div class="stat-value">
-              <el-tag :type="collectorTagType" size="small">
-                {{ collectorStatusText }}
-              </el-tag>
-            </div>
-            <div class="stat-sub" v-if="collectorStatus.status === 'running'">运行 {{ formatUptime(collectorStatus.uptimeSeconds) }}</div>
-          </div>
-          <div class="collector-actions">
-            <el-button v-if="collectorStatus.status === 'stopped' || collectorStatus.status === 'not_installed'" size="small" type="success" disabled>需手动启动服务</el-button>
-            <el-button v-if="collectorStatus.status === 'paused' || collectorStatus.status === 'timeout'" size="small" type="success" :loading="startLoading" @click="startCollector">恢复采集</el-button>
-            <el-button v-if="collectorStatus.status === 'running'" size="small" type="danger" :loading="stopLoading" @click="stopCollector">暂停采集</el-button>
-            <el-button size="small" type="warning" :loading="refreshLoading" @click="refreshCollectorConfig">刷新配置</el-button>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="6">
-        <el-card shadow="hover">
-          <div class="stat-card">
-            <div class="stat-label">
-              今日运行机床数
-              <el-tooltip content="当前正在执行加工程序的机床数量。" placement="top">
-                <span class="info-icon">ⓘ</span>
-              </el-tooltip>
-            </div>
-            <div class="stat-value">{{ summary.runningMachines }}<span class="stat-unit"> 台</span></div>
-          </div>
-        </el-card>
-      </el-col>
     </el-row>
 
     <!-- 第2行 — 双图表 -->
@@ -801,13 +764,11 @@ async function loadWorkshopData() {
 async function loadData() {
   try {
     // 并行加载：统计摘要 + 采集状态 + 产量趋势
-    const [summaryRes, collectorRes, trendRes] = await Promise.all([
+    const [summaryRes, trendRes] = await Promise.all([
       request.get<DashboardSummary>('/admin/dashboard/summary'),
-      request.get<CollectorStatus>('/admin/collector/status'),
       request.get<{ items: DashboardTrendItem[] }>('/admin/dashboard/trend'),
     ])
     summary.value = summaryRes.data || summary.value
-    collectorStatus.value = collectorRes.data || collectorStatus.value
     trendData.value = trendRes.data?.items || []
 
     // 重置图表
diff --git a/src/CncRepository/Impl/Dashboard/DashboardRepository.cs b/src/CncRepository/Impl/Dashboard/DashboardRepository.cs
index 862eb6f..56cf56f 100644
--- a/src/CncRepository/Impl/Dashboard/DashboardRepository.cs
+++ b/src/CncRepository/Impl/Dashboard/DashboardRepository.cs
@@ -131,9 +131,7 @@ namespace CncRepository.Impl.Dashboard
                     LEFT JOIN cnc_daily_production dp ON dp.worker_id = w.id 
                         AND dp.production_date BETWEEN @Start AND @End
                         AND dp.end_total_count > dp.base_total_count
-                    GROUP BY w.id, w.name
-                    HAVING SUM(dp.end_total_count - dp.base_total_count) > 0
-                    ORDER BY TotalQuantity {orderBy}
+                    GROUP BY w.id, w.name ORDER BY TotalQuantity {orderBy}
                     LIMIT @Top";
                 var rows = conn.Query<WorkerRankResponse>(sql, new { Start = startDate, End = endDate, Top = top }).ToList();
                 // 填充排名