From 0dfdc8148cc266fd3e877183c5b162fb986d5c65 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 12 十二月 2025 15:38:56 +0800
Subject: [PATCH] 修改导入工程json格式
---
mes-web/src/views/device/components/DeviceLogicConfig/LoadVehicleConfig.vue | 237 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 124 insertions(+), 113 deletions(-)
diff --git a/mes-web/src/views/device/components/DeviceLogicConfig/LoadVehicleConfig.vue b/mes-web/src/views/device/components/DeviceLogicConfig/LoadVehicleConfig.vue
index 6f1bd5b..e1b672b 100644
--- a/mes-web/src/views/device/components/DeviceLogicConfig/LoadVehicleConfig.vue
+++ b/mes-web/src/views/device/components/DeviceLogicConfig/LoadVehicleConfig.vue
@@ -9,6 +9,7 @@
:max="10000"
:step="100"
style="width: 100%;"
+ @change="emitConfigUpdate"
/>
<span class="form-tip">杞﹁締鏈�澶у閲�</span>
</el-form-item>
@@ -22,6 +23,7 @@
:step="0.1"
:precision="1"
style="width: 100%;"
+ @change="emitConfigUpdate"
/>
<span class="form-tip">杞﹁締杩愬姩閫熷害锛岄粯璁�1鏍�/绉�</span>
</el-form-item>
@@ -30,27 +32,16 @@
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="鐜荤拑闂撮殧(ms)">
+ <el-form-item label="鐜荤拑闂撮殭(mm)">
<el-input-number
- v-model="config.glassIntervalMs"
- :min="100"
- :max="10000"
- :step="100"
+ v-model="config.glassGap"
+ :min="0"
+ :max="1000"
+ :step="10"
style="width: 100%;"
+ @change="emitConfigUpdate"
/>
- <span class="form-tip">鐜荤拑涓婃枡闂撮殧鏃堕棿锛堟绉掞級</span>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="榛樿鐜荤拑闀垮害(mm)">
- <el-input-number
- v-model="config.defaultGlassLength"
- :min="100"
- :max="10000"
- :step="100"
- style="width: 100%;"
- />
- <span class="form-tip">褰撶幓鐠冩湭鎻愪緵闀垮害鏃朵娇鐢ㄧ殑榛樿鍊�</span>
+ <span class="form-tip">澶氬潡鐜荤拑涔嬮棿鐨勭墿鐞嗛棿闅旂┖闅欙紝榛樿200mm</span>
</el-form-item>
</el-col>
</el-row>
@@ -64,6 +55,7 @@
:max="1000"
:step="1"
style="width: 100%;"
+ @change="emitConfigUpdate"
/>
<span class="form-tip">杞﹁締鍒濆浣嶇疆锛堟牸瀛愶級</span>
</el-form-item>
@@ -75,8 +67,9 @@
:min="1"
:max="1000"
:step="1"
- style="width: 48%;"
+ style="width: 40%;"
placeholder="鏈�灏�"
+ @change="emitConfigUpdate"
/>
<span style="margin: 0 2%;">~</span>
<el-input-number
@@ -84,8 +77,9 @@
:min="1"
:max="1000"
:step="1"
- style="width: 48%;"
+ style="width: 40%;"
placeholder="鏈�澶�"
+ @change="emitConfigUpdate"
/>
<span class="form-tip">杩愬姩璺濈鑼冨洿锛堟牸瀛愶級</span>
</el-form-item>
@@ -94,62 +88,50 @@
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="绌洪棽鐩戞帶闂撮殧(ms)">
+ <el-form-item label="绌洪棽鐩戞帶闂撮殧(绉�)">
<el-input-number
- v-model="config.idleMonitorIntervalMs"
- :min="500"
- :max="10000"
- :step="100"
+ v-model="idleMonitorIntervalSeconds"
+ :min="0.5"
+ :max="10"
+ :step="0.1"
+ :precision="1"
style="width: 100%;"
/>
- <span class="form-tip">绌洪棽鐘舵�佺洃鎺ч棿闅旓紝榛樿2000ms</span>
+ <span class="form-tip">绌洪棽鐘舵�佺洃鎺ч棿闅旓紝榛樿2绉�</span>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="浠诲姟鐩戞帶闂撮殧(ms)">
+ <el-form-item label="浠诲姟鐩戞帶闂撮殧(绉�)">
<el-input-number
- v-model="config.taskMonitorIntervalMs"
- :min="500"
- :max="10000"
- :step="100"
+ v-model="taskMonitorIntervalSeconds"
+ :min="0.5"
+ :max="10"
+ :step="0.1"
+ :precision="1"
style="width: 100%;"
/>
- <span class="form-tip">浠诲姟鎵ц鐩戞帶闂撮殧锛岄粯璁�1000ms</span>
+ <span class="form-tip">浠诲姟鎵ц鐩戞帶闂撮殧锛岄粯璁�1绉�</span>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="MES纭瓒呮椂(ms)">
+ <el-form-item label="MES纭瓒呮椂(绉�)">
<el-input-number
- v-model="config.mesConfirmTimeoutMs"
- :min="5000"
- :max="300000"
- :step="1000"
+ v-model="mesConfirmTimeoutSeconds"
+ :min="5"
+ :max="300"
+ :step="1"
style="width: 100%;"
/>
- <span class="form-tip">绛夊緟MES纭鐨勮秴鏃舵椂闂达紝榛樿30000ms</span>
+ <span class="form-tip">绛夊緟MES纭鐨勮秴鏃舵椂闂达紝榛樿30绉�</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鑷姩涓婃枡">
- <el-switch v-model="config.autoFeed" />
+ <el-switch v-model="config.autoFeed" @change="emitConfigUpdate" />
<span class="form-tip">鏄惁鑷姩瑙﹀彂涓婃枡璇锋眰</span>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="鏈�澶ч噸璇曟鏁�">
- <el-input-number
- v-model="config.maxRetryCount"
- :min="0"
- :max="10"
- :step="1"
- style="width: 100%;"
- />
</el-form-item>
</el-col>
</el-row>
@@ -157,30 +139,31 @@
<el-form-item label="浣嶇疆鏄犲皠">
<div class="position-mapping">
<div
- v-for="(value, key, index) in config.positionMapping"
- :key="index"
+ v-for="(item, index) in positionList"
+ :key="item.id"
class="mapping-item"
>
<el-input
- v-model="mappingKeys[index]"
- placeholder="浣嶇疆浠ｇ爜锛堝900/901锛�"
+ v-model="item.key"
+ placeholder="浣嶇疆浠ｇ爜锛堝1001/1002锛�"
size="small"
style="width: 150px; margin-right: 10px;"
- @input="updatePositionMapping(index, $event, value)"
+ @change="handlePositionKeyChange(index)"
/>
<el-input-number
- v-model="config.positionMapping[mappingKeys[index] || key]"
+ v-model="item.value"
:min="0"
:max="1000"
:step="1"
size="small"
style="width: 120px; margin-right: 10px;"
placeholder="浣嶇疆鍊硷紙鏍硷級"
+ @change="handlePositionValueChange(index)"
/>
<el-button
type="danger"
size="small"
- @click="removePositionMapping(key)"
+ @click="removePositionMapping(index)"
>
鍒犻櫎
</el-button>
@@ -190,27 +173,6 @@
</el-button>
</div>
<span class="form-tip">灏哅ES缂栧彿锛堝900/901锛夋槧灏勪负瀹為檯浣嶇疆鍊硷紙鏍煎瓙锛�</span>
- </el-form-item>
-
- <el-form-item label="鍑虹墖浠诲姟鏍煎瓙鑼冨洿">
- <el-input-number
- v-model="config.outboundSlotRanges[0]"
- :min="1"
- :max="1000"
- :step="1"
- style="width: 48%;"
- placeholder="鏈�灏忔牸瀛愮紪鍙�"
- />
- <span style="margin: 0 2%;">~</span>
- <el-input-number
- v-model="config.outboundSlotRanges[1]"
- :min="1"
- :max="1000"
- :step="1"
- style="width: 48%;"
- placeholder="鏈�澶ф牸瀛愮紪鍙�"
- />
- <span class="form-tip">鍑虹墖浠诲姟鐨剆tartSlot鑼冨洿锛屼緥濡俒1, 101]琛ㄧず鏍煎瓙1~101閮芥槸鍑虹墖浠诲姟</span>
</el-form-item>
</div>
</template>
@@ -231,8 +193,7 @@
const config = ref({
vehicleCapacity: 6000,
vehicleSpeed: 1.0,
- glassIntervalMs: 1000,
- defaultGlassLength: 2000,
+ glassGap: 200,
homePosition: 0,
minRange: 1,
maxRange: 100,
@@ -240,22 +201,57 @@
taskMonitorIntervalMs: 1000,
mesConfirmTimeoutMs: 30000,
autoFeed: true,
- maxRetryCount: 5,
- positionMapping: {},
- outboundSlotRanges: [1, 101]
+ positionMapping: {}
})
-// 浣嶇疆鏄犲皠鐨勯敭鏁扮粍
-const mappingKeys = ref([])
+// 浣嶇疆鏄犲皠缂栬緫鍒楄〃
+const positionList = ref([])
+let suppressPositionSync = false
+let suppressEmit = false
+
+const emitConfigUpdate = () => {
+ if (suppressEmit) return
+ emit('update:modelValue', { ...config.value })
+}
+
+const syncPositionListFromConfig = () => {
+ suppressPositionSync = true
+ const entries = Object.entries(config.value.positionMapping || {})
+ positionList.value = entries.map(([key, value], idx) => ({
+ id: `${key}_${idx}_${Date.now()}`,
+ key,
+ value: value ?? 1
+ }))
+ suppressPositionSync = false
+}
+
+const applyPositionListToConfig = () => {
+ if (suppressPositionSync) return
+ const mapping = {}
+ positionList.value.forEach((item) => {
+ if (item.key && item.key.trim()) {
+ mapping[item.key.trim()] = item.value ?? 1
+ }
+ })
+ config.value.positionMapping = mapping
+ emitConfigUpdate()
+}
+
+syncPositionListFromConfig()
+
+// 鏃堕棿瀛楁锛堢锛�- 鐢ㄤ簬鍓嶇鏄剧ず鍜岃緭鍏�
+const idleMonitorIntervalSeconds = ref(2.0)
+const taskMonitorIntervalSeconds = ref(1.0)
+const mesConfirmTimeoutSeconds = ref(30)
// 鐩戝惉props鍙樺寲
watch(() => props.modelValue, (newVal) => {
if (newVal && Object.keys(newVal).length > 0) {
+ suppressEmit = true
config.value = {
vehicleCapacity: newVal.vehicleCapacity ?? 6000,
vehicleSpeed: newVal.vehicleSpeed ?? 1.0,
- glassIntervalMs: newVal.glassIntervalMs ?? 1000,
- defaultGlassLength: newVal.defaultGlassLength ?? 2000,
+ glassGap: newVal.glassGap ?? 200,
homePosition: newVal.homePosition ?? 0,
minRange: newVal.minRange ?? 1,
maxRange: newVal.maxRange ?? 100,
@@ -263,40 +259,55 @@
taskMonitorIntervalMs: newVal.taskMonitorIntervalMs ?? 1000,
mesConfirmTimeoutMs: newVal.mesConfirmTimeoutMs ?? 30000,
autoFeed: newVal.autoFeed ?? true,
- maxRetryCount: newVal.maxRetryCount ?? 5,
- positionMapping: newVal.positionMapping || {},
- outboundSlotRanges: newVal.outboundSlotRanges || [1, 101]
+ positionMapping: newVal.positionMapping || {}
}
- mappingKeys.value = Object.keys(config.value.positionMapping)
+ // 灏嗘绉掕浆鎹负绉掔敤浜庢樉绀�
+ idleMonitorIntervalSeconds.value = (config.value.idleMonitorIntervalMs ?? 2000) / 1000
+ taskMonitorIntervalSeconds.value = (config.value.taskMonitorIntervalMs ?? 1000) / 1000
+ mesConfirmTimeoutSeconds.value = (config.value.mesConfirmTimeoutMs ?? 30000) / 1000
+ syncPositionListFromConfig()
+ suppressEmit = false
}
}, { immediate: true, deep: true })
-// 鐩戝惉config鍙樺寲锛屽悓姝ュ埌鐖剁粍浠�
-watch(config, (newVal) => {
- emit('update:modelValue', { ...newVal })
-}, { deep: true })
+// 鐩戝惉绉掑瓧娈靛彉鍖栵紝杞崲涓烘绉掑苟鏇存柊config
+watch(idleMonitorIntervalSeconds, (val) => {
+ config.value.idleMonitorIntervalMs = Math.round(val * 1000)
+ emitConfigUpdate()
+})
+watch(taskMonitorIntervalSeconds, (val) => {
+ config.value.taskMonitorIntervalMs = Math.round(val * 1000)
+ emitConfigUpdate()
+})
+
+watch(mesConfirmTimeoutSeconds, (val) => {
+ config.value.mesConfirmTimeoutMs = Math.round(val * 1000)
+ emitConfigUpdate()
+})
+
+// 鐩戝惉config鍏朵粬瀛楁鍙樺寲锛屽悓姝ュ埌鐖剁粍浠�
// 浣嶇疆鏄犲皠鐩稿叧鏂规硶
const addPositionMapping = () => {
- const newKey = `POS${Object.keys(config.value.positionMapping).length + 1}`
- config.value.positionMapping[newKey] = 1
- mappingKeys.value.push(newKey)
+ const nextIndex = positionList.value.length + 1
+ positionList.value.push({
+ id: `POS_${Date.now()}_${nextIndex}`,
+ key: '',
+ value: 1
+ })
}
-const removePositionMapping = (key) => {
- delete config.value.positionMapping[key]
- mappingKeys.value = mappingKeys.value.filter(k => k !== key)
+const removePositionMapping = (idx) => {
+ positionList.value.splice(idx, 1)
+ applyPositionListToConfig()
}
-const updatePositionMapping = (index, newKey, oldValue) => {
- const oldKey = mappingKeys.value[index]
- if (oldKey && oldKey !== newKey) {
- delete config.value.positionMapping[oldKey]
- }
- mappingKeys.value[index] = newKey
- if (newKey) {
- config.value.positionMapping[newKey] = oldValue || 1
- }
+const handlePositionKeyChange = () => {
+ applyPositionListToConfig()
+}
+
+const handlePositionValueChange = () => {
+ applyPositionListToConfig()
}
</script>
--
Gitblit v1.8.0