From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
index 84c3aba..06dc2ad 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
@@ -17,7 +17,8 @@
</div>
</div>
<div>
- <el-table ref="yearTable" v-loading="yearTableDataLoading" :data="yearTableData" height="calc(60vh - 20em)"
+ <el-table ref="yearTable" v-loading="yearTableDataLoading" :data="yearTableData"
+ height="calc(60vh - 16em)"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
highlight-current-row @current-change="currentChange">
<!-- 琛ㄦ牸鍒� -->
@@ -85,7 +86,7 @@
<div>
<el-table ref="yearTableDetailData" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- height="calc(60vh - 20em)" style="width: 100% ;">
+ :height="'calc(100vh - 34em)'" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
width="70"></el-table-column>
--
Gitblit v1.9.3