From 2e81d145301fcd7082217c088acea50fbdc5b13e Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 14 三月 2025 11:30:17 +0800
Subject: [PATCH] 卧理一线二线新增页面显示接口，中空一线、二线新增历史任务，磨边时间戳转换
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 13d2819..dfa3f9f 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -106,7 +106,13 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/edgTasks`;
const handleMessage = (data) => {
- tableData.value = data.edgTasks[0]
+ const formattedTasks = data.edgTasks[0].map(cageInfo => {
+ if (cageInfo && cageInfo.createTime) {
+ cageInfo.formattedCreateTime = formatTimestamp(cageInfo.createTime);
+ }
+ return cageInfo;
+ });
+ tableData.value = formattedTasks
};
// 鍘嗗彶浠诲姟
const iframeUrl = ref('');
@@ -141,6 +147,16 @@
case 2:
return t('workOrder.finedging');
}
+}
+function formatTimestamp(timestamp) {
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1锛屽苟琛ラ浂
+ 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}`;
}
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
@@ -185,7 +201,7 @@
<el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
<el-table-column prop="filmsid" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
<el-table-column prop="line" align="center" :label="$t('workOrder.line')" min-width="120" />
- <el-table-column prop="createTime" align="center" :label="$t('workOrder.time')" min-width="120" />
+ <el-table-column prop="formattedCreateTime" align="center" :label="$t('workOrder.time')" min-width="120" />
<el-table-column prop="state" :label="$t('workOrder.status')" align="center" width="200">
<!-- <template #default="scope">
{{ scope.row.status==0?"鏈（杈�":scope.row.status==1?"纾ㄨ竟涓�":"宸茬（杈�" }}
--
Gitblit v1.8.0