diff --git a/src/assets/images/dialog-title-icon.png b/src/assets/images/dialog-title-icon.png
new file mode 100644
index 0000000..68850f9
Binary files /dev/null and b/src/assets/images/dialog-title-icon.png differ
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 88632c4..98ebf71 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -93,6 +93,7 @@
background: transparent;
border: 1px solid transparent;
border-bottom: none;
+ font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif !important;
font-size: 14px;
&::before,
@@ -107,10 +108,11 @@
word-break: break-word;
background-color: #012773 !important;
color: #ffffff !important;
+ font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif !important;
font-size: 16px !important;
letter-spacing: 0 !important;
line-height: 16px !important;
- font-weight: 600 !important;
+ font-weight: 700 !important;
}
}
@@ -208,6 +210,15 @@ table thead th {
font-weight: inherit !important;
}
+// Keep every Element table on the same PingFang typography and bold header.
+.el-table th.el-table__cell,
+.el-table th.el-table__cell > .cell,
+.el-table .el-table__fixed-header-wrapper th.el-table__cell,
+.el-table .el-table__fixed-header-wrapper th.el-table__cell > .cell {
+ font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif !important;
+ font-weight: 700 !important;
+}
+
// Unified body-cell typography for every Element table.
.el-table tbody td.el-table__cell,
.el-table .el-table__fixed-body-wrapper td.el-table__cell {
@@ -681,30 +692,64 @@ table tbody tr > td {
.el-dialog {
overflow: hidden;
color: #dcecff;
- background-color: #0F124A !important;
- border: 1px solid #0B2567;
+ background-color: #0b205b !important;
+ border: 1px solid #3f7fd8;
border-radius: 2px;
box-shadow: 0 0 18px rgba(0, 0, 0, 0.45);
}
-.el-dialog__header,
+.el-dialog__header {
+ height: 32px;
+ box-sizing: border-box;
+ padding: 5px 48px 4px 20px;
+ line-height: 22px;
+ background: linear-gradient(180deg, #1c4695 0%, #102b70 100%) !important;
+ border-bottom: 1px solid #3f7fd8;
+}
+
.el-dialog__body,
.el-dialog__footer {
color: #dcecff;
- background-color: #0F124A !important;
-}
-
-.el-dialog__header {
- border-bottom: 1px solid #0B2567;
+ background-color: #0b205b !important;
}
.el-dialog__footer {
- border-top: 1px solid #0B2567;
+ border-top: 1px solid #234d9c;
}
.el-dialog__title,
.el-dialog__headerbtn .el-dialog__close {
- color: #ffffff;
+ color: #54ffff;
+}
+
+.el-dialog__title {
+ display: inline-flex;
+ align-items: center;
+ gap: 7px;
+ line-height: 22px;
+ font-size: 16px;
+ font-weight: 700;
+}
+
+.el-dialog__headerbtn {
+ top: 5px;
+ right: 14px;
+ width: 22px;
+ height: 22px;
+ line-height: 22px;
+}
+
+.el-dialog__title::before {
+ content: "";
+ display: inline-block;
+ width: 18px;
+ height: 13px;
+ flex: 0 0 18px;
+ background: url("~@/assets/images/dialog-title-icon.png") center / contain no-repeat;
+}
+
+.el-dialog__headerbtn .el-dialog__close:hover {
+ color: #8fffff;
}
.v-modal {
@@ -721,8 +766,8 @@ table tbody tr > td {
.el-autocomplete-suggestion,
.el-tooltip__popper.is-dark {
color: #dcecff;
- background-color: #0F124A !important;
- border-color: #0B2567 !important;
+ background-color: #0b205b !important;
+ border-color: #3f7fd8 !important;
}
.el-message-box__title,
@@ -737,6 +782,47 @@ table tbody tr > td {
color: #dcecff;
}
+.el-message-box__title {
+ display: flex;
+ align-items: center;
+ gap: 7px;
+ color: #54ffff;
+}
+
+.el-message-box__header {
+ height: 32px;
+ box-sizing: border-box;
+ padding: 5px 48px 4px 20px;
+ line-height: 22px;
+ background: linear-gradient(180deg, #1c4695 0%, #102b70 100%);
+ border-bottom: 1px solid #3f7fd8;
+}
+
+.el-message-box__headerbtn .el-message-box__close {
+ color: #54ffff;
+}
+
+.el-message-box__headerbtn {
+ top: 5px;
+ right: 14px;
+ width: 22px;
+ height: 22px;
+ line-height: 22px;
+}
+
+.el-message-box__headerbtn .el-message-box__close:hover {
+ color: #8fffff;
+}
+
+.el-message-box__title::before {
+ content: "";
+ display: inline-block;
+ width: 18px;
+ height: 13px;
+ flex: 0 0 18px;
+ background: url("~@/assets/images/dialog-title-icon.png") center / contain no-repeat;
+}
+
.el-dropdown-menu__item:hover,
.el-dropdown-menu__item:focus,
.el-select-dropdown__item.hover,
@@ -1122,6 +1208,27 @@ body .task-toolbar-btn:not(:has(.el-icon-search)) {
color: #43c0ff !important;
}
+/* Table operation buttons use the same treatment as the reset button. */
+body .el-table .el-button {
+ border: 1px solid transparent !important;
+ background: linear-gradient(#01016b, #01016b) padding-box,
+ linear-gradient(135deg, #3988ff, #0351c6) border-box !important;
+ background-image: linear-gradient(#01016b, #01016b) padding-box,
+ linear-gradient(135deg, #3988ff, #0351c6) border-box !important;
+ color: #43c0ff !important;
+}
+
+body .el-table .el-button:hover,
+body .el-table .el-button:focus,
+body .el-table .el-button:active {
+ border: 1px solid transparent !important;
+ background: linear-gradient(#01016b, #01016b) padding-box,
+ linear-gradient(135deg, #3988ff, #0351c6) border-box !important;
+ background-image: linear-gradient(#01016b, #01016b) padding-box,
+ linear-gradient(135deg, #3988ff, #0351c6) border-box !important;
+ color: #43c0ff !important;
+}
+
body .el-button.el-button--primary:not(:has(.el-icon-search)):hover,
body .el-button.el-button--primary:not(:has(.el-icon-search)):focus,
body .el-button.el-button--primary:not(:has(.el-icon-search)):active,
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index b178a96..63384f2 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -102,7 +102,7 @@ export default {
}
} else if(!this.$route.children) {
activePath = path;
- this.$store.dispatch('app/toggleSideBarHide', true);
+ this.$store.dispatch('app/toggleSideBarHide', false);
}
this.activeRoutes(activePath);
return activePath;
@@ -139,7 +139,7 @@ export default {
} else {
this.$router.push({ path: key });
}
- this.$store.dispatch('app/toggleSideBarHide', true);
+ this.$store.dispatch('app/toggleSideBarHide', false);
} else {
// 显示左侧联动菜单
this.activeRoutes(key);
@@ -168,19 +168,19 @@ export default {
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 1fbf1f2..3d6199f 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,7 +1,8 @@