From 8f3a85044b6e4b56a8dd0b104ca023933f1f129c Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 03 十二月 2025 16:58:36 +0800
Subject: [PATCH] 统一卧转立扫码、卧转立、大车、大理片笼的定时器逻辑和步骤状态；添加设备拓扑图清除数据、联机状态切换按钮，
---
mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue | 167 ++++++++++++-------------------------------------------
1 files changed, 38 insertions(+), 129 deletions(-)
diff --git a/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue b/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue
index 8cf1feb..107603c 100644
--- a/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue
+++ b/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue
@@ -26,95 +26,28 @@
</div>
<el-form :model="form" label-width="120px" :rules="rules" ref="formRef">
- <el-form-item label="鐜荤拑ID鍒楄〃" prop="glassIds" required>
+ <el-form-item label="鐜荤拑ID鍒楄〃" prop="glassIds">
<el-input
v-model="glassIdsInput"
type="textarea"
:rows="4"
- placeholder="璇疯緭鍏ョ幓鐠冩潯鐮侊紝鏀寔澶氳鎴栭�楀彿鍒嗛殧锛屾瘡琛屼竴涓垨閫楀彿鍒嗛殧"
+ placeholder="鍙�夛細杈撳叆鐜荤拑ID锛屽皢浣跨敤杈撳叆鐨処D杩涜娴嬭瘯"
show-word-limit
:maxlength="5000"
/>
<div class="form-tip">
- 宸茶緭鍏� {{ glassIds.length }} 涓幓鐠僆D
+ <span v-if="glassIds.length > 0">宸茶緭鍏� {{ glassIds.length }} 涓幓鐠僆D锛堟祴璇曟ā寮忥細浣跨敤杈撳叆鐨処D锛�</span>
+ <span v-else>鏈緭鍏ョ幓鐠僆D锛堟甯告ā寮忥細灏嗕粠鏁版嵁搴撹鍙栨渶杩戞壂鐮佺殑鐜荤拑ID锛�</span>
</div>
</el-form-item>
-
- <el-divider content-position="left">璁惧鐗瑰畾閰嶇疆</el-divider>
-
- <el-form-item label="浣嶇疆缂栫爜">
- <el-input
- v-model="form.positionCode"
- placeholder="渚嬪锛歅OS1"
- clearable
- />
- <div class="form-tip">涓婂ぇ杞﹁澶囩殑浣嶇疆缂栫爜</div>
- </el-form-item>
-
- <el-form-item label="浣嶇疆鍊�">
- <el-input-number
- v-model="form.positionValue"
- :min="0"
- :max="9999"
- placeholder="浣嶇疆鏁板��"
- />
- <div class="form-tip">涓婂ぇ杞﹁澶囩殑浣嶇疆鏁板��</div>
- </el-form-item>
-
- <el-form-item label="瀛樺偍浣嶇疆">
- <el-input-number
- v-model="form.storagePosition"
- :min="1"
- :max="200"
- placeholder="瀛樺偍浣嶇疆缂栧彿"
- />
- <div class="form-tip">鐜荤拑瀛樺偍璁惧鐨勫瓨鍌ㄤ綅缃�</div>
- </el-form-item>
-
- <el-form-item label="澶勭悊绫诲瀷">
- <el-select v-model="form.processType" placeholder="閫夋嫨澶勭悊绫诲瀷" clearable>
- <el-option label="鏍囧噯澶勭悊" :value="1" />
- <el-option label="蹇�熷鐞�" :value="2" />
- <el-option label="鎱㈤�熷鐞�" :value="3" />
- </el-select>
- <div class="form-tip">澶х悊鐗囪澶囩殑澶勭悊绫诲瀷</div>
- </el-form-item>
-
- <el-divider content-position="left">鎵ц閰嶇疆</el-divider>
-
- <el-form-item label="鎵ц闂撮殧 (ms)">
- <el-input-number
- v-model="form.executionInterval"
- :min="100"
- :max="10000"
- :step="100"
- placeholder="璁惧鎿嶄綔闂撮殧鏃堕棿"
- />
- <div class="form-tip">姣忎釜璁惧鎿嶄綔涔嬮棿鐨勯棿闅旀椂闂达紙姣锛�</div>
- </el-form-item>
-
- <el-form-item label="瓒呮椂鏃堕棿 (鍒嗛挓)">
- <el-input-number
- v-model="form.timeoutMinutes"
- :min="1"
- :max="60"
- :step="1"
- placeholder="浠诲姟瓒呮椂鏃堕棿"
- />
- <div class="form-tip">浠诲姟鎵ц鐨勬渶澶ц秴鏃舵椂闂�</div>
- </el-form-item>
-
- <el-form-item label="閲嶈瘯娆℃暟">
- <el-input-number
- v-model="form.retryCount"
- :min="0"
- :max="10"
- :step="1"
- placeholder="澶辫触閲嶈瘯娆℃暟"
- />
- <div class="form-tip">璁惧鎿嶄綔澶辫触鏃剁殑鏈�澶ч噸璇曟鏁�</div>
- </el-form-item>
</el-form>
+
+ <!-- 璁惧缁勬嫇鎵戝浘 -->
+ <GroupTopology
+ v-if="group"
+ :group="group"
+ class="topology-section"
+ />
</div>
</template>
@@ -124,6 +57,7 @@
import { Delete, Promotion } from '@element-plus/icons-vue'
import { multiDeviceTaskApi } from '@/api/device/multiDeviceTask'
import { deviceGroupApi, deviceInteractionApi } from '@/api/device/deviceManagement'
+import GroupTopology from '../DeviceGroup/GroupTopology.vue'
const props = defineProps({
group: {
@@ -133,16 +67,8 @@
})
const emit = defineEmits(['task-started'])
-
-const form = reactive({
- positionCode: '',
- positionValue: null,
- storagePosition: null,
- processType: null,
- executionInterval: 1000,
- timeoutMinutes: 30,
- retryCount: 3
-})
+//閰嶇疆榛樿鍊�
+const form = reactive({})
const formRef = ref(null)
@@ -150,8 +76,10 @@
glassIds: [
{
validator: (rule, value, callback) => {
+ // 濡傛灉杈撳叆浜嗙幓鐠僆D锛屽垯杩涜楠岃瘉锛涘鏋滄病鏈夎緭鍏ワ紝鍒欏厑璁革紙灏嗕粠鏁版嵁搴撹鍙栵級
if (glassIds.value.length === 0) {
- callback(new Error('璇疯嚦灏戣緭鍏ヤ竴涓幓鐠僆D'))
+ // 鍏佽涓虹┖锛屽皢浠庢暟鎹簱璇诲彇鏈�杩戞壂鐮佺殑鐜荤拑ID
+ callback()
} else if (glassIds.value.length > 100) {
callback(new Error('鐜荤拑ID鏁伴噺涓嶈兘瓒呰繃100涓�'))
} else {
@@ -195,6 +123,8 @@
.filter((item) => item.length > 0)
})
+const normalizeType = (type) => (type || '').trim().toUpperCase()
+
const fetchLoadDevice = async () => {
loadDeviceId.value = null
loadDeviceName.value = ''
@@ -216,9 +146,15 @@
: Array.isArray(rawList?.data)
? rawList.data
: []
- const targetDevice =
- deviceList.find((item) => (item.deviceType || '').toUpperCase() === 'LOAD_VEHICLE') ||
- deviceList[0]
+ const scannerDevice = deviceList.find((item) => {
+ const type = normalizeType(item.deviceType)
+ return type.includes('SCANNER') || type.includes('鎵爜')
+ })
+ const loadVehicleDevice = deviceList.find((item) => {
+ const type = normalizeType(item.deviceType)
+ return type.includes('LOAD_VEHICLE') || type.includes('澶ц溅')
+ })
+ const targetDevice = scannerDevice || loadVehicleDevice || deviceList[0]
if (targetDevice && targetDevice.id) {
loadDeviceId.value = targetDevice.id
loadDeviceName.value = targetDevice.deviceName || targetDevice.deviceCode || `ID: ${targetDevice.id}`
@@ -246,38 +182,13 @@
return
}
- if (glassIds.value.length === 0) {
- ElMessage.warning('璇疯嚦灏戣緭鍏ヤ竴涓幓鐠僆D')
- return
- }
-
try {
loading.value = true
// 鏋勫缓浠诲姟鍙傛暟
+ // 濡傛灉杈撳叆浜嗙幓鐠僆D锛屼娇鐢ㄨ緭鍏ョ殑锛涘鏋滄病鏈夎緭鍏ワ紝glassIds涓虹┖鏁扮粍锛屽悗绔細浠庢暟鎹簱璇诲彇
const parameters = {
- glassIds: glassIds.value,
- executionInterval: form.executionInterval || 1000
- }
-
- // 娣诲姞鍙�夊弬鏁�
- if (form.positionCode) {
- parameters.positionCode = form.positionCode
- }
- if (form.positionValue !== null) {
- parameters.positionValue = form.positionValue
- }
- if (form.storagePosition !== null) {
- parameters.storagePosition = form.storagePosition
- }
- if (form.processType !== null) {
- parameters.processType = form.processType
- }
- if (form.timeoutMinutes) {
- parameters.timeoutMinutes = form.timeoutMinutes
- }
- if (form.retryCount !== null) {
- parameters.retryCount = form.retryCount
+ glassIds: glassIds.value.length > 0 ? glassIds.value : []
}
// 寮傛鍚姩浠诲姟锛岀珛鍗宠繑鍥烇紝涓嶉樆濉�
@@ -296,12 +207,8 @@
emit('task-started')
}, 500)
- // 閲嶇疆琛ㄥ崟锛堜繚鐣欓儴鍒嗛厤缃級锛屾柟渚跨户缁惎鍔ㄥ叾浠栬澶囩粍
+ // 閲嶇疆琛ㄥ崟锛堜繚鐣欐墽琛岄厤缃級锛屾柟渚跨户缁惎鍔ㄥ叾浠栬澶囩粍
glassIdsInput.value = ''
- form.positionCode = ''
- form.positionValue = null
- form.storagePosition = null
- form.processType = null
// 鎻愮ず鐢ㄦ埛鍙互缁х画鍚姩鍏朵粬璁惧缁�
ElMessage.info('鍙互缁х画閫夋嫨鍏朵粬璁惧缁勫惎鍔ㄦ祴璇曪紝澶氫釜璁惧缁勫皢骞惰鎵ц')
@@ -321,17 +228,15 @@
return
}
if (!loadDeviceId.value) {
- ElMessage.warning('鏈壘鍒颁笂澶ц溅璁惧锛屾棤娉曟竻绌篜LC')
+ ElMessage.warning('鏈壘鍒板搴旇澶囷紝鏃犳硶娓呯┖PLC')
return
}
try {
clearLoading.value = true
const response = await deviceInteractionApi.executeOperation({
deviceId: loadDeviceId.value,
- operation: 'clearGlass',
- params: {
- positionCode: form.positionCode || null
- }
+ operation: 'clearPlc',
+ params: {}
})
if (response?.code !== 200) {
throw new Error(response?.message || 'PLC娓呯┖澶辫触')
@@ -399,5 +304,9 @@
margin-top: 4px;
line-height: 1.4;
}
+
+.topology-section {
+ margin-top: 24px;
+}
</style>
--
Gitblit v1.8.0