From 54b007f3cacaadd744c11ba3d8b8c7e4cd424d17 Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期四, 31 七月 2025 16:35:50 +0800
Subject: [PATCH] 实现优化后调整玻璃位置的功能，解决后端接口因为缺少参数导致优化结果不对的问题，解决撤销优化后，再次点击优化，无法优化的问题
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/RectRenderer.vue | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/RectRenderer.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/RectRenderer.vue
index 2365264..9ae3ea2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/RectRenderer.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/RectRenderer.vue
@@ -268,22 +268,33 @@
const updateLayout = () => {
if (!layoutPanel.value) return;
//layouts.value = props.layoutData.layouts;
+ if (!props.layoutData) {
+ console.warn('layoutData 涓虹┖');
+ return;
+ }
+
+ console.log('RectRenderer 鎺ユ敹鍒扮殑 layoutData:', props.layoutData);
processId.value=props.layoutData.projectNo;
- let originalFilm = ref([])
- //layouts.value =
- props.layoutData.layouts.forEach(items=>{
- const existingItem = originalFilm.value.find(item => item.mergeId === items.mergeId);
- if (existingItem) {
- // 瀛樺湪锛氭暟閲忓姞1锛堝亣璁惧瓧娈典负 count锛�
- existingItem.quantity += 1;
- } else {
- originalFilm.value.push(items);
- }
- })
- layouts.value=originalFilm.value
- layoutDetails.value.push(props.layoutData)
- materialDetails.value=props.materialDetails
- console.log(layouts.value)
+ // 澶勭悊 layouts 鏁版嵁
+ if (props.layoutData.layouts && Array.isArray(props.layoutData.layouts)) {
+ let originalFilm = [];
+
+ props.layoutData.layouts.forEach(items => {
+ const existingItem = originalFilm.find(item => item.mergeId === items.mergeId);
+ if (existingItem) {
+ existingItem.quantity += 1;
+ } else {
+ originalFilm.push(items);
+ }
+ });
+
+ layouts.value = originalFilm;
+ layoutDetails.value.push(props.layoutData);
+ materialDetails.value = props.materialDetails;
+ console.log('澶勭悊鍚庣殑 layouts:', layouts.value);
+ } else {
+ console.warn('layouts 鏁版嵁鏍煎紡涓嶆纭垨涓虹┖');
+ }
adjustPrintLayout();
// 寮哄埗閲嶆柊娓叉煋
layoutPanel.value.offsetHeight; // 瑙﹀彂甯冨眬鏇存柊
--
Gitblit v1.8.0