diff --git a/web-ui/components/sidebar-nav.html b/web-ui/components/sidebar-nav.html index bad083f..3d2221f 100644 --- a/web-ui/components/sidebar-nav.html +++ b/web-ui/components/sidebar-nav.html @@ -307,14 +307,20 @@ /* 메인 콘텐츠 여백 */ body.has-sidebar .dashboard-container, body.has-sidebar .main-content, -body.has-sidebar .page-container { +body.has-sidebar .page-container, +body.has-sidebar .work-report-container, +body.has-sidebar .analysis-container, +body.has-sidebar > .dashboard-main { margin-left: 260px; transition: margin-left 0.3s ease; } body.has-sidebar.sidebar-collapsed .dashboard-container, body.has-sidebar.sidebar-collapsed .main-content, -body.has-sidebar.sidebar-collapsed .page-container { +body.has-sidebar.sidebar-collapsed .page-container, +body.has-sidebar.sidebar-collapsed .work-report-container, +body.has-sidebar.sidebar-collapsed .analysis-container, +body.has-sidebar.sidebar-collapsed > .dashboard-main { margin-left: 60px; } @@ -330,7 +336,10 @@ body.has-sidebar.sidebar-collapsed .page-container { body.has-sidebar .dashboard-container, body.has-sidebar .main-content, - body.has-sidebar .page-container { + body.has-sidebar .page-container, + body.has-sidebar .work-report-container, + body.has-sidebar .analysis-container, + body.has-sidebar > .dashboard-main { margin-left: 0; } } diff --git a/web-ui/pages/admin/accounts.html b/web-ui/pages/admin/accounts.html index 9b8189d..3b6b799 100644 --- a/web-ui/pages/admin/accounts.html +++ b/web-ui/pages/admin/accounts.html @@ -20,10 +20,7 @@
@@ -31,21 +28,15 @@
-

- 👥 - 사용자 계정 관리 -

- +

사용자 계정 관리

+
@@ -74,7 +65,6 @@
@@ -158,7 +148,7 @@
@@ -184,7 +177,8 @@ - + + diff --git a/web-ui/pages/admin/codes.html b/web-ui/pages/admin/codes.html index 4fda212..963d2cf 100644 --- a/web-ui/pages/admin/codes.html +++ b/web-ui/pages/admin/codes.html @@ -14,127 +14,43 @@ - +
- - -
- - - + + +
-

- 📊 - 작업 상태 유형 관리 -

+

작업 상태 유형 관리

- +
- +
- - 📊 - 총 0개 - - - - 정상 0개 - - - - 오류 0개 - + 0 + 정상 0 + 오류 0
@@ -147,39 +63,18 @@
-

- ⚠️ - 오류 유형 관리 -

+

오류 유형 관리

- +
- +
- - ⚠️ - 총 0개 - - - 🔴 - 심각 0개 - - - 🟠 - 높음 0개 - - - 🟡 - 보통 0개 - - - 🟢 - 낮음 0개 - + 0 + 심각 0 + 높음 0 + 보통 0 + 낮음 0
@@ -192,27 +87,15 @@
-

- 🔧 - 작업 유형 관리 -

+

작업 유형 관리

- +
- +
- - 🔧 - 총 0개 - - - 📁 - 카테고리 0개 - + 0 + 카테고리 0
@@ -285,18 +168,15 @@
+ diff --git a/web-ui/pages/admin/equipments.html b/web-ui/pages/admin/equipments.html index 505cb3a..07ee238 100644 --- a/web-ui/pages/admin/equipments.html +++ b/web-ui/pages/admin/equipments.html @@ -14,71 +14,14 @@ - +
- - -
- + + diff --git a/web-ui/pages/admin/workers.html b/web-ui/pages/admin/workers.html index 49b3d50..0e48b20 100644 --- a/web-ui/pages/admin/workers.html +++ b/web-ui/pages/admin/workers.html @@ -14,83 +14,20 @@ - +
- - -
@@ -98,9 +35,7 @@
@@ -130,18 +65,9 @@

등록된 작업자

- - 🟢 - 활성 0명 - - - 🔴 - 비활성 0명 - - - 📊 - 총 0명 - + 활성 0 + 비활성 0 + 0
@@ -171,12 +97,9 @@
@@ -202,9 +125,9 @@
@@ -244,7 +167,7 @@ 체크 시 로그인 계정이 자동 생성됩니다 (나의 대시보드, 연차/출퇴근 관리 가능) @@ -253,7 +176,7 @@ 체크: 현장직 (출퇴근 관리 필요) / 체크 해제: 사무직 (출퇴근 관리 불필요) @@ -262,7 +185,7 @@ 퇴사한 작업자로 표시됩니다. 작업 보고서에서 제외됩니다 @@ -274,18 +197,15 @@
+ diff --git a/web-ui/pages/admin/workplaces.html b/web-ui/pages/admin/workplaces.html index 0eb0036..15f7fac 100644 --- a/web-ui/pages/admin/workplaces.html +++ b/web-ui/pages/admin/workplaces.html @@ -14,110 +14,35 @@ - +
- - -
- +
@@ -286,9 +194,7 @@ JPG, PNG, GIF 형식 지원 (최대 5MB)
- +
@@ -309,12 +215,8 @@ 드래그로 영역을 선택한 후 설비 이름을 입력하고 저장하세요
- - + +
@@ -338,7 +240,7 @@ @@ -381,12 +281,8 @@
- - + +
@@ -408,6 +304,7 @@
+ diff --git a/web-ui/pages/attendance/annual-overview.html b/web-ui/pages/attendance/annual-overview.html index 9f652b0..fa4a594 100644 --- a/web-ui/pages/attendance/annual-overview.html +++ b/web-ui/pages/attendance/annual-overview.html @@ -15,6 +15,7 @@ + @@ -32,7 +33,7 @@ @@ -98,7 +99,7 @@
diff --git a/web-ui/pages/attendance/daily.html b/web-ui/pages/attendance/daily.html index fc4875b..6f369be 100644 --- a/web-ui/pages/attendance/daily.html +++ b/web-ui/pages/attendance/daily.html @@ -19,17 +19,14 @@
@@ -48,7 +45,7 @@
@@ -58,7 +55,8 @@
- + + diff --git a/web-ui/pages/attendance/monthly.html b/web-ui/pages/attendance/monthly.html index ddcb1b6..49cc6b4 100644 --- a/web-ui/pages/attendance/monthly.html +++ b/web-ui/pages/attendance/monthly.html @@ -118,17 +118,14 @@
@@ -189,7 +186,8 @@ - + + diff --git a/web-ui/pages/attendance/vacation-allocation.html b/web-ui/pages/attendance/vacation-allocation.html index 5cd7771..3fdf542 100644 --- a/web-ui/pages/attendance/vacation-allocation.html +++ b/web-ui/pages/attendance/vacation-allocation.html @@ -15,6 +15,7 @@ + @@ -31,7 +32,7 @@ @@ -82,7 +83,7 @@

자동 계산 (연차만 해당)

@@ -112,7 +109,8 @@ - + + diff --git a/web-ui/pages/attendance/vacation-input.html b/web-ui/pages/attendance/vacation-input.html index 8d391ce..e12b123 100644 --- a/web-ui/pages/attendance/vacation-input.html +++ b/web-ui/pages/attendance/vacation-input.html @@ -19,10 +19,7 @@
@@ -81,7 +78,7 @@
@@ -96,7 +93,7 @@

최근 입력 내역

@@ -112,7 +109,8 @@ - + + diff --git a/web-ui/pages/attendance/vacation-management.html b/web-ui/pages/attendance/vacation-management.html index 411dd2a..7f312d5 100644 --- a/web-ui/pages/attendance/vacation-management.html +++ b/web-ui/pages/attendance/vacation-management.html @@ -50,10 +50,7 @@
@@ -137,7 +134,7 @@
@@ -150,7 +147,7 @@

최근 입력 내역

@@ -174,10 +171,10 @@ ~
@@ -194,7 +191,8 @@ - + + diff --git a/web-ui/pages/attendance/vacation-request.html b/web-ui/pages/attendance/vacation-request.html index 17ce678..a7ad270 100644 --- a/web-ui/pages/attendance/vacation-request.html +++ b/web-ui/pages/attendance/vacation-request.html @@ -19,10 +19,7 @@
@@ -80,7 +77,7 @@
@@ -106,7 +103,8 @@ - + + diff --git a/web-ui/pages/profile/info.html b/web-ui/pages/profile/info.html index dc7e6fd..5e05c4a 100644 --- a/web-ui/pages/profile/info.html +++ b/web-ui/pages/profile/info.html @@ -3,7 +3,7 @@ - 👤 내 프로필 | (주)테크니컬코리아 + 내 프로필 | (주)테크니컬코리아 @@ -208,7 +208,7 @@
-
👤
+

사용자

역할

@@ -216,10 +216,7 @@
-

- 📋 - 기본 정보 -

+

기본 정보

사용자 ID @@ -250,10 +247,7 @@
-

- 📊 - 활동 정보 -

+

활동 정보

마지막 로그인 @@ -284,22 +278,16 @@
-

- - 빠른 작업 -

+

빠른 작업

- - 🔐 - 비밀번호 변경 + + 비밀번호 변경 diff --git a/web-ui/pages/profile/password.html b/web-ui/pages/profile/password.html index 6fbd273..1b72d12 100644 --- a/web-ui/pages/profile/password.html +++ b/web-ui/pages/profile/password.html @@ -3,7 +3,7 @@ - 🔐 비밀번호 변경 | (주)테크니컬코리아 + 비밀번호 변경 | (주)테크니컬코리아 @@ -276,16 +276,13 @@
-

🔐 비밀번호 변경

+

비밀번호 변경

계정 보안을 위해 정기적으로 비밀번호를 변경해주세요

-

- 🔑 - 새 비밀번호 설정 -

+

새 비밀번호 설정

@@ -294,10 +291,7 @@
-

- ℹ️ - 비밀번호 요구사항 -

+

비밀번호 요구사항

  • 최소 6자 이상 입력해주세요
  • 영문 대/소문자, 숫자, 특수문자를 조합하면 더 안전합니다
  • @@ -309,64 +303,54 @@
    - +
    - - +
    - +
    - - +
    - +
    - - +
    - + + diff --git a/web-ui/pages/safety/issue-list.html b/web-ui/pages/safety/issue-list.html index e2e3876..f5e3994 100644 --- a/web-ui/pages/safety/issue-list.html +++ b/web-ui/pages/safety/issue-list.html @@ -295,7 +295,8 @@
- + + diff --git a/web-ui/pages/safety/issue-report.html b/web-ui/pages/safety/issue-report.html index 085a83a..17d97e9 100644 --- a/web-ui/pages/safety/issue-report.html +++ b/web-ui/pages/safety/issue-report.html @@ -612,7 +612,8 @@
- + + diff --git a/web-ui/pages/safety/management.html b/web-ui/pages/safety/management.html index 714f16e..c42a614 100644 --- a/web-ui/pages/safety/management.html +++ b/web-ui/pages/safety/management.html @@ -285,7 +285,8 @@
- + + diff --git a/web-ui/pages/safety/training-conduct.html b/web-ui/pages/safety/training-conduct.html index 214945d..8204177 100644 --- a/web-ui/pages/safety/training-conduct.html +++ b/web-ui/pages/safety/training-conduct.html @@ -259,7 +259,7 @@
-
⚠️
+
중요: 모든 체크리스트 항목을 완료하고 방문자의 서명을 받은 후 교육 완료 처리를 해주세요. 교육 완료 후에는 수정할 수 없습니다. @@ -321,7 +321,8 @@
- + + diff --git a/web-ui/pages/safety/visit-request.html b/web-ui/pages/safety/visit-request.html index e059a9c..11fafcf 100644 --- a/web-ui/pages/safety/visit-request.html +++ b/web-ui/pages/safety/visit-request.html @@ -280,7 +280,7 @@
-
📍
+
지도에서 작업장을 선택하세요
@@ -365,7 +365,8 @@
- + + diff --git a/web-ui/pages/work/analysis.html b/web-ui/pages/work/analysis.html index 5451006..94bb8ec 100644 --- a/web-ui/pages/work/analysis.html +++ b/web-ui/pages/work/analysis.html @@ -12,6 +12,8 @@ + + @@ -26,20 +28,17 @@ @@ -48,33 +47,23 @@
- +
- +
- +