From faf1a79a29d8efd09fb151ca6d712fb22c335206 Mon Sep 17 00:00:00 2001 From: renshen <1005457301@qq.com> Date: Thu, 5 Nov 2026 21:51:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=A3=E5=88=86=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BC=B9=E7=AA=97=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/other/log-statistics.blade.php | 118 +++++++++++++++--- tests/Feature/Business/PagesTest.php | 3 +- 2 files changed, 100 insertions(+), 21 deletions(-) diff --git a/resources/views/business/pages/other/log-statistics.blade.php b/resources/views/business/pages/other/log-statistics.blade.php index 9b17ac80..7ce9532b 100644 --- a/resources/views/business/pages/other/log-statistics.blade.php +++ b/resources/views/business/pages/other/log-statistics.blade.php @@ -154,7 +154,10 @@ } .log-statistics-card.is-link { + width: 100%; color: inherit; + font: inherit; + text-align: left; text-decoration: none; transition: border-color 150ms ease, background 150ms ease; } @@ -188,6 +191,66 @@ font-weight: 600; } + .log-statistics-dialog { + width: min(72rem, calc(100vw - 2rem)); + max-height: calc(100vh - 4rem); + padding: 0; + overflow: hidden; + border: 1px solid var(--vip-border, #D8D2C7); + border-radius: 12px; + background: var(--vip-surface, #fff); + color: var(--vip-content-ink, #171717); + box-shadow: 0 16px 40px rgba(23, 23, 23, 0.2); + } + + .log-statistics-dialog:not([open]) { + display: none; + } + + .log-statistics-dialog::backdrop { + background: rgba(23, 23, 23, 0.42); + } + + .log-statistics-dialog__head { + display: flex; + align-items: flex-start; + justify-content: space-between; + gap: 1rem; + padding: 0.9rem 1rem; + border-bottom: 1px solid var(--vip-border, #D8D2C7); + background: var(--vip-content-accent-soft, #F7F0DE); + } + + .log-statistics-dialog__head strong { + display: block; + font-size: 0.82rem; + font-weight: 600; + } + + .log-statistics-dialog__head span { + display: block; + margin-top: 0.2rem; + color: var(--vip-content-muted, #595959); + font-size: 0.6875rem; + } + + .log-statistics-dialog__close { + min-height: 1.8rem; + padding: 0 0.65rem; + border: 1px solid var(--vip-border, #D8D2C7); + border-radius: 5px; + background: var(--vip-surface, #fff); + color: var(--vip-content-accent-dark, #856632); + font: inherit; + font-size: 0.6875rem; + font-weight: 600; + cursor: pointer; + } + + .log-statistics-dialog .log-statistics-table-wrap { + max-height: min(60vh, 32rem); + } + .log-statistics-panel { overflow: hidden; border: 1px solid var(--vip-border, #D8D2C7); @@ -380,11 +443,12 @@ @endphp
@if ($hasWorklogPenalty) - + @else
{{ $worklogPenalty['start_date'] ?: '2026-11-04' }} 起扣分合计 @@ -514,16 +578,20 @@ @endif @if ($hasWorklogPenalty) -
-
- 日志漏写扣分统计 - + +
+
+ 日志漏写扣分统计 + @if ($worklogPenalty['start_date']) {{ $worklogPenalty['start_date'] }} 至 {{ $worklogPenalty['end_date'] }} · 合计 {{ $worklogPenalty['total_points_formatted'] }} 分 @else 暂无已截止统计日 @endif - + +
+
@if ($worklogPenaltyError)
{{ $worklogPenaltyError }}
@@ -553,26 +621,36 @@
@endif -
+ @endif diff --git a/tests/Feature/Business/PagesTest.php b/tests/Feature/Business/PagesTest.php index 9405a5e7..071a828d 100644 --- a/tests/Feature/Business/PagesTest.php +++ b/tests/Feature/Business/PagesTest.php @@ -179,7 +179,8 @@ class PagesTest extends FeatureTestCase ->assertSeeText('点击查看提交人') ->assertSeeText('点击查看日志明细') ->assertDontSeeText('点击查看每日统计') - ->assertSee('data-worklog-jump="worklog-penalty"', false) + ->assertSee('data-worklog-penalty-open', false) + ->assertSee('id="worklog-penalty-dialog"', false) ->assertSee('data-worklog-penalty', false) ->assertSeeText('2026-11-04 起扣分合计') ->assertSeeText('第 1 次漏写扣 10 分')