diff --git a/schoolNewsServ/.bin/mysql/sql/initConfigData.sql b/schoolNewsServ/.bin/mysql/sql/initConfigData.sql index 7ec3313..204a498 100644 --- a/schoolNewsServ/.bin/mysql/sql/initConfigData.sql +++ b/schoolNewsServ/.bin/mysql/sql/initConfigData.sql @@ -24,10 +24,10 @@ INSERT INTO `tb_sys_config` (`id`, `config_key`, `config_name`, `config_value`, -- 基础配置(Logo、系统信息) ('100', 'system.name', '系统名称', '红色思政学习平台', 'string', 'input', '基础配置', '系统显示名称', '请输入系统名称', '系统对外显示的名称', NULL, NULL, NULL, NULL, NULL, 100, 1, '1', now()), ('101', 'system.shortName', '系统简称', '思政平台', 'string', 'input', '基础配置', '系统简称', '请输入系统简称', '系统的简短名称', NULL, NULL, NULL, NULL, NULL, 101, 1, '1', now()), -('102', 'system.logo.login', '登录页Logo', '', 'string', 'imgupload', '基础配置', '登录页Logo', NULL, '存储文件ID,建议尺寸:120x120px', NULL, NULL, NULL, NULL, NULL, 102, 1, '1', now()), -('103', 'system.logo.home', '首页Logo', '', 'string', 'imgupload', '基础配置', '首页Logo', NULL, '存储文件ID,建议尺寸:120x40px', NULL, NULL, NULL, NULL, NULL, 103, 1, '1', now()), -('104', 'system.logo.admin', '管理后台Logo', '', 'string', 'imgupload', '基础配置', '管理后台Logo', NULL, '存储文件ID,建议尺寸:40x40px', NULL, NULL, NULL, NULL, NULL, 104, 1, '1', now()), -('105', 'system.favicon', '网站图标', '', 'string', 'imgupload', '基础配置', '网站图标', NULL, '存储文件ID,建议格式:ico/png,尺寸:32x32px', NULL, NULL, NULL, NULL, NULL, 105, 1, '1', now()), +('102', 'system.logo.login', '登录页Logo', '', 'string', 'imgupload', '基础配置', '登录页Logo', NULL, '存储文件ID,建议尺寸:36x36px', NULL, NULL, NULL, NULL, NULL, 102, 1, '1', now()), +('103', 'system.logo.home', '首页Logo', '', 'string', 'imgupload', '基础配置', '首页Logo', NULL, '存储文件ID,建议尺寸:36x36px', NULL, NULL, NULL, NULL, NULL, 103, 1, '1', now()), +('104', 'system.logo.admin', '管理后台Logo', '', 'string', 'imgupload', '基础配置', '管理后台Logo', NULL, '存储文件ID,建议尺寸:36x36px', NULL, NULL, NULL, NULL, NULL, 104, 1, '1', now()), +('105', 'system.favicon', '网站图标', '', 'string', 'imgupload', '基础配置', '网站图标', NULL, '存储文件ID,建议格式:ico/png,尺寸:36x36px', NULL, NULL, NULL, NULL, NULL, 105, 1, '1', now()), -- 邮件配置 ('40', 'email.login.enabled', '启用邮箱登录', 'false', 'boolean', 'switch', '邮件配置', '是否启用邮箱登录', NULL, '关闭后登录页将不显示邮箱登录选项', NULL, NULL, NULL, NULL, NULL, 40, 1, '1', now()), diff --git a/schoolNewsWeb/src/assets/styles/common.scss b/schoolNewsWeb/src/assets/styles/common.scss index 63178d8..0690696 100644 --- a/schoolNewsWeb/src/assets/styles/common.scss +++ b/schoolNewsWeb/src/assets/styles/common.scss @@ -5,6 +5,52 @@ * @figma https://www.figma.com/design/4aM0yqyoAjtW2jTZcqPAtN */ +// ============ Element Plus 主题色覆盖 ============ +:root { + --el-color-primary: #C62828; + --el-color-primary-light-3: rgba(198, 40, 40, 0.7); + --el-color-primary-light-5: rgba(198, 40, 40, 0.5); + --el-color-primary-light-7: rgba(198, 40, 40, 0.3); + --el-color-primary-light-8: rgba(198, 40, 40, 0.2); + --el-color-primary-light-9: rgba(198, 40, 40, 0.1); + --el-color-primary-dark-2: #B71C1C; +} + +// small按钮保持默认蓝色(不包括link样式) +.el-button--primary.el-button--small:not(.is-link) { + background-color: #409eff !important; + border-color: #409eff !important; + color: #ffffff !important; + transition: all 0.2s; + + &:hover, + &:focus { + background-color: #66b1ff !important; + border-color: #66b1ff !important; + color: #ffffff !important; + } + + &:active { + background-color: #3a8ee6 !important; + border-color: #3a8ee6 !important; + color: #ffffff !important; + } +} + +// link按钮保持蓝色 +.el-button--primary.is-link { + color: #409eff !important; + + &:hover, + &:focus { + color: #66b1ff !important; + } + + &:active { + color: #3a8ee6 !important; + } +} + // ============ 字体声明 ============ @font-face { font-family: 'Source Han Sans SC'; @@ -249,7 +295,7 @@ $spacing-xxl: 24px; border-radius: $border-radius-large; // Element Plus 分页组件自定义样式 - :deep(.el-pagination) { + .el-pagination { display: flex; align-items: center; gap: $spacing-sm; @@ -271,29 +317,37 @@ $spacing-xxl: 24px; .el-select { .el-select__wrapper { - background: $color-bg-secondary; - border: none; - border-radius: $border-radius-small; - padding: $spacing-xs $spacing-md; + background: $color-bg-white; + border: 1px solid #E5E6EB; + border-radius: 4px; + padding: 4px 8px; min-height: 32px; box-shadow: none; + transition: all 0.2s; .el-select__selected-item { - font-family: $font-family-cn; - font-size: $font-size-base; + font-family: $font-family-en; + font-size: 13px; font-weight: 400; - line-height: $line-height-base; + line-height: 22px; color: $color-text-primary; } .el-select__suffix { .el-icon { color: $color-text-secondary; + font-size: 14px; } } &:hover { - background: darken($color-bg-secondary, 3%); + border-color: #C62828; + background: $color-bg-white; + } + + &.is-focused { + border-color: #C62828; + box-shadow: 0 0 0 2px rgba(198, 40, 40, 0.1); } } } @@ -315,10 +369,10 @@ $spacing-xxl: 24px; } &:hover:not(:disabled) { - background: rgba($color-primary, 0.08); + background: rgba(#C62828, 0.08); .el-icon { - color: $color-primary; + color: #C62828; } } @@ -339,8 +393,8 @@ $spacing-xxl: 24px; gap: $spacing-xs; li { - background: transparent; - border: none; + background: transparent !important; + border: none !important; border-radius: $border-radius-small; padding: $spacing-xs; min-width: 32px; @@ -349,32 +403,32 @@ $spacing-xxl: 24px; font-family: $font-family-en; font-size: $font-size-base; font-weight: 600; - color: $color-text-secondary; + color: $color-text-secondary !important; text-align: center; margin: 0; &:hover:not(.is-active):not(.is-disabled) { - background: rgba($color-primary, 0.08); - color: $color-primary; + background: rgba(#C62828, 0.08) !important; + color: #C62828 !important; } &.is-active { - background: $color-primary; - color: $color-bg-white; + background: #C62828 !important; + color: #FFFFFF !important; } &.is-disabled { - color: $color-text-disabled; + color: $color-text-disabled !important; cursor: not-allowed; } // 更多页省略号 &.more { - background: transparent; - color: $color-text-secondary; + background: transparent !important; + color: $color-text-secondary !important; &:hover { - color: $color-primary; + color: #C62828 !important; } } } @@ -399,17 +453,17 @@ $spacing-xxl: 24px; .el-input__inner { font-family: $font-family-en; font-size: $font-size-base; - font-weight: 600; + font-weight: 400; color: $color-text-primary; text-align: center; } &:hover { - border-color: $color-primary; + border-color: #C62828; } &.is-focus { - border-color: $color-primary; + border-color: #C62828; box-shadow: none; } } diff --git a/schoolNewsWeb/src/components/base/ChangeHome.vue b/schoolNewsWeb/src/components/base/ChangeHome.vue index 4898784..1158c90 100644 --- a/schoolNewsWeb/src/components/base/ChangeHome.vue +++ b/schoolNewsWeb/src/components/base/ChangeHome.vue @@ -31,4 +31,10 @@ function changeHome(){ \ No newline at end of file diff --git a/schoolNewsWeb/src/components/base/TopNavigation.vue b/schoolNewsWeb/src/components/base/TopNavigation.vue index 65be357..b4f7a93 100644 --- a/schoolNewsWeb/src/components/base/TopNavigation.vue +++ b/schoolNewsWeb/src/components/base/TopNavigation.vue @@ -3,8 +3,8 @@
@@ -361,11 +361,6 @@ onMounted(() => { border-radius: 8px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); - //.pagination-container { - // display: flex; - // justify-content: center; - // margin-top: 20px; - // } } .dialog-footer { diff --git a/schoolNewsWeb/src/views/admin/manage/crontab/SystemTaskView.vue b/schoolNewsWeb/src/views/admin/manage/crontab/SystemTaskView.vue index ae429e1..b29938f 100644 --- a/schoolNewsWeb/src/views/admin/manage/crontab/SystemTaskView.vue +++ b/schoolNewsWeb/src/views/admin/manage/crontab/SystemTaskView.vue @@ -753,12 +753,6 @@ onMounted(() => { } } - .pagination-container { - margin-top: 20px; - display: flex; - justify-content: flex-end; - } - .cron-examples { div { padding: 6px 0; diff --git a/schoolNewsWeb/src/views/admin/manage/logs/SystemLogsView.vue b/schoolNewsWeb/src/views/admin/manage/logs/SystemLogsView.vue index f971a38..0971b9d 100644 --- a/schoolNewsWeb/src/views/admin/manage/logs/SystemLogsView.vue +++ b/schoolNewsWeb/src/views/admin/manage/logs/SystemLogsView.vue @@ -526,11 +526,6 @@ function handleSizeChange(size: number) { // el-table和el-button会自动处理样式和交互 -.pagination-container { - display: flex; - justify-content: center; - margin-top: 20px; -} diff --git a/schoolNewsWeb/src/views/admin/manage/message/MessageManageView.vue b/schoolNewsWeb/src/views/admin/manage/message/MessageManageView.vue index dcc5662..ba9211f 100644 --- a/schoolNewsWeb/src/views/admin/manage/message/MessageManageView.vue +++ b/schoolNewsWeb/src/views/admin/manage/message/MessageManageView.vue @@ -200,16 +200,18 @@ -