From 461e18fcc3eae455636733cd53a903dc11306479 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 20 三月 2025 16:17:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 UI-Project/src/views/Caching/cachingunhistory.vue |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/UI-Project/src/views/Caching/cachingunhistory.vue b/UI-Project/src/views/Caching/cachingunhistory.vue
index 1d6744b..3578715 100644
--- a/UI-Project/src/views/Caching/cachingunhistory.vue
+++ b/UI-Project/src/views/Caching/cachingunhistory.vue
@@ -53,7 +53,11 @@
       </el-form>
     </div>
         <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
-      <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.glassID')" min-width="80" />
+      <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
+      <el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
+      <el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
+      <el-table-column prop="startCell" align="center" :label="$t('searchOrder.startCell')" min-width="80" />
+      <el-table-column prop="endCell" align="center" :label="$t('searchOrder.endCell')" min-width="80" />
           <el-table-column
             align="center"
             :label="$t('film.taskstatus')"
@@ -78,8 +82,8 @@
         </el-tag>  
       </template> 
           </el-table-column>
-          <el-table-column prop="createTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
-          <el-table-column prop="updateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
+          <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="100" />
+          <el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="100" />
         </el-table>
   <div style="margin-top: 20px;margin-left: 40%;">
         <el-pagination

--
Gitblit v1.8.0