From 04914a9997afbbead6f8adbb9d9c40e05b2edbd1 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 17 十二月 2025 17:04:34 +0800
Subject: [PATCH] 修复调用导入工程失败 重复保存；修复分批出片逻辑
---
mes-web/src/views/device/components/DeviceLogicConfig/LargeGlassConfig.vue | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/mes-web/src/views/device/components/DeviceLogicConfig/LargeGlassConfig.vue b/mes-web/src/views/device/components/DeviceLogicConfig/LargeGlassConfig.vue
index 3b7e68f..ce24c85 100644
--- a/mes-web/src/views/device/components/DeviceLogicConfig/LargeGlassConfig.vue
+++ b/mes-web/src/views/device/components/DeviceLogicConfig/LargeGlassConfig.vue
@@ -1,21 +1,14 @@
<template>
<div class="large-glass-config">
- <el-form-item label="鏍煎瓙鑼冨洿閰嶇疆">
+ <el-form-item label="绗煎瓙鏍煎瓙閰嶇疆">
+ </el-form-item>
<div class="grid-ranges">
<div
v-for="(range, index) in config.gridRanges"
:key="index"
class="grid-range-item"
>
- <el-input-number
- v-model="range.row"
- :min="1"
- :max="100"
- :step="1"
- style="width: 100px; margin-right: 10px;"
- placeholder="琛屽彿"
- />
- <span>琛岋細</span>
+ <span style="margin-right: 10px;">绗煎瓙{{ range.row }}锛�</span>
<el-input-number
v-model="range.start"
:min="1"
@@ -43,11 +36,10 @@
</el-button>
</div>
<el-button type="primary" size="small" @click="addGridRange">
- 娣诲姞鏍煎瓙鑼冨洿
+ 娣诲姞绗煎瓙
</el-button>
</div>
- <span class="form-tip">閰嶇疆姣忚鐨勬牸瀛愯寖鍥达紝渚嬪锛氱涓�琛�1~52鏍硷紝绗簩琛�53~101鏍�</span>
- </el-form-item>
+ <span class="form-tip">閰嶇疆姣忎釜绗煎瓙鐨勬牸瀛愯寖鍥达紝渚嬪锛氱瀛�1鏄�1~52鏍硷紝绗煎瓙2鏄�53~101鏍笺��</span>
<el-row :gutter="20">
<el-col :span="8">
@@ -87,6 +79,21 @@
</el-form-item>
</el-col>
</el-row>
+
+ <el-row :gutter="20">
+ <el-col :span="8">
+ <el-form-item label="澶勭悊鏃堕棿(绉�)">
+ <el-input-number
+ v-model="config.processTimeSeconds"
+ :min="1"
+ :max="3600"
+ :step="1"
+ style="width: 100%;"
+ />
+ <span class="form-tip">澶х悊鐗囩澶勭悊鐜荤拑鐨勬椂闂达紙绉掞級锛岄粯璁�30绉�</span>
+ </el-form-item>
+ </el-col>
+ </el-row>
</div>
</template>
@@ -110,20 +117,29 @@
],
gridLength: 2000,
gridWidth: 1500,
- gridThickness: 5
+ gridThickness: 5,
+ processTimeSeconds: 30
})
// 鐩戝惉props鍙樺寲
watch(() => props.modelValue, (newVal) => {
if (newVal && Object.keys(newVal).length > 0) {
+ let gridRanges = newVal.gridRanges || [
+ { row: 1, start: 1, end: 52 },
+ { row: 2, start: 53, end: 101 }
+ ]
+ // 纭繚姣忎釜鑼冨洿閮芥湁row瀛楁锛堝鏋滄病鏈夊垯鑷姩鐢熸垚锛�
+ gridRanges = gridRanges.map((range, index) => ({
+ ...range,
+ row: range.row || (index + 1)
+ }))
+
config.value = {
- gridRanges: newVal.gridRanges || [
- { row: 1, start: 1, end: 52 },
- { row: 2, start: 53, end: 101 }
- ],
+ gridRanges: gridRanges,
gridLength: newVal.gridLength ?? 2000,
gridWidth: newVal.gridWidth ?? 1500,
- gridThickness: newVal.gridThickness ?? 5
+ gridThickness: newVal.gridThickness ?? 5,
+ processTimeSeconds: newVal.processTimeSeconds ?? 30
}
}
}, { immediate: true, deep: true })
@@ -136,13 +152,13 @@
// 鏍煎瓙鑼冨洿鐩稿叧鏂规硶
const addGridRange = () => {
const maxRow = config.value.gridRanges.length > 0
- ? Math.max(...config.value.gridRanges.map(r => r.row))
+ ? Math.max(...config.value.gridRanges.map(r => r.row || 0))
: 0
const lastEnd = config.value.gridRanges.length > 0
- ? Math.max(...config.value.gridRanges.map(r => r.end))
+ ? Math.max(...config.value.gridRanges.map(r => r.end || 0))
: 0
config.value.gridRanges.push({
- row: maxRow + 1,
+ row: maxRow + 1, // 鑷姩鐢熸垚绗煎瓙缂栧彿
start: lastEnd + 1,
end: lastEnd + 50
})
--
Gitblit v1.8.0