From 366ba040d2447bacd3455299425e3166f1f992bb Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 20 十一月 2025 14:38:32 +0800
Subject: [PATCH] 添加大车、大理片笼以及多设备串行/并行执行写入基础逻辑
---
mes-web/src/views/plcTest/components/MultiDeviceTest/ExecutionMonitor.vue | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/mes-web/src/views/plcTest/components/MultiDeviceTest/ExecutionMonitor.vue b/mes-web/src/views/plcTest/components/MultiDeviceTest/ExecutionMonitor.vue
index 65133b4..0569fd3 100644
--- a/mes-web/src/views/plcTest/components/MultiDeviceTest/ExecutionMonitor.vue
+++ b/mes-web/src/views/plcTest/components/MultiDeviceTest/ExecutionMonitor.vue
@@ -30,8 +30,16 @@
{{ row.currentStep || 0 }} / {{ row.totalSteps || 0 }}
</template>
</el-table-column>
- <el-table-column label="寮�濮嬫椂闂�" min-width="160" prop="startTime" />
- <el-table-column label="缁撴潫鏃堕棿" min-width="160" prop="endTime" />
+ <el-table-column label="寮�濮嬫椂闂�" min-width="160">
+ <template #default="{ row }">
+ {{ formatDateTime(row.startTime) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="缁撴潫鏃堕棿" min-width="160">
+ <template #default="{ row }">
+ {{ formatDateTime(row.endTime) }}
+ </template>
+ </el-table-column>
</el-table>
<el-drawer v-model="drawerVisible" size="40%" title="浠诲姟姝ラ璇︽儏">
@@ -39,7 +47,7 @@
<el-timeline-item
v-for="step in steps"
:key="step.id"
- :timestamp="step.startTime || '-'"
+ :timestamp="formatDateTime(step.startTime) || '-'"
:type="step.status === 'COMPLETED' ? 'success' : step.status === 'FAILED' ? 'danger' : 'primary'"
>
<div class="step-title">{{ step.stepName }}</div>
@@ -123,6 +131,28 @@
return `${(ms / 1000).toFixed(1)} s`
}
+// 鏍煎紡鍖栨棩鏈熸椂闂�
+const formatDateTime = (dateTime) => {
+ if (!dateTime) return '-'
+ try {
+ const date = new Date(dateTime)
+ // 妫�鏌ユ棩鏈熸槸鍚︽湁鏁�
+ if (isNaN(date.getTime())) {
+ return dateTime // 濡傛灉鏃犳硶瑙ｆ瀽锛岃繑鍥炲師濮嬪��
+ }
+ const year = date.getFullYear()
+ const month = String(date.getMonth() + 1).padStart(2, '0')
+ const day = String(date.getDate()).padStart(2, '0')
+ const hours = String(date.getHours()).padStart(2, '0')
+ const minutes = String(date.getMinutes()).padStart(2, '0')
+ const seconds = String(date.getSeconds()).padStart(2, '0')
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+ } catch (error) {
+ console.warn('鏍煎紡鍖栨椂闂村け璐�:', dateTime, error)
+ return dateTime
+ }
+}
+
watch(
() => props.groupId,
() => {
--
Gitblit v1.8.0