From c09f81131e8b7c83937206d7cf76f34d2020be75 Mon Sep 17 00:00:00 2001 From: yuxc <yuxc@vci-tech.com> Date: 星期三, 15 一月 2025 13:14:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-ui/src/styles/ui.scss | 81 +++++++++++++++++++++++++++++++++------- 1 files changed, 67 insertions(+), 14 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 810be2c..de021e8 100644 --- a/Source/plt-web/plt-web-ui/src/styles/ui.scss +++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss @@ -405,17 +405,34 @@ .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__left{ + display: flex; + align-items: center; +} +/**鍙充晶渚ф搷浣滄爮**/ +.avue-crud__right{ + display: flex; + align-items: center; +} +/**琛ㄥ唴鎿嶄綔鏍�**/ +.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; @@ -453,7 +470,31 @@ .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; +} /* 鍒嗛〉 */ @@ -539,7 +580,7 @@ } /*鏄剧ずsvg鍥炬爣鐨勬寜閽�*/ .el-button--small.button-custom-icon{ - padding: 7px 14px; + padding: 7px 12px; } .el-button--small.button-custom-icon > span{ height: 16px; @@ -555,10 +596,18 @@ } /*鍥炬爣**/ .el-button--small.button-custom-icon > span .iconShow{ - font-size: 16px !important; - width: 16px !important; - height: 16px !important; - margin-right: 6px; + 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; } /* @@ -569,6 +618,9 @@ display: none !important; } /*鍥炬爣**/ +.el-tree-node__label > span{ + display: flex; +} .el-tree-node__label .iconShow{ display: inline-block; width: 14px !important; @@ -605,6 +657,7 @@ 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