From 354cad3d3ab22ba147169beb6a0f6f51b9bab3a8 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 08 一月 2025 09:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/styles/ui.scss | 76 ++++++++++++++++++++++++++++++++++++--
1 files changed, 72 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/styles/ui.scss b/Source/plt-web/plt-web-ui/src/styles/ui.scss
index bc94532..a14a8d6 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -390,6 +390,10 @@
.el-dialog__footer{
border-top: 1px solid #e9e7e7;
padding: 10px 20px 10px;
+ z-index: 10000;
+}
+.avue-dialog__footer{
+ z-index: 10000;
}
/*
@@ -449,7 +453,14 @@
.el-table .sort-caret.descending{
bottom: 0;
}
-
+/****澶勭悊鍥哄畾鍒楅敊琛岄棶棰�****/
+.el-table .el-table__fixed,.el-table .el-table__fixed-right{
+ height: 100% !important;
+}
+.el-table__fixed .el-table__fixed-body-wrapper,.el-table__fixed-right .el-table__fixed-body-wrapper{
+ height: calc(100% - 37px) !important;
+ top:37px !important;
+}
/*
鍒嗛〉
*/
@@ -489,7 +500,12 @@
.UI-dynamic > .avue-crud{
height: 100%;
}
-
+/*
+svg鍥炬爣
+ */
+.iconShow svg{
+ fill: currentColor;
+}
/*
琛ㄥ崟
*/
@@ -504,7 +520,9 @@
}
-/***鎸夐挳妗�****/
+/***
+鎸夐挳
+****/
.tree-buttons .el-button{
margin: 0 5px 5px 0;
}
@@ -526,6 +544,41 @@
text-align: center;
padding-left: 4.5px;
}
+/*鏄剧ずsvg鍥炬爣鐨勬寜閽�*/
+.el-button--small.button-custom-icon{
+ padding: 7px 12px;
+}
+.el-button--small.button-custom-icon > span{
+ height: 16px;
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-align: center;
+ -ms-flex-align: center;
+ align-items: center;
+ -webkit-box-pack: center;
+ -ms-flex-pack: center;
+ justify-content: center;
+}
+/*鍥炬爣**/
+.el-button--small.button-custom-icon > span .iconShow{
+ font-size: 12px !important;
+ width: 12px !important;
+ height: 12px !important;
+ margin-right: 6px;
+}
+
+.el-table td.el-table__cell div.iconShow{
+ font-size: 14px !important;
+ width: 14px !important;
+ height: 14px !important;
+ margin-top: -1px;
+ margin-right: 3px;
+}
+
+.avue-crud .avue-crud__menu .el-button--text >span {
+ display: flex;
+}
/*
鏍�
@@ -534,6 +587,7 @@
.el-tree .el-tree-node__loading-icon{
display: none !important;
}
+/*鍥炬爣**/
.el-tree-node__label .iconShow{
display: inline-block;
width: 14px !important;
@@ -541,7 +595,7 @@
margin-right: 3px;
}
.el-tree-node__label [class*=" el-icon-"],.el-tree-node__label [class^=el-icon-]{
- font-size: 14px;margin-top: 3px;
+ font-size: 14px;margin-top: 4px; margin-right: 3px;
}
.el-select{
@@ -570,6 +624,20 @@
content: '';
}
+.avue-crud .avue-crud__menu .el-button{
+ margin-top: 5px;
+}
+
+.avue-crud__left{
+ display: flex;
+ align-items: center;
+}
+
+.avue-crud__menu{
+ display: flex;
+ justify-content: space-around;
+}
+
.font14{font-size: 14px;width: 12px;height: 12px;display: inline-block;}
.font16{font-size: 16px;width: 14px;height: 14px;display: inline-block;}
--
Gitblit v1.9.3