From 4de17526dcffadade1015c51153076aef2d9d651 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Fri, 13 Mar 2026 16:02:42 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E5=A4=A7=E5=B1=8F-=E4=BB=8A?=
 =?UTF-8?q?=E6=97=A5=E5=BC=80=E6=9C=BA=E7=8E=87/=E7=A8=BC=E5=8A=A8?=
 =?UTF-8?q?=E7=8E=87-=E6=B7=BB=E5=8A=A0lineCode=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard8/components/TodayOps.vue           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/report/dashboardPage/dashboard8/components/TodayOps.vue b/src/views/report/dashboardPage/dashboard8/components/TodayOps.vue
index 3b2da013..329b840a 100644
--- a/src/views/report/dashboardPage/dashboard8/components/TodayOps.vue
+++ b/src/views/report/dashboardPage/dashboard8/components/TodayOps.vue
@@ -17,7 +17,6 @@
 
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted } from 'vue'
-import dayjs from 'dayjs'
 import { useChart, colors } from '../utils'
 import { DeviceOperationRecordApi, type DeviceOperationRecordVO } from '@/api/iot/deviceOperationRecord'
 
@@ -46,23 +45,26 @@ const toRateNumber = (value: unknown) => {
 }
 
 const buildLineMetrics = (rows: DeviceOperationRecordVO[]) => {
-  const groupMap = new Map<string, { name: string; power: number[]; util: number[] }>()
+  const groupMap = new Map<string, { name: string; code: string; power: number[]; util: number[] }>()
   rows.forEach((row) => {
-    const name = String((row as any)?.lineName ?? (row as any)?.lineCode ?? row.deviceName ?? row.deviceCode ?? '').trim()
-    if (!name) return
+    const code = String((row as any)?.lineCode ?? '').trim()
+    const name = String((row as any)?.lineName ?? row.deviceName ?? row.deviceCode ?? code ?? '').trim()
+    if (!name && !code) return
     const power = toRateNumber((row as any)?.powerOnRate)
     const util = toRateNumber((row as any)?.utilizationRate)
-    const key = name
+    const key = code || name
     if (!groupMap.has(key)) {
-      groupMap.set(key, { name, power: [], util: [] })
+      groupMap.set(key, { name, code, power: [], util: [] })
     }
     const g = groupMap.get(key)!
+    if (!g.name) g.name = name
+    if (!g.code) g.code = code
     if (Number.isFinite(power)) g.power.push(power)
     if (Number.isFinite(util)) g.util.push(util)
   })
   const avg = (arr: number[]) => (arr.length ? arr.reduce((s, v) => s + v, 0) / arr.length : 0)
   const list = Array.from(groupMap.values()).map((g) => ({
-    name: g.name,
+    name: g.code ? `${g.name} (${g.code})` : g.name,
     run: Math.round(avg(g.power) * 100) / 100,
     avail: Math.round(avg(g.util) * 100) / 100
   }))