From 2fe150d7351d329fd1bae4f8ef9cbdfc9c172362 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 29 十月 2025 17:48:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/EngineerScheduling/engineerScheduling.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/EngineerScheduling/engineerScheduling.vue b/UI-Project/src/views/EngineerScheduling/engineerScheduling.vue
index ee56256..53fbbc5 100644
--- a/UI-Project/src/views/EngineerScheduling/engineerScheduling.vue
+++ b/UI-Project/src/views/EngineerScheduling/engineerScheduling.vue
@@ -157,6 +157,11 @@
const saveScheduling = async () => {
try {
let type = 1;
+ // 1. 鍔ㄦ�佺‘瀹� type 鍜屾帴鍙ｈ矾寰勶紙鏍规嵁 activeTab 鍒囨崲锛�
+ const apiPath = activeTab.value === 'tempered'
+ ? 'updateEngineerScheduling'
+ : 'updateCuttingLayout';
+
if (activeTab.value === 'cutting2') type = 2;
else if (activeTab.value === 'tempered') type = 3;
@@ -167,8 +172,7 @@
}))
const response = await request.post(
- `/loadGlass/optimizeProject/updateEngineerScheduling?type=${type}`,
- engineerList
+ `/loadGlass/optimizeProject/${apiPath}?type=${type}`, engineerList
)
if (response.code === 200) {
@@ -285,7 +289,7 @@
// 鏌ユ壘鎵�鏈夐潪杩涜涓换鍔＄殑浣嶇疆
const nonProgressIndices = newList
- .map((item, i) => ({ item, index: i }))
+ .map((item, i) => ({item, index: i}))
.filter(item => item.item.state !== 1)
.map(item => item.index);
@@ -392,7 +396,8 @@
width="90"
:formatter="stateFormatter"
/>
- <el-table-column :label="t('scheduling.operate')" :width="activeTab === 'tempered' ? 200 : 300" :align="center">
+ <el-table-column :label="t('scheduling.operate')" :width="activeTab === 'tempered' ? 200 : 300"
+ :align="center">
<template #default="{ row }">
<div style="display: flex; gap: 5px; align-items: center;">
<el-button
@@ -482,6 +487,7 @@
align-items: center;
gap: 20px;
margin-bottom: 20px;
+ overflow: auto;
}
/* 璇︽儏琛ㄦ牸鏍峰紡 */
--
Gitblit v1.8.0