diff --git a/backend/src/views/analytics/users/index.vue b/backend/src/views/analytics/users/index.vue index 6a61784..3a3c028 100644 --- a/backend/src/views/analytics/users/index.vue +++ b/backend/src/views/analytics/users/index.vue @@ -185,6 +185,13 @@ onUnmounted(() => { width: 100%; } } + + // 暗色主题:卡片数字用纯白(默认 --el-text-color-primary 在暗色下是偏蓝灰的 #E5EAF3) + html.dark & { + .data-overview .data-card .card-content .text-box .value { + color: #fff; + } + } } // 深度修改 Element Plus 卡片头部样式 diff --git a/backend/src/views/apps/oa/dashboard/index.vue b/backend/src/views/apps/oa/dashboard/index.vue index f735173..16f18f4 100644 --- a/backend/src/views/apps/oa/dashboard/index.vue +++ b/backend/src/views/apps/oa/dashboard/index.vue @@ -46,12 +46,12 @@
{{ item.label }}
¥ - {{ money(item.data.total) }} + {{ money(item.data.paid) }}
{{ item.data.count }} 单 - 已报销 ¥ {{ money(item.data.paid) }} 未报销 ¥ {{ money(item.data.unpaid) }} + 报销总额 ¥ {{ money(item.data.total) }}
@@ -1286,7 +1286,7 @@ html.dark & { .stat-amount { .currency, .number { - color: var(--el-text-color-primary); + color: #fff; } } @@ -1304,6 +1304,11 @@ html.dark & { color: var(--el-text-color-secondary); } + // 待办数字 0/5/10 在 base 写死了 #303133,暗色下漏写导致看不清 + .todo-stat-value { + color: #fff; + } + .todo-stat-sub { color: var(--el-text-color-placeholder); } diff --git a/backend/src/views/apps/oa/document/documentgraph/index.vue b/backend/src/views/apps/oa/document/documentgraph/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/backend/src/views/apps/oa/document/documentlibrary/components/index.vue b/backend/src/views/apps/oa/document/documentlibrary/components/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/backend/src/views/home/index.vue b/backend/src/views/home/index.vue index 24c2902..0fca01d 100644 --- a/backend/src/views/home/index.vue +++ b/backend/src/views/home/index.vue @@ -366,6 +366,8 @@ onMounted(() => { .home-container { min-height: 100vh; padding: 0; + display: flex; + flex-direction: column; .home-top { background: #fff; @@ -472,6 +474,8 @@ onMounted(() => { } .home-wrapper { + flex: 1 0 auto; + width: 100%; max-width: 1400px; margin: 0 auto; padding: 40px 24px; @@ -672,10 +676,14 @@ onMounted(() => { } .home-footer { + flex: 0 0 auto; + margin-top: auto; + width: 100%; border-top: 1px solid #ebeef5; padding: 18px 24px 28px; text-align: center; color: #909399; + background: transparent; .copyright { font-size: 13px; diff --git a/go/controllers/backend_reimburse.go b/go/controllers/backend_reimburse.go index 7763150..e6c3760 100644 --- a/go/controllers/backend_reimburse.go +++ b/go/controllers/backend_reimburse.go @@ -1211,16 +1211,19 @@ func (c *BackendReimburseController) Dashboard() { for i := range rows { row := &rows[i] - if inRange(row.ApplyDate, weekStart, tomorrow) { + // 按报销单「创建日期」归期(周/月/年 + 趋势)。 + // 申请日期 apply_date 允许回填为历史日期,用它会导致本月/本周漏统计。 + created := row.CreateTime + if inRange(created, weekStart, tomorrow) { addTo(weekStat, row) } - if inRange(row.ApplyDate, monthStart, tomorrow) { + if inRange(created, monthStart, tomorrow) { addTo(monthStat, row) } - if !row.ApplyDate.Before(yearStart) { + if inRange(created, yearStart, tomorrow) { addTo(yearStat, row) } - if st, ok := monthStats[row.ApplyDate.Format("2006-01")]; ok { + if st, ok := monthStats[created.Format("2006-01")]; ok { addTo(st, row) } sk := strconv.Itoa(int(row.Status)) diff --git a/platform/src/views/basicSettings/tenants/index.vue b/platform/src/views/basicSettings/tenants/index.vue index 616cdd0..2a23d37 100644 --- a/platform/src/views/basicSettings/tenants/index.vue +++ b/platform/src/views/basicSettings/tenants/index.vue @@ -284,11 +284,13 @@ onMounted(() => { } } +// 用 Element Plus 变量,亮色下 #f5f7fa、暗色下 #0a0a0a,自动随主题切换 .search-form { - background: #f9f9f9; + background: var(--el-bg-color-page, #f5f7fa); padding: 20px 20px 0 20px; border-radius: 4px; margin-bottom: 20px; + transition: background-color 0.3s; } .action-icons { @@ -296,4 +298,48 @@ onMounted(() => { align-items: center; gap: 6px; } + +// ===== 暗色主题适配 ===== +// 嵌套在根元素 .container-box 内,& 才有真实父选择器 +.container-box { + html.dark & { + .header-bar h2 { + color: var(--el-text-color-primary); + } + + // 暗色主题里 -light-3/-light-5 反而更暗,必须用 -dark-2(更亮的蓝) + .name-link { + color: var(--el-color-primary-dark-2); + + &:hover { + color: #a5c8ff; + } + } + + :deep(.el-divider) { + border-color: var(--el-border-color-light); + } + + :deep(.el-table) { + --el-table-border-color: var(--el-border-color-lighter); + --el-table-header-text-color: var(--el-text-color-secondary); + background-color: transparent; + } + + :deep(.el-table__inner-wrapper), + :deep(.el-table tr), + :deep(.el-table td.el-table__cell) { + background-color: transparent; + } + + :deep(.el-form-item__label) { + color: var(--el-text-color-regular); + } + + :deep(.el-pagination) { + --el-pagination-text-color: var(--el-text-color-regular); + --el-pagination-button-bg-color: transparent; + } + } +} diff --git a/platform/src/views/home/index.vue b/platform/src/views/home/index.vue index 4a94124..ab2119a 100644 --- a/platform/src/views/home/index.vue +++ b/platform/src/views/home/index.vue @@ -405,6 +405,13 @@ onUnmounted(() => { height: 340px; } } + + // 暗色主题:卡片数字用纯白(默认 --el-text-color-primary 在暗色下是偏蓝灰的 #E5EAF3) + html.dark & { + .data-overview .data-card .card-content .text-box .value { + color: #fff; + } + } } @media (max-width: 768px) {