From 7b36013a20c3113a2d66033371d289b8da678b29 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 30 八月 2023 18:20:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 33b81c4..c4e0e13 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -263,7 +263,7 @@
fileDocClassifyName: '',
hasDownload: true,
hasUpload: true,
- height: 100
+ height: 110
},
result: ''
};
@@ -382,7 +382,7 @@
this.tableHeight = 'calc(100vh - 630px)';
this.$refs.dataTable.doLayout()
} else {
- this.tableHeight = 'calc(100vh - 330px)';
+ this.tableHeight = 'calc(100vh - 350px)';
this.$refs.dataTable.doLayout()
}
},
@@ -867,8 +867,12 @@
}
}
-/deep/ .el-button {
+.el-button {
margin: 0 10px 10px 0;
+}
+
+/deep/ .dialog-footer .el-button {
+ margin: 0 10px 0 0;
}
.main {
@@ -884,11 +888,7 @@
}
.bottom {
- margin-top: 20px;
- overflow-y: scroll;
+ margin-top: 10px;
}
-.el-collapse-item__content {
- padding-bottom: 0;
-}
</style>
--
Gitblit v1.9.3