diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/Test.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/Test.java new file mode 100644 index 0000000..cdcffb6 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/Test.java @@ -0,0 +1,9 @@ +package org.nl.config; + +/** + * @Author: lyd + * @Description: 测试 + * @Date: 2024/5/28 + */ +public class Test { +} diff --git a/nladmin-ui/public/favicon.ico b/nladmin-ui/public/favicon.ico index fcb6999..63a1585 100644 Binary files a/nladmin-ui/public/favicon.ico and b/nladmin-ui/public/favicon.ico differ diff --git a/nladmin-ui/src/assets/images/avatar1.png b/nladmin-ui/src/assets/images/avatar1.png deleted file mode 100644 index 997732a..0000000 Binary files a/nladmin-ui/src/assets/images/avatar1.png and /dev/null differ diff --git a/nladmin-ui/src/assets/images/avatar2.png b/nladmin-ui/src/assets/images/avatar2.png deleted file mode 100644 index a1660d5..0000000 Binary files a/nladmin-ui/src/assets/images/avatar2.png and /dev/null differ diff --git a/nladmin-ui/src/assets/images/background11.jpg b/nladmin-ui/src/assets/images/background11.jpg deleted file mode 100644 index 471a65c..0000000 Binary files a/nladmin-ui/src/assets/images/background11.jpg and /dev/null differ diff --git a/nladmin-ui/src/assets/images/background1111.jpg b/nladmin-ui/src/assets/images/background1111.jpg deleted file mode 100644 index 62d024d..0000000 Binary files a/nladmin-ui/src/assets/images/background1111.jpg and /dev/null differ diff --git a/nladmin-ui/src/assets/images/background2.jpg b/nladmin-ui/src/assets/images/background2.jpg deleted file mode 100644 index 69e6348..0000000 Binary files a/nladmin-ui/src/assets/images/background2.jpg and /dev/null differ diff --git a/nladmin-ui/src/assets/images/background3.jpg b/nladmin-ui/src/assets/images/background3.jpg deleted file mode 100644 index 5424ccd..0000000 Binary files a/nladmin-ui/src/assets/images/background3.jpg and /dev/null differ diff --git a/nladmin-ui/src/assets/images/login-background.jpg b/nladmin-ui/src/assets/images/login-background.jpg deleted file mode 100644 index 8a89eb8..0000000 Binary files a/nladmin-ui/src/assets/images/login-background.jpg and /dev/null differ diff --git a/nladmin-ui/src/assets/images/profile.jpg b/nladmin-ui/src/assets/images/profile.jpg deleted file mode 100644 index b3a940b..0000000 Binary files a/nladmin-ui/src/assets/images/profile.jpg and /dev/null differ diff --git a/nladmin-ui/src/assets/styles/eladmin.scss b/nladmin-ui/src/assets/styles/eladmin.scss index 57a62e5..9eed7c5 100644 --- a/nladmin-ui/src/assets/styles/eladmin.scss +++ b/nladmin-ui/src/assets/styles/eladmin.scss @@ -1,5 +1,8 @@ .head-container { - padding-bottom: 10px; + padding-top: 4px; + padding-bottom: 6px; + background-color: #ffffff; + border-radius: 4px; .filter-item { display: inline-block; @@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button { .el-table__fixed-header-wrapper { th { word-break: break-word; - background-color: #f8f8f9; + background-color: #f5f5f5; color: #515a6e; height: 35px; font-size: 13px; @@ -215,4 +218,13 @@ input[type="number"]::-webkit-outer-spin-button { .el-table--scrollable-y .el-table__body-wrapper { overflow-y: overlay !important; } +//左侧边框不显示start https://blog.csdn.net/m0_37922443/article/details/126487240 +.el-table__row td:not(.is-hidden):last-child { + right: -1px; +} + +thead th:not(.is-hidden):last-child { + right: -1px; +} +//左侧边框不显示end diff --git a/nladmin-ui/src/assets/styles/index.scss b/nladmin-ui/src/assets/styles/index.scss index 21fbda1..237be11 100644 --- a/nladmin-ui/src/assets/styles/index.scss +++ b/nladmin-ui/src/assets/styles/index.scss @@ -21,6 +21,7 @@ label { html { height: 100%; box-sizing: border-box; + //background-color: #eeeeee; } #app { @@ -98,7 +99,7 @@ div:focus { } aside { - background: #eef1f6; + background: #d40c70; padding: 8px 24px; margin-bottom: 20px; border-radius: 2px; @@ -122,7 +123,7 @@ aside { //main-container全局样式 .app-container { - padding: 20px 20px 45px 20px; + padding: 10px 20px 45px 10px; } .components-container { diff --git a/nladmin-ui/src/assets/styles/variables.scss b/nladmin-ui/src/assets/styles/variables.scss index 384517b..1d1c7bf 100644 --- a/nladmin-ui/src/assets/styles/variables.scss +++ b/nladmin-ui/src/assets/styles/variables.scss @@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529; $base-menu-light-background:#ffffff; // sidebar -$menuText:#bfcbd9; +$menuText: #ffffff; $menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 +$subMenuActiveText: #ffffff; // https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773 -$menuHover:#263445; +$menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773 +$menuHover:#4e5465; $base-menu-light-color:rgba(0,0,0,.70); -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg:#000c17; +$subMenuHover:#4e5465; $sideBarWidth: 205px; @@ -45,4 +45,4 @@ $sideBarWidth: 205px; logoLightTitleColor: $base-logo-light-title-color } -$base-sidebar-width: 200px; +$base-sidebar-width: 2010px;