+
{todo.flag && (
-
+
)}
-
+
+ {todo.request && (
+
+ ({todo.request})
+
+ )}
{todo.title || '제목 없음'}
-
+
{todo.remark}
-
+
{getPriorityText(todo.seqno)}
@@ -595,6 +611,29 @@ export function Dashboard() {
)}
+ {allUrgentTodos.length > 6 && (
+
+
+ {(todoPage - 1) * 6 + 1}-{Math.min(todoPage * 6, allUrgentTodos.length)} / {allUrgentTodos.length}건
+
+
+
+
+
+
+ )}
{/* NR 모달 */}
diff --git a/Project/frontend/src/pages/Jobreport.tsx b/Project/frontend/src/pages/Jobreport.tsx
index 43a43be..691bace 100644
--- a/Project/frontend/src/pages/Jobreport.tsx
+++ b/Project/frontend/src/pages/Jobreport.tsx
@@ -207,8 +207,8 @@ export function Jobreport() {
ot: 0, // OT 초기화
otStart: data.otStart ? data.otStart.substring(11, 16) : '18:00',
otEnd: data.otEnd ? data.otEnd.substring(11, 16) : '20:00',
- jobgrp: '',
- tag: '',
+ jobgrp: data.jobgrp || '',
+ tag: data.tag || '',
});
setShowModal(true);
}
@@ -413,28 +413,28 @@ export function Jobreport() {