From 178b7e5641889589efdd6fc2eee9b55e07b8a481 Mon Sep 17 00:00:00 2001
From: haoliang <821644@qq.com>
Date: Tue, 19 May 2026 17:14:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E9=97=B4=E4=BA=A7=E9=87=8F=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87(=E9=99=8D=E5=BA=8F=E6=8E=92=E5=88=97)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dashboard/DashboardPage.vue     | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/dashboard/DashboardPage.vue b/frontend/src/views/dashboard/DashboardPage.vue
index 3a91182..e08fd22 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行 — 3个统计卡片 -->
+    <!-- 第1行 — 2个统计卡片 -->
     <el-row :gutter="16" class="stat-row">
-      <el-col :span="8">
+      <el-col :span="12">
         <el-card shadow="hover">
           <div class="stat-card">
             <div class="stat-label">
@@ -15,7 +15,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="8">
+      <el-col :span="12">
         <el-card shadow="hover">
           <div class="stat-card">
             <div class="stat-label">
@@ -29,6 +29,17 @@
         </el-card>
       </el-col>
     </el-row>
+    <!-- 车间产量卡片 -->
+    <el-row :gutter="16" class="stat-row">
+      <el-col v-for="w in sortedWorkshopData" :key="w.workshopName" :span="8">
+        <el-card shadow="hover">
+          <div class="stat-card">
+            <div class="stat-label">{{ w.workshopName }}</div>
+            <div class="stat-value">{{ w.quantity?.toLocaleString() }}<span class="stat-unit"> 件</span></div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
 
     <!-- 第2行 — 双图表 -->
     <el-row :gutter="16" class="chart-row">
@@ -450,7 +461,7 @@ const workerSortOrder = ref<'asc' | 'desc'>('desc')
 
 // ==================== 计算属性 ====================
 
-const workshopDateLabel = computed(() => dateLabels[workshopDateType.value])
+const sortedWorkshopData = computed(() => [...workshopData.value].sort((a, b) => (b.quantity || 0) - (a.quantity || 0)))
 
 const workshopDays = computed(() => {
   const { startDate, endDate } = getDateRange(workshopDateType.value, workshopDateRange.value)
@@ -646,7 +657,7 @@ function initProgramDistChart() {
 }
 
 function initWorkshopChart() {
-  if (workshopChartRef.value && workshopData.value.length) {
+  if (workshopChartRef.value && sortedWorkshopData.value.length) {
     const unit = workshopUnit.value
     const unitLabel = workshopUnitLabel.value
     workshopChart = echarts.init(workshopChartRef.value)
@@ -654,14 +665,14 @@ function initWorkshopChart() {
       tooltip: {
         trigger: 'axis',
         formatter: (params: { name: string; value: number; dataIndex: number }[]) => {
-          const d = workshopData.value[params[0].dataIndex]
+          const d = sortedWorkshopData.value[params[0].dataIndex]
           return `${d.workshopName}<br/>${unitLabel}产量: ${Number(params[0].value).toFixed(2)} ${unit}<br/>总产量: ${d.quantity} 件<br/>机床数: ${d.machineCount} 台`
         },
       },
       grid: { left: 60, right: 20, top: 20, bottom: 30 },
       xAxis: {
         type: 'category',
-        data: workshopData.value.map(i => i.workshopName),
+        data: sortedWorkshopData.value.map(i => i.workshopName),
         axisLabel: { fontSize: 12 },
       },
       yAxis: {
@@ -672,7 +683,7 @@ function initWorkshopChart() {
       series: [
         {
           type: 'bar',
-          data: workshopData.value.map(i => i.avgQuantity),
+          data: sortedWorkshopData.value.map(i => i.avgQuantity),
           itemStyle: { color: '#67C23A', borderRadius: [4, 4, 0, 0] },
           barWidth: '40%',
           label: {
@@ -767,7 +778,7 @@ async function loadWorkshopData() {
       '/admin/dashboard/workshop-production',
       { params: { startDate, endDate } }
     )
-    workshopData.value = res.data?.items || []
+    workshopData.value = (res.data?.items || []).sort((a:any,b:any)=>(b.quantity||0)-(a.quantity||0))
     workshopChart?.dispose()
     workshopChart = null
     await nextTick()