From 3ef0ee19b5991ee38ec6404a36c325171014f7fa Mon Sep 17 00:00:00 2001 From: yuxc <yuxc@vci-tech.com> Date: 星期二, 07 一月 2025 18:01:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-ui/src/styles/ui.scss | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 102 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 ab4ac8f..a14a8d6 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,6 +358,7 @@ .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; } @@ -367,7 +377,7 @@ margin-top: 0 !important; } .avue-dialog .el-dialog__body{ - padding: 20px 20px 0px 20px; // 涓婂彸涓嬪乏 鍙栨秷琛ㄦ牸涓嬭竟璺濓紙浼氬嚭鐜版粴鍔ㄦ潯锛� + padding: 15px 15px 0px 15px; // 涓婂彸涓嬪乏 鍙栨秷琛ㄦ牸涓嬭竟璺濓紙浼氬嚭鐜版粴鍔ㄦ潯锛� margin-bottom: 10px !important; } .avue-dialog .el-dialog__body .avue-form{ @@ -380,6 +390,10 @@ .el-dialog__footer{ border-top: 1px solid #e9e7e7; padding: 10px 20px 10px; + z-index: 10000; +} +.avue-dialog__footer{ + z-index: 10000; } /* @@ -414,6 +428,10 @@ } .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; @@ -435,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; +} /* 鍒嗛〉 */ @@ -475,7 +500,12 @@ .UI-dynamic > .avue-crud{ height: 100%; } - +/* +svg鍥炬爣 + */ +.iconShow svg{ + fill: currentColor; +} /* 琛ㄥ崟 */ @@ -490,7 +520,9 @@ } -/***鎸夐挳妗�****/ +/*** +鎸夐挳 +****/ .tree-buttons .el-button{ margin: 0 5px 5px 0; } @@ -512,10 +544,58 @@ 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; +} + +/* + 鏍� + */ /***闅愯棌鏍戞噿鍔犺浇鏃惰妭鐐逛笂鐨刲oading锛岄槻姝㈣妭鐐规姈鍔�*****/ .el-tree .el-tree-node__loading-icon{ display: none !important; +} +/*鍥炬爣**/ +.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{ @@ -540,6 +620,24 @@ margin-left: 1px; } +.avue-sidebar .el-menu .el-submenu__icon-arrow.el-icon-arrow-right:before { + 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