b24014/ITAM-test
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(merge): resolve compile errors and restore remote db IP

Browse Source
This commit is contained in:
주완기
2026-06-11 11:49:34 +09:00
parent accbbdc2fa
commit 19e6be27de
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -1,4 +1,4 @@
DB_HOST=127.0.0.1 DB_HOST=172.16.8.151
DB_PORT=3306 DB_PORT=3306
DB_USER=itam_admin DB_USER=itam_admin
DB_PASS=itam1234 DB_PASS=itam1234

2
src/components/Modal/HWModal.ts
View File

@@ -751,7 +751,7 @@ class HwAssetModal extends BaseModal {
// state.masterData.logs에서 해당 자산의 이력 필터링 (최신순) // state.masterData.logs에서 해당 자산의 이력 필터링 (최신순)
const logs = (state.masterData.logs || []) const logs = (state.masterData.logs || [])
.filter(l => l.asset_id === assetId) .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) { if (logs.length === 0) {
container.innerHTML = '<div class="empty-history">기록된 변동 이력이 없습니다.</div>'; container.innerHTML = '<div class="empty-history">기록된 변동 이력이 없습니다.</div>';

11
src/core/excelHandler.ts
View File

@@ -27,10 +27,15 @@ export interface SWUser {
export interface HardwareLog { export interface HardwareLog {
id: string; id: string;
assetId: string; assetId?: string;
date: string; asset_id?: string;
date?: string;
log_date?: string;
created_at?: string;
details: string; details: string;
user: string; user?: string;
log_user?: string;
event_type?: string;
} }
export interface MasterAssetData { export interface MasterAssetData {

1
src/styles/dashboard.css
View File

@@ -518,5 +518,4 @@
flex: 1; flex: 1;
font-size: 0.95rem; font-size: 0.95rem;
font-weight: 700; font-weight: 700;
>>>>>>> origin/main
} }