diff --git a/web-admin/src/views/public/duty/index.vue b/web-admin/src/views/public/duty/index.vue index 5ae1e5f86..7ec8c462d 100644 --- a/web-admin/src/views/public/duty/index.vue +++ b/web-admin/src/views/public/duty/index.vue @@ -6,12 +6,17 @@

链接无效或已失效

请确认是否复制完整,或向管理员重新索取当日值班链接。

-
+
⊘

报名已关闭

管理员已关闭本链接,暂时无法继续抢班。

-
日期{{ page.dutyDate }}
+
日期{{ page.dutyDate }}
@@ -25,9 +30,15 @@

已抢到{{ success.shiftLabel }}

{{ success.dutyDate }}

-
日期{{ success.dutyDate }}
-
班次{{ success.shiftLabel }}
-
姓名{{ success.personName }}
+
日期{{ success.dutyDate }}
+
班次{{ success.shiftLabel }}
+
姓名{{ success.personName }}
@@ -48,7 +59,7 @@
- + {{ slot.shiftLabel || slot.shiftType }}
@@ -59,12 +70,20 @@ 名额 {{ slot.taken }} / {{ slot.capacity }}
-

- 工作安排:{{ slot.remark }} +

+ 值班时间:{{ slot.timeLabel }}

-
+

+ 工作安排:{{ slot.workPlanLabels.join('、') }} +

+

备注:{{ slot.remark }}

+
+ +
- {{ a.personName }} + {{ + a.personName + }} 暂无人报名 空缺 {{ slot.capacity - slot.taken }} @@ -102,7 +121,9 @@
- + @@ -142,6 +163,13 @@ return (slot.taken || 0) >= (slot.capacity || 0) } + function dotClass(shiftType: string) { + if (shiftType === 'morning' || shiftType === 'evening' || shiftType === 'duty') { + return shiftType + } + return 'other' + } + function barWidth(slot: PublicDutySlot) { if (!slot.capacity) return '0%' return `${Math.min(100, Math.round((slot.taken / slot.capacity) * 100))}%` @@ -353,6 +381,9 @@ .dot.duty { background: #d14343; } + .dot.other { + background: #6b7b74; + } .badge { padding: 3px 8px; font-size: 11px; @@ -379,7 +410,9 @@ font-size: 15px; color: #1f2a26; } - .slot-remark { + .slot-time, + .slot-remark, + .slot-note { margin: 8px 0 0; font-size: 13px; line-height: 1.45; @@ -387,10 +420,14 @@ white-space: pre-wrap; word-break: break-word; } + .slot-time strong, .slot-remark strong { font-weight: 600; color: #1f2a26; } + .slot-note { + color: #8a9a93; + } .bar { height: 7px; margin-top: 8px; @@ -413,6 +450,9 @@ .bar > i.duty { background: #d14343; } + .bar > i.other { + background: #6b7b74; + } .people { display: flex; flex-wrap: wrap;