From 19e6be27ded5a448cbb989a47b3c34430aa487f8 Mon Sep 17 00:00:00 2001 From: JooWangi Date: Thu, 11 Jun 2026 11:49:34 +0900 Subject: [PATCH] fix(merge): resolve compile errors and restore remote db IP --- .env | 2 +- src/components/Modal/HWModal.ts | 2 +- src/core/excelHandler.ts | 11 ++++++++--- src/styles/dashboard.css | 1 - 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.env b/.env index 84f1df7..bd7a495 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -DB_HOST=127.0.0.1 +DB_HOST=172.16.8.151 DB_PORT=3306 DB_USER=itam_admin DB_PASS=itam1234 diff --git a/src/components/Modal/HWModal.ts b/src/components/Modal/HWModal.ts index 42fb2f2..60e8016 100644 --- a/src/components/Modal/HWModal.ts +++ b/src/components/Modal/HWModal.ts @@ -751,7 +751,7 @@ class HwAssetModal extends BaseModal { // state.masterData.logs에서 해당 자산의 이력 필터링 (최신순) const logs = (state.masterData.logs || []) .filter(l => l.asset_id === assetId) - .sort((a, b) => new Date(b.created_at || b.log_date).getTime() - new Date(a.created_at || a.log_date).getTime()); + .sort((a, b) => new Date(b.created_at || b.log_date || '').getTime() - new Date(a.created_at || a.log_date || '').getTime()); if (logs.length === 0) { container.innerHTML = '
기록된 변동 이력이 없습니다.
'; diff --git a/src/core/excelHandler.ts b/src/core/excelHandler.ts index b248939..32a98cf 100644 --- a/src/core/excelHandler.ts +++ b/src/core/excelHandler.ts @@ -27,10 +27,15 @@ export interface SWUser { export interface HardwareLog { id: string; - assetId: string; - date: string; + assetId?: string; + asset_id?: string; + date?: string; + log_date?: string; + created_at?: string; details: string; - user: string; + user?: string; + log_user?: string; + event_type?: string; } export interface MasterAssetData { diff --git a/src/styles/dashboard.css b/src/styles/dashboard.css index c13ef87..85d1a7a 100644 --- a/src/styles/dashboard.css +++ b/src/styles/dashboard.css @@ -518,5 +518,4 @@ flex: 1; font-size: 0.95rem; font-weight: 700; ->>>>>>> origin/main }