From e59a71579f6afd21c76f9d45c3b3f09c28d03c41 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 14:37:22 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b4-sample-defects.vue | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/components/view/b4-sample-defects.vue b/src/components/view/b4-sample-defects.vue
index 5637b5c..ea09b32 100644
--- a/src/components/view/b4-sample-defects.vue
+++ b/src/components/view/b4-sample-defects.vue
@@ -73,6 +73,7 @@
<el-table
:data="tableData"
style="width: 100%;margin-bottom: 10px;height: calc(100% - 40px);"
+ height="calc(100% - 40px)"
row-key="id"
v-loading="loading"
border
--
Gitblit v1.9.3