From 10852ebfb953430e49af0637ad30914331668b6c Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 9 Oct 2025 15:37:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(dms):=20=E8=AE=BE=E5=A4=87=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E6=8A=A5=E8=A1=A8=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新设备效率报表汇总增汇总输出数量计算逻辑
- 新增总工时汇总计算功能
- 添加平均运行率计算方法
- 添加整体
-效率平均值计算 使用computed属性优化数据计算性能- 增强数据处理的容错能力
---
 .../dms/dmsReportDeviceEfficiency/index.vue   | 48 +++++++++++++++++++
 src/views/dms/prodBaseMachineInfo/index.vue   |  8 ++--
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/views/dms/dmsReportDeviceEfficiency/index.vue b/src/views/dms/dmsReportDeviceEfficiency/index.vue
index e508d00..54d201b 100644
--- a/src/views/dms/dmsReportDeviceEfficiency/index.vue
+++ b/src/views/dms/dmsReportDeviceEfficiency/index.vue
@@ -252,6 +252,7 @@
 <script setup name="DmsReportDeviceEfficiency" lang="ts">
 import { listDmsReportDeviceEfficiency, getDmsReportDeviceEfficiency, delDmsReportDeviceEfficiency, addDmsReportDeviceEfficiency, updateDmsReportDeviceEfficiency } from '@/api/dms/dmsReportDeviceEfficiency';
 import { DmsReportDeviceEfficiencyVO, DmsReportDeviceEfficiencyQuery, DmsReportDeviceEfficiencyForm } from '@/api/dms/dmsReportDeviceEfficiency/types';
+import { computed } from 'vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -411,6 +412,53 @@ const data = reactive<PageData<DmsReportDeviceEfficiencyForm, DmsReportDeviceEff
 
 const { queryParams, form, rules } = toRefs(data);
 
+// 汇总指标（顶部KPI）
+const sumOutputQty = computed(() => {
+  try {
+    return dmsReportDeviceEfficiencyList.value.reduce((sum, r) => sum + Number(r?.outputQty ?? 0), 0);
+  } catch {
+    return 0;
+  }
+});
+
+const sumTotalHours = computed(() => {
+  try {
+    return dmsReportDeviceEfficiencyList.value.reduce((sum, r) => sum + Number(r?.totalHours ?? 0), 0);
+  } catch {
+    return 0;
+  }
+});
+
+const avgUptimeRate = computed(() => {
+  const rows = dmsReportDeviceEfficiencyList.value;
+  if (!rows.length) return 0;
+  let total = 0;
+  let count = 0;
+  for (const r of rows) {
+    const v = Number(r?.uptimeRate ?? 0);
+    if (!Number.isNaN(v)) {
+      total += v;
+      count += 1;
+    }
+  }
+  return count ? total / count : 0;
+});
+
+const avgOverallEfficiency = computed(() => {
+  const rows = dmsReportDeviceEfficiencyList.value;
+  if (!rows.length) return 0;
+  let total = 0;
+  let count = 0;
+  for (const r of rows) {
+    const v = Number(r?.overallEfficiency ?? 0);
+    if (!Number.isNaN(v)) {
+      total += v;
+      count += 1;
+    }
+  }
+  return count ? total / count : 0;
+});
+
 /** 查询设备效率报列表 */
 const getList = async () => {
   loading.value = true;
diff --git a/src/views/dms/prodBaseMachineInfo/index.vue b/src/views/dms/prodBaseMachineInfo/index.vue
index f065ac7..21c1849 100644
--- a/src/views/dms/prodBaseMachineInfo/index.vue
+++ b/src/views/dms/prodBaseMachineInfo/index.vue
@@ -60,10 +60,10 @@
                    v-hasPermi="['dms:dmsBaseMachineInfo:remove']">
           删除设备
         </el-button>
-        <el-button type="warning" icon="Download" @click="handleExport"
-                   v-hasPermi="['dms:dmsBaseMachineInfo:export']">
-          导出数据
-        </el-button>
+<!--        <el-button type="warning" icon="Download" @click="handleExport"-->
+<!--                   v-hasPermi="['dms:dmsBaseMachineInfo:export']">-->
+<!--          导出数据-->
+<!--        </el-button>-->
         <el-button text @click="showSearch = !showSearch">
           <el-icon><Filter /></el-icon>
           {{ showSearch ? '隐藏' : '显示' }}筛选