diff --git a/gateway/html/shared/notification-bell.js b/gateway/html/shared/notification-bell.js index c0e3ec8..683fc99 100644 --- a/gateway/html/shared/notification-bell.js +++ b/gateway/html/shared/notification-bell.js @@ -111,8 +111,8 @@ function _getAllNotificationsUrl() { var h = window.location.hostname; - if (h.includes('technicalkorea.net')) return 'https://tkfb.technicalkorea.net/pages/admin/notifications.html'; - return window.location.protocol + '//' + h + ':30080/pages/admin/notifications.html'; + if (h.includes('technicalkorea.net')) return 'https://tkuser.technicalkorea.net/?tab=notificationRecipients'; + return window.location.protocol + '//' + h + ':30380/?tab=notificationRecipients'; } /* ========== UI: Badge ========== */ diff --git a/system1-factory/web/pages/admin/departments.html b/system1-factory/web/pages/admin/departments.html index 668fa0d..6e17e90 100644 --- a/system1-factory/web/pages/admin/departments.html +++ b/system1-factory/web/pages/admin/departments.html @@ -1,332 +1,4 @@ - - - - - - 부서 관리 - TK 공장관리 - - - - - - -
-
-
-
- - -

TK 공장관리

-
-
- -
-
- -
-
-
-
- -
-
- -
- - -
- -
-

부서 목록

-
- -
-
- - -
-
- 부서를 선택하세요 - -
- - -
- 0명 선택됨 - - -
- -
-
- 왼쪽에서 부서를 선택하면 해당 부서의 작업자가 표시됩니다. -
-
-
-
-
-
-
- - - - - - - - - - +이동 중... diff --git a/system1-factory/web/pages/admin/issue-categories.html b/system1-factory/web/pages/admin/issue-categories.html index 3cf8fdb..bba8b58 100644 --- a/system1-factory/web/pages/admin/issue-categories.html +++ b/system1-factory/web/pages/admin/issue-categories.html @@ -1,337 +1,4 @@ - - - - - - 신고 카테고리 관리 - TK 공장관리 - - - - - - -
-
-
-
- - -

TK 공장관리

-
-
- -
-
- -
-
-
-
- -
-
- -
- - - -
- - -
- - -
-
카테고리를 불러오는 중...
-
-
-
-
- - - - - - - - - - - - - +이동 중... diff --git a/system1-factory/web/pages/admin/notifications.html b/system1-factory/web/pages/admin/notifications.html index ff3d820..41b9e72 100644 --- a/system1-factory/web/pages/admin/notifications.html +++ b/system1-factory/web/pages/admin/notifications.html @@ -1,584 +1,4 @@ - - - - - - 알림 관리 - TK 공장관리 - - - - - - -
-
-
-
- - -

TK 공장관리

-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-

알림 관리

-
- -
-
- -
-
-
0
-
읽지 않은 알림
-
-
-
0
-
전체 알림
-
-
- -
-
-

알림 목록

-
- - - -
-
- -
-
-
🔔
-

알림이 없습니다.

-
-
- - -
-
-
-
-
- - - - - - - +이동 중... diff --git a/system1-factory/web/pages/admin/projects.html b/system1-factory/web/pages/admin/projects.html index 9da19de..4771b53 100644 --- a/system1-factory/web/pages/admin/projects.html +++ b/system1-factory/web/pages/admin/projects.html @@ -1,714 +1,4 @@ - - - - - - 프로젝트 관리 - TK 공장관리 - - - - - - -
-
-
-
- - -

TK 공장관리

-
-
- -
-
- -
-
-
-
- -
-
- -
-
- - -
- 전체 0 - 활성 0 - 비활성 0 -
- -
- - - - - - - - - - - - - - - - - -
#Job No.프로젝트명상태계약일납기일PM현장활성관리
-
-
-
-
-
- - - - - - - - - - +이동 중... diff --git a/system1-factory/web/pages/admin/tasks.html b/system1-factory/web/pages/admin/tasks.html index 1f2fd20..1feae72 100644 --- a/system1-factory/web/pages/admin/tasks.html +++ b/system1-factory/web/pages/admin/tasks.html @@ -1,616 +1,4 @@ - - - - - - 작업 관리 - TK 공장관리 - - - - - - -
-
-
-
- - -

TK 공장관리

-
-
- -
-
- -
-
-
-
- -
-
- -
-
- - -
- -
-
- 공정 목록 - 0 -
-
    -
-
- - -
-
- 전체 작업 -
- 활성 0 - 비활성 0 -
-
-
- - - - - - - - - - - - -
#작업명소속 공정설명상태관리
-
-
-
-
-
-
-
- - - - - - - - - - - - - +이동 중... diff --git a/system1-factory/web/pages/admin/workplaces.html b/system1-factory/web/pages/admin/workplaces.html index 3b17c2c..f2dbea7 100644 --- a/system1-factory/web/pages/admin/workplaces.html +++ b/system1-factory/web/pages/admin/workplaces.html @@ -1,445 +1,4 @@ - - - - - - 작업장 관리 - TK 공장관리 - - - - - - -
-
-
-
- - -

TK 공장관리

-
-
- -
-
- -
-
-
-
- -
-
- -
-
- -
-
-

- 🏭 - 작업장 관리 -

-

공장 및 작업장을 등록하고 설비 위치를 지도에서 관리합니다

-
-
- - - -
-
- - -
-
-
🏢
-
-

0

-

공장

-
-
-
-
📍
-
-

0

-

전체 작업장

-
-
-
-
-
-

0

-

활성 작업장

-
-
-
-
⚙️
-
-

0

-

등록된 설비

-
-
-
- - -
- - -
- - - - - -
-
-

- 📋 - 작업장 목록 -

-
- 전체 0 - 활성 0 -
-
-
-
- -
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - +이동 중... diff --git a/system1-factory/web/static/js/tkfb-core.js b/system1-factory/web/static/js/tkfb-core.js index cd6d0e7..83d5110 100644 --- a/system1-factory/web/static/js/tkfb-core.js +++ b/system1-factory/web/static/js/tkfb-core.js @@ -8,6 +8,9 @@ if ('serviceWorker' in navigator) { /* ===== Config ===== */ const API_BASE = '/api'; +const _tkuserBase = location.hostname.includes('technicalkorea.net') + ? 'https://tkuser.technicalkorea.net' + : `http://${location.hostname}:30380`; /* ===== Token ===== */ function _cookieGet(n) { const m = document.cookie.match(new RegExp('(?:^|; )' + n + '=([^;]*)')); return m ? decodeURIComponent(m[1]) : null; } @@ -134,13 +137,13 @@ const NAV_MENU = [ { href: '/pages/attendance/annual-overview.html', icon: 'fa-chart-pie', label: '연간 휴가 현황', key: 'attendance.annual_overview', admin: true }, ]}, { cat: '시스템 관리', admin: true, items: [ - { href: 'https://tkuser.technicalkorea.net', icon: 'fa-users-cog', label: '사용자 관리', key: 'admin.user_management', external: true }, - { href: '/pages/admin/projects.html', icon: 'fa-project-diagram', label: '프로젝트 관리', key: 'admin.projects' }, - { href: '/pages/admin/tasks.html', icon: 'fa-tasks', label: '작업 관리', key: 'admin.tasks' }, - { href: '/pages/admin/workplaces.html', icon: 'fa-building', label: '작업장 관리', key: 'admin.workplaces' }, - { href: '/pages/admin/equipments.html', icon: 'fa-cogs', label: '설비 관리', key: 'admin.equipments' }, - { href: '/pages/admin/departments.html', icon: 'fa-sitemap', label: '부서 관리', key: 'admin.departments' }, - { href: '/pages/admin/notifications.html', icon: 'fa-bell', label: '알림 관리', key: 'admin.notifications' }, + { href: `${_tkuserBase}/?tab=users`, icon: 'fa-users-cog', label: '사용자 관리', key: 'admin.user_management', external: true }, + { href: `${_tkuserBase}/?tab=projects`, icon: 'fa-project-diagram', label: '프로젝트 관리', key: 'admin.projects', external: true }, + { href: `${_tkuserBase}/?tab=tasks`, icon: 'fa-tasks', label: '작업 관리', key: 'admin.tasks', external: true }, + { href: `${_tkuserBase}/?tab=workplaces`, icon: 'fa-building', label: '작업장 관리', key: 'admin.workplaces', external: true }, + { href: `${_tkuserBase}/?tab=equipments`, icon: 'fa-cogs', label: '설비 관리', key: 'admin.equipments', external: true }, + { href: `${_tkuserBase}/?tab=departments`, icon: 'fa-sitemap', label: '부서 관리', key: 'admin.departments', external: true }, + { href: `${_tkuserBase}/?tab=notificationRecipients`, icon: 'fa-bell', label: '알림 관리', key: 'admin.notifications', external: true }, { href: '/pages/admin/attendance-report.html', icon: 'fa-clipboard-check', label: '출퇴근-보고서 대조', key: 'admin.attendance_report' }, ]}, ]; diff --git a/system1-factory/web/static/js/tkfb-dashboard.js b/system1-factory/web/static/js/tkfb-dashboard.js index 3ffabcc..df35e2a 100644 --- a/system1-factory/web/static/js/tkfb-dashboard.js +++ b/system1-factory/web/static/js/tkfb-dashboard.js @@ -73,7 +73,7 @@ function renderNotificationList(notifications) { const icons = { repair: 'fa-wrench text-amber-500', safety: 'fa-shield-alt text-red-500', system: 'fa-bell text-blue-500', equipment: 'fa-cog text-gray-500', maintenance: 'fa-tools text-green-500' }; el.innerHTML = notifications.slice(0, 5).map(n => { const iconClass = icons[n.type] || 'fa-bell text-gray-400'; - return `
+ return `
${escapeHtml(n.title)}
diff --git a/user-management/web/index.html b/user-management/web/index.html index a1538cc..9a9b6c3 100644 --- a/user-management/web/index.html +++ b/user-management/web/index.html @@ -33,16 +33,12 @@
+ + + + + +