From a0ae51e670cb85798cc50a7e2f013877c8bd2522 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 30 八月 2023 16:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 16 ++++++++--------
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 3 ++-
Source/UBCS-WEB/src/App.vue | 4 ++++
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/App.vue b/Source/UBCS-WEB/src/App.vue
index 53a3d1d..ea73e65 100644
--- a/Source/UBCS-WEB/src/App.vue
+++ b/Source/UBCS-WEB/src/App.vue
@@ -34,4 +34,8 @@
.avue-crud__pagination {
padding: 10px 0 2px 20px;
}
+
+.el-collapse-item__content {
+ padding-bottom: 0px;
+}
</style>
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>
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index be36a62..64ec3ec 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog :title="title" :visible.sync="dialogVisible" append-to-body="true" width="30%">
+ <el-dialog :title="title" :visible.sync="dialogVisible" append-to-body="true" class="avue-dialog avue-dialog--top" top="-3%" width="30%">
<el-tag v-for="tag in tags" :key="tag" closable disable-transitions effect="Plain" size="medium"
@click="handleClickTag(tag)" @close="handleCloseTag(tag)">
<span> {{ tag.name }}</span>
@@ -280,4 +280,5 @@
justify-content: end;
padding-bottom: 10px;
}
+
</style>
--
Gitblit v1.9.3