From 97413a9725e1441f070edc139c1002954f1f50b7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 十一月 2025 11:28:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
index 91edf89..5008b6c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
@@ -596,6 +596,21 @@
optimizeData.value.glassDetails = [];
// 浠庤〃鏍间腑鑾峰彇 glassDetail 鏁版嵁锛岃�屼笉鏄粠鍚庣鎺ュ彛璇诲彇
const tableData = xGrid.value.getTableData().fullData;
+ let totalQuantity = 0;
+ let totalArea = 0;
+
+ tableData.forEach(item => {
+ const width = parseFloat(item.width) || 0;
+ const height = parseFloat(item.height) || 0;
+ const quantity = parseInt(item.quantity) || 0;
+
+ // 浣跨敤闀棵楀脳鏁伴噺鏉ヨ绠楁�婚潰绉�
+ totalArea += (width * height * quantity) / 1000000; // 杞崲涓哄钩鏂圭背
+ totalQuantity += quantity;
+ });
+
+ quantitys.value = totalQuantity;
+ areas.value = totalArea;
const glassDetailData = tableData.map(item => {
let rackNoValue = 0;
if (item.rackNo !== undefined && item.rackNo !== null && item.rackNo !== '') {
@@ -854,7 +869,7 @@
xGrid.value.loadData(data);
gridOptions.data = data;
- projectName.value = data[0].project_name;
+ projectName.value = res.data.project.project_name;
quantitys.value=res.data.project.glass_total
areas.value=res.data.project.glass_total_area
--
Gitblit v1.8.0