From 24bc065e9009bfb3c778e762921268a389aeaf49 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 10 十二月 2024 09:00:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hollowequipment.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 077c72a..5918ae5 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -42,7 +42,7 @@
</el-form>
</div>
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="480" ref="table" :data="tableDataa"
+ <el-table height="650" ref="table" :data="tableDataa"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
<el-table-column prop="sequence" :label="$t('hellow.order')" align="center"/>
<el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center"/>
@@ -75,7 +75,7 @@
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%">
<el-table
ref="table"
- style="margin-top: 20px; height: 500px;"
+ style="margin-top: 20px; height: 700px;"
:data="tableDatab"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="projectNumber"
--
Gitblit v1.8.0