From 391eec3114a17e68652434c6eae610799d80290e Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 11:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/styles/ui.scss | 90 ++++++++++++++++++++++++++++----------------
1 files changed, 57 insertions(+), 33 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 a14a8d6..7336bb7 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -371,17 +371,18 @@
}
.avue-dialog .el-dialog{
top:50%;
- max-height: calc(100% - 80px);
+ max-height: calc(100% - 50px);
+ max-width: calc(100% - 50px);
-webkit-transform: translate(-50%, 0);
transform: translate(-50%, -50%);
margin-top: 0 !important;
}
.avue-dialog .el-dialog__body{
padding: 15px 15px 0px 15px; // 涓婂彸涓嬪乏 鍙栨秷琛ㄦ牸涓嬭竟璺濓紙浼氬嚭鐜版粴鍔ㄦ潯锛�
- margin-bottom: 10px !important;
+ margin-bottom: 5px !important;
}
.avue-dialog .el-dialog__body .avue-form{
- margin: 0px auto 40px; // 鍗曠嫭缁欏璇濇閲岀殑avue琛ㄥ崟鍔犱笂涓嬭竟璺�
+ margin: 0px auto 45px; // 鍗曠嫭缁欏璇濇閲岀殑avue琛ㄥ崟鍔犱笂涓嬭竟璺�
}
.dialog-footer{
background-color: #ffffff;
@@ -405,17 +406,37 @@
.avue--detail .el-col{
margin-bottom: 0;
}
-.avue-crud .avue-crud__menu{
- min-height: 26px;
-}
-.avue-crud .avue-crud__menu .el-button{
- margin-bottom: 5px;
-}
-.avue-crud .avue-crud__menu .el-button--text{
- padding: 2px 6px;
-}
.avue-crud table td{
line-height: 22px;
+}
+.avue-crud__header{
+ min-height: 35px;
+}
+/**宸︿晶鎿嶄綔鏍�**/
+.avue-crud__left{
+ display: flex;
+ align-items: start;
+}
+/**鍙充晶渚ф搷浣滄爮**/
+.avue-crud__right{
+ display: flex;
+ align-items: start;
+}
+/**琛ㄥ唴鎿嶄綔鏍�**/
+.avue-crud .avue-crud__menu{
+ min-height: 18px;
+ display: flex;
+ justify-content: flex-start;
+}
+.avue-crud .avue-crud__menu .el-button{
+
+}
+.avue-crud .avue-crud__menu .el-button--text{
+ padding: 2px 3px;
+ display: flex;
+}
+.avue-crud .avue-crud__menu .el-button--text > span {
+ display: flex;
}
.el-table--small, .el-table__expand-icon{
font-size: 14px;
@@ -454,12 +475,29 @@
bottom: 0;
}
/****澶勭悊鍥哄畾鍒楅敊琛岄棶棰�****/
+.el-table th.el-table__cell .cell{
+ display: flex;
+ justify-content:flex-start;
+}
+.el-table th.el-table__cell.is-center .cell{
+ justify-content:center;
+}
+
+.el-table th.el-table__cell.is-right .cell{
+ justify-content: flex-end;
+}
+.el-table th.el-table__cell .cell span:first-child{
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
.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;
+ height: calc(100% - 47px) !important;
+ top:35px !important;
+ padding-bottom: 12px !important;
}
/*
鍒嗛〉
@@ -565,7 +603,7 @@
font-size: 12px !important;
width: 12px !important;
height: 12px !important;
- margin-right: 6px;
+ margin-right: 2px;
}
.el-table td.el-table__cell div.iconShow{
@@ -573,11 +611,7 @@
width: 14px !important;
height: 14px !important;
margin-top: -1px;
- margin-right: 3px;
-}
-
-.avue-crud .avue-crud__menu .el-button--text >span {
- display: flex;
+ margin-right: 1px;
}
/*
@@ -588,6 +622,9 @@
display: none !important;
}
/*鍥炬爣**/
+.el-tree-node__label > span{
+ display: flex;
+}
.el-tree-node__label .iconShow{
display: inline-block;
width: 14px !important;
@@ -624,19 +661,6 @@
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