From b71ae6310a48763ca79216db617e36c99d7b9ef7 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 31 十二月 2024 17:02:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- UI-Project/src/views/Caching/cachingbefore.vue | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue index 1c02239..88bda26 100644 --- a/UI-Project/src/views/Caching/cachingbefore.vue +++ b/UI-Project/src/views/Caching/cachingbefore.vue @@ -149,7 +149,7 @@ const handleptask = async() => { try { const confirmResult = await ElMessageBox.confirm( - t('workOrder.partasks'), + t('searchOrder.partasks'), t('workOrder.prompt'), { confirmButtonText: t('workOrder.yes'), @@ -325,7 +325,7 @@ <template #default="props"> <el-table :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }" - :data="props.row.details" style="width: 100%;height: 200px;"> + :data="props.row.details" style="width: 100%;height: 100px;"> <el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="80" /> <el-table-column prop="flowCardId" align="center" :label="$t('hellow.flowCardId')" min-width="80" /> <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" /> -- Gitblit v1.8.0