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/ExecutionMonitor.vue | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/mes-web/src/views/plcTest/components/MultiDeviceTest/ExecutionMonitor.vue b/mes-web/src/views/plcTest/components/MultiDeviceTest/ExecutionMonitor.vue
index 1502b50..d475c11 100644
--- a/mes-web/src/views/plcTest/components/MultiDeviceTest/ExecutionMonitor.vue
+++ b/mes-web/src/views/plcTest/components/MultiDeviceTest/ExecutionMonitor.vue
@@ -86,7 +86,7 @@
鏌ョ湅璇︽儏
</el-button>
<el-button
- v-if="row.status === 'RUNNING'"
+ v-if="row.status === 'RUNNING' || row.status === 'FAILED'"
link
type="danger"
size="small"
@@ -127,6 +127,9 @@
<div class="step-desc">鑰楁椂锛歿{ formatDuration(step.durationMs) }}</div>
<div class="step-desc" v-if="step.retryCount > 0">
閲嶈瘯娆℃暟锛歿{ step.retryCount }}
+ </div>
+ <div class="step-desc" v-if="step.successMessage">
+ 鎻愮ず锛歿{ step.successMessage }}
</div>
<div class="step-desc error-message" v-if="step.errorMessage">
<el-icon><Warning /></el-icon>
@@ -367,6 +370,7 @@
endTime: data.endTime ? new Date(data.endTime) : existingStep.endTime,
durationMs: data.durationMs !== undefined ? data.durationMs : existingStep.durationMs,
retryCount: data.retryCount !== undefined ? data.retryCount : existingStep.retryCount,
+ successMessage: data.successMessage !== undefined ? data.successMessage : existingStep.successMessage,
errorMessage: data.errorMessage || existingStep.errorMessage
}
} else if (data.stepOrder !== undefined) {
@@ -419,6 +423,20 @@
} finally {
stepsLoading.value = false
}
+}
+
+// 鏍规嵁taskId鎵撳紑浠诲姟璇︽儏鎶藉眽锛堜緵鐖剁粍浠惰皟鐢級
+const openTaskDrawer = async (taskId) => {
+ if (!taskId) return
+ // 濡傛灉浠诲姟鍒楄〃涓虹┖锛屽厛鍔犺浇涓�娆�
+ if (!tasks.value || tasks.value.length === 0) {
+ await fetchTasks()
+ }
+ const task = tasks.value.find(t => t.taskId === taskId)
+ if (!task) {
+ return
+ }
+ await handleRowClick(task)
}
const statusType = (status) => {
@@ -562,7 +580,8 @@
defineExpose({
fetchTasks,
connectSSE,
- disconnectSSE
+ disconnectSSE,
+ openTaskDrawer
})
</script>
--
Gitblit v1.8.0