From 86903050702bb898277ed8f87202c0224867c47f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 16:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 13d2819..8763b82 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('');
@@ -142,6 +148,16 @@
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("鍏抽棴浜�")
closeWebSocket();
@@ -152,10 +168,10 @@
<div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="display: flex;">
- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handlehistorical">{{
+ <!-- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handlehistorical">{{
$t('searchOrder.historicaltasks')
}}
- </el-button>
+ </el-button> -->
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable
style="margin-left: 20px;margin-bottom: 10px;">
<el-option :label="$t('workOrder.edgingone')" value="930"></el-option>
@@ -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?"纾ㄨ竟涓�":"宸茬（杈�" }}
@@ -213,7 +229,7 @@
</el-card>
</div>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="90%">
+<el-dialog v-model="blindb" top="10vh" width="95%">
<iframe
:src="iframeUrl"
marginwidth="2000px"
--
Gitblit v1.8.0