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 | 192 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 174 insertions(+), 18 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 84b2529..7336bb7 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -336,6 +336,15 @@
/*
淇敼妗嗘灦榛樿鏍峰紡
*/
+/*
+宸︿晶鑿滃崟
+ */
+.el-menu--vertical{
+ margin-left: -4px;
+}
+.el-menu--vertical .el-menu--vertical{
+ margin-left: 0;
+}
.el-menu--vertical .el-menu--popup-right-start{
background: #20222a !important;
}
@@ -349,25 +358,31 @@
.el-menu--popup-right-start .menu-wrapper:hover .el-submenu__title i, .el-menu--popup-right-start .menu-wrapper:hover .el-submenu__title span {
color: #ffffff;
}
+
.el-card__body {
padding: 15px;
}
+
+/*
+寮瑰嚭妗�
+ */
.el-dialog{
margin: 50px auto;
}
.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: 20px 20px 0px 20px; // 涓婂彸涓嬪乏 鍙栨秷琛ㄦ牸涓嬭竟璺濓紙浼氬嚭鐜版粴鍔ㄦ潯锛�
- margin-bottom: 10px !important;
+ padding: 15px 15px 0px 15px; // 涓婂彸涓嬪乏 鍙栨秷琛ㄦ牸涓嬭竟璺濓紙浼氬嚭鐜版粴鍔ㄦ潯锛�
+ 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;
@@ -376,27 +391,68 @@
.el-dialog__footer{
border-top: 1px solid #e9e7e7;
padding: 10px 20px 10px;
+ z-index: 10000;
}
+.avue-dialog__footer{
+ z-index: 10000;
+}
+
+/*
+鍒楄〃
+ */
.avue-crud .avue-form {
margin: 0px auto !important; // 琛ㄦ牸鍐呯殑琛ㄥ崟锛堟瘮濡�:鎼滅储鏍忥級 鍙栨秷涓嬭竟璺�
}
.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;
+}
+.el-table--small .el-table__cell {
+ padding: 6px 0;
+}
+.avue-crud .el-table th{
+ font-weight: 400;
+}
.el-table .cell{
line-height: 22px;
+ padding: 0 8px;
+}
+.el-table th.el-table__cell>.cell{
+ padding: 0 3px;
}
.el-table--mini .cell{
line-height: 20px;
@@ -418,12 +474,42 @@
.el-table .sort-caret.descending{
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% - 47px) !important;
+ top:35px !important;
+ padding-bottom: 12px !important;
+}
+/*
+鍒嗛〉
+ */
.avue-crud__pagination{
padding: 15px 0 10px;
}
-.el-form .el-col{
- margin-bottom: 0;
-}
+
+
+/*
+UI寮曟搸椤甸潰
+ */
.UITabs > .el-tabs__content{
height:calc(100% - 56px);
}
@@ -452,7 +538,18 @@
.UI-dynamic > .avue-crud{
height: 100%;
}
-
+/*
+svg鍥炬爣
+ */
+.iconShow svg{
+ fill: currentColor;
+}
+/*
+琛ㄥ崟
+ */
+.el-form .el-col{
+ margin-bottom: 0;
+}
.el-form-item{
margin-bottom: 15px;
}
@@ -460,10 +557,14 @@
margin-bottom: 15px;
}
+
+/***
+鎸夐挳
+****/
.tree-buttons .el-button{
margin: 0 5px 5px 0;
}
-/***鎸夐挳妗�****/
+
.headerCon {
display: flex;
flex-wrap: wrap;
@@ -481,10 +582,57 @@
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: 2px;
+}
+.el-table td.el-table__cell div.iconShow{
+ font-size: 14px !important;
+ width: 14px !important;
+ height: 14px !important;
+ margin-top: -1px;
+ margin-right: 1px;
+}
+
+/*
+ 鏍�
+ */
/***闅愯棌鏍戞噿鍔犺浇鏃惰妭鐐逛笂鐨刲oading锛岄槻姝㈣妭鐐规姈鍔�*****/
.el-tree .el-tree-node__loading-icon{
display: none !important;
+}
+/*鍥炬爣**/
+.el-tree-node__label > span{
+ display: flex;
+}
+.el-tree-node__label .iconShow{
+ display: inline-block;
+ width: 14px !important;
+ height: 14px !important;
+ margin-right: 3px;
+}
+.el-tree-node__label [class*=" el-icon-"],.el-tree-node__label [class^=el-icon-]{
+ font-size: 14px;margin-top: 4px; margin-right: 3px;
}
.el-select{
@@ -505,6 +653,14 @@
height: 20px;
line-height: 20px;
}
+.el-menu--popup-right-start{
+ margin-left: 1px;
+}
+
+.avue-sidebar .el-menu .el-submenu__icon-arrow.el-icon-arrow-right:before {
+ content: '';
+}
+
.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