From 792236ef78c2cdd3a989fb40a7f2e2487c4e17b6 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 26 十一月 2025 17:06:11 +0800
Subject: [PATCH] 添加各个设备基础可配置参数
---
mes-web/src/views/device/components/DeviceLogicConfig/WorkstationScannerConfig.vue | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/mes-web/src/views/device/components/DeviceLogicConfig/WorkstationScannerConfig.vue b/mes-web/src/views/device/components/DeviceLogicConfig/WorkstationScannerConfig.vue
index e1c86c6..46cf414 100644
--- a/mes-web/src/views/device/components/DeviceLogicConfig/WorkstationScannerConfig.vue
+++ b/mes-web/src/views/device/components/DeviceLogicConfig/WorkstationScannerConfig.vue
@@ -2,15 +2,15 @@
<div class="workstation-scanner-config">
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="鎵爜闂撮殧(ms)">
+ <el-form-item label="鎵爜闂撮殧(绉�)">
<el-input-number
- v-model="config.scanIntervalMs"
- :min="1000"
- :max="60000"
- :step="1000"
+ v-model="scanIntervalSeconds"
+ :min="1"
+ :max="60"
+ :step="1"
style="width: 100%;"
/>
- <span class="form-tip">瀹氭椂鎵弿MES鍐欏尯鐨勬椂闂撮棿闅旓紝榛樿10000ms锛�10绉掞級</span>
+ <span class="form-tip">瀹氭椂鎵弿MES鍐欏尯鐨勬椂闂撮棿闅旓紝榛樿10绉�</span>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -23,15 +23,6 @@
style="width: 100%;"
/>
<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-switch v-model="config.autoAck" />
- <span class="form-tip">鏄惁鑷姩纭MES鍙戦�佺殑鐜荤拑淇℃伅锛堝洖鍐檓esSend=0锛�</span>
</el-form-item>
</el-col>
</el-row>
@@ -53,24 +44,35 @@
// 閰嶇疆鏁版嵁
const config = ref({
scanIntervalMs: 10000,
- workLine: null,
- autoAck: true
+ workLine: null
})
+
+// 鏃堕棿瀛楁锛堢锛�- 鐢ㄤ簬鍓嶇鏄剧ず鍜岃緭鍏�
+const scanIntervalSeconds = ref(10)
// 鐩戝惉props鍙樺寲
watch(() => props.modelValue, (newVal) => {
if (newVal && Object.keys(newVal).length > 0) {
config.value = {
scanIntervalMs: newVal.scanIntervalMs ?? 10000,
- workLine: newVal.workLine ?? null,
- autoAck: newVal.autoAck ?? true
+ workLine: newVal.workLine ?? null
}
+ // 灏嗘绉掕浆鎹负绉掔敤浜庢樉绀�
+ scanIntervalSeconds.value = (config.value.scanIntervalMs ?? 10000) / 1000
}
}, { immediate: true, deep: true })
-// 鐩戝惉config鍙樺寲锛屽悓姝ュ埌鐖剁粍浠�
-watch(config, (newVal) => {
- emit('update:modelValue', { ...newVal })
+// 鐩戝惉绉掑瓧娈靛彉鍖栵紝杞崲涓烘绉掑苟鏇存柊config
+watch(scanIntervalSeconds, (val) => {
+ config.value.scanIntervalMs = Math.round(val * 1000)
+ emit('update:modelValue', { ...config.value })
+})
+
+// 鐩戝惉config鍏朵粬瀛楁鍙樺寲锛屽悓姝ュ埌鐖剁粍浠�
+watch(() => [
+ config.value.workLine
+], () => {
+ emit('update:modelValue', { ...config.value })
}, { deep: true })
</script>
--
Gitblit v1.8.0