From 7f0b86e844f96a8e6db14e6579cd8efb09ee53c9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 24 十月 2023 11:42:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 3660db1..e0702b5 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -306,7 +306,7 @@
v-loading="loading"
border
:data="ProData"
- :height="this.editStyleFlag? 800 : 343"
+ :height="this.tableHeight"
style="width: 100%"
@select="selectHandle"
@cell-click="handleCellClicks"
@@ -492,6 +492,8 @@
},
data() {
return {
+ //琛ㄦ牸楂樺害
+ dynamicHeight: '',
// 淇濆瓨鍗曞厓鏍肩姸鎬�
AddCellFlag: false,
//鍏ㄥ睆缂栬緫楂樺害鐘舵��
@@ -1542,6 +1544,13 @@
});
return oids.join(",");
},
+ tableHeight() {
+ if (this.editStyleFlag) {
+ return '800px'
+ } else {
+ return 'calc(100vh - 595px)'
+ }
+ }
},
mounted() {
},
@@ -2174,7 +2183,7 @@
<style lang="scss" scoped>
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: 325px!important;
+ height: calc(100vh - 612px)!important;
}
// 婊氬姩鏉℃牱寮忎慨鏀�
--
Gitblit v1.9.3