From 1d0179bcb3237df95423d95c4fd6b697c6989629 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 二月 2025 08:50:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Caching/cachingbefore.vue | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index a5f821e..5e0d0f1 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -280,8 +280,7 @@
const hours = String(date.getHours()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
const minutes = String(date.getMinutes()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
- // 鍙樉绀哄勾鏈堟棩锛屽鏋滈渶瑕佹樉绀烘椂闂达紝鍒欐嫾鎺� hours + ':' + minutes + ':' + seconds
- return `${year}-${month}-${day}`;
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
onUnmounted(() => {
if (socket) {
@@ -312,7 +311,6 @@
ref="table"
style="margin-top: 20px; height: 360px;"
:data="tableDataa"
- :row-class-name="rowClassName"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="id"
>
@@ -335,7 +333,7 @@
<template #default="props">
<el-table
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
- :data="props.row.details" style="width: 100%;height: 100px;">
+ :data="props.row.details" style="width: 100%;height: 70px;">
<el-table-column prop="engineerId" align="center" min-width="80" />
<el-table-column prop="flowCardId" align="center" min-width="80" />
<el-table-column prop="glassId" align="center" min-width="80" />
--
Gitblit v1.8.0