diff --git a/server.js b/server.js index 6571584..8d23422 100644 --- a/server.js +++ b/server.js @@ -56,7 +56,7 @@ async function ensureTables() { manager_main VARCHAR(100), manager_sub VARCHAR(100), ip_address VARCHAR(50), remote_tool VARCHAR(100), server_id VARCHAR(100), server_pw VARCHAR(100), model_name VARCHAR(255), mainboard VARCHAR(255), os VARCHAR(100), cpu VARCHAR(100), ram VARCHAR(100), gpu VARCHAR(100), - storage1 VARCHAR(100), storage2 VARCHAR(100), storage3 VARCHAR(100), monitoring VARCHAR(100), price VARCHAR(100), remarks TEXT, + storage1 VARCHAR(100), storage2 VARCHAR(100), storage3 VARCHAR(100), monitoring VARCHAR(100), price VARCHAR(100), vendor VARCHAR(100), remarks TEXT, storage_location VARCHAR(255), status VARCHAR(50) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; `); @@ -102,6 +102,14 @@ async function ensureTables() { ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; `); + // 기존 테이블들에 vendor 컬럼이 없는 경우 추가 (Migration) + const [cols] = await pool.query("SHOW COLUMNS FROM pc_assets LIKE 'vendor'"); + if (cols.length === 0) { + for (const table of ['pc_assets', 'server_assets', 'storage_assets', 'equip_assets', 'mobile_assets']) { + await pool.query(`ALTER TABLE ${table} ADD COLUMN vendor VARCHAR(100) AFTER price`); + } + } + console.log('✅ All ITAM tables ensured.'); } finally { connection.release(); @@ -121,6 +129,7 @@ async function batchSave(tableName, assets, getQuery) { await connection.commit(); return { success: true, count: assets.length }; } catch (err) { + console.error(`❌ Batch Save Error (${tableName}):`, err.message); await connection.rollback(); throw err; } finally { @@ -134,16 +143,16 @@ const hardwareInsertSQL = (table) => ` id, corp, asset_code, purchase_date, type, detail_purpose, purpose, details, current_org, prev_org, location, manager_main, manager_sub, ip_address, remote_tool, server_id, server_pw, model_name, mainboard, os, cpu, ram, gpu, - storage1, storage2, storage3, monitoring, price, remarks, + storage1, storage2, storage3, monitoring, price, vendor, remarks, storage_location, status ) VALUES ? `; const getHardwareValues = (a) => [ - a.id, a.법인||'', a.자산코드||'', a.구매연월||'', a.type||'', a.상세용도||'', a.용도||'', a.상세||'', + a.id, a.법인||'', a.자산코드||'', a.구매연월||'', a.type||'', a.상세용도||'', a['사용자']||a.용도||'', a.상세||'', a.현사용조직||'', a.이전사용조직||'', a.위치||'', a.담당자_정||'', a.담당자_부||'', a.IP주소||'', a.원격접속||'', a.서버ID||'', a.서버PW||'', a.모델명||'', a.메인보드||'', a.OS||'', a.CPU||'', a.RAM||'', a.GPU||'', - a.SSD1||'', a.SSD2||'', a.HDD1||'', a.모니터링||'', a.금액||'', a.비고||'', + a.SSD1||'', a.SSD2||'', a.SSD3||'', a.모니터링||'', a.금액||'', a.납품업체||a.vendor||'', a.비고||'', a.보관위치||'', a.현재상태||'' ]; @@ -157,7 +166,8 @@ const mapHardware = (r, defaultType) => { 구매일: r.purchase_date, type: type, 상세용도: (type !== '개인PC' && !r.detail_purpose) ? type : r.detail_purpose, - 용도: r.purpose, + 용도: (type !== '개인PC' && !r.detail_purpose) ? type : r.detail_purpose, + 사용자: r.purpose, 상세: r.details, 현사용조직: r.current_org, 이전사용조직: r.prev_org, @@ -176,9 +186,10 @@ const mapHardware = (r, defaultType) => { GPU: r.gpu, SSD1: r.storage1, SSD2: r.storage2, - HDD1: r.storage3, + SSD3: r.storage3, 모니터링: r.monitoring, 금액: r.price, + 납품업체: r.vendor, 비고: r.remarks, 보관위치: r.storage_location, 현재상태: r.status diff --git a/src/components/Modal/DomainModal.ts b/src/components/Modal/DomainModal.ts index 1b282dc..fb9c7c0 100644 --- a/src/components/Modal/DomainModal.ts +++ b/src/components/Modal/DomainModal.ts @@ -1,8 +1,9 @@ import { state } from '../../core/state'; import { closeModals, openModal } from './BaseModal'; import { CORP_LIST } from './SharedData'; -import { generateOptionsHTML } from './ModalUtils'; +import { generateOptionsHTML, setEditLock } from './ModalUtils'; import { createIcons, X, Save, Database, CalendarClock, Edit2 } from 'lucide'; +import { formatExcelDate } from '../../core/excelHandler'; let currentItem: any = null; @@ -12,6 +13,7 @@ const DOMAIN_MODAL_HTML = `

도메인 정보

+
@@ -86,19 +88,23 @@ const DOMAIN_MODAL_HTML = `
- 기타 사항 + 구매 정보
- - + +
- - + +
+ + + +
@@ -112,15 +118,47 @@ export function initDomainModal() { const modal = document.getElementById('domain-asset-modal')!; document.getElementById('btn-close-domain-modal')?.addEventListener('click', () => closeModals()); document.getElementById('btn-cancel-domain')?.addEventListener('click', () => closeModals()); - document.getElementById('btn-save-domain')?.addEventListener('click', () => saveDomain()); + + const saveBtn = document.getElementById('btn-save-domain'); + const revertBtn = document.getElementById('btn-revert-domain'); + const deleteBtn = document.getElementById('btn-delete-domain'); + const headerEditBtn = document.getElementById('btn-edit-domain-header'); + + saveBtn?.addEventListener('click', () => { + if (!currentItem) return; + if (saveBtn.textContent === '수정') { + setEditLock('domain-asset-form', 'edit', { saveBtnId: 'btn-save-domain', revertBtnId: 'btn-revert-domain' }); + return; + } + saveDomain(); + }); + + headerEditBtn?.addEventListener('click', () => { + setEditLock('domain-asset-form', 'edit', { saveBtnId: 'btn-save-domain', revertBtnId: 'btn-revert-domain' }); + }); + + revertBtn?.addEventListener('click', () => { + setEditLock('domain-asset-form', 'view', { saveBtnId: 'btn-save-domain', revertBtnId: 'btn-revert-domain' }); + if (currentItem) openDomainModal(currentItem); + }); + + deleteBtn?.addEventListener('click', () => { + if (currentItem && confirm('정말 삭제하시겠습니까?')) { + state.masterData.domain = state.masterData.domain.filter(d => d.id !== currentItem.id); + saveDomainBatch(); + } + }); } export function openDomainModal(item: any = null) { currentItem = item; const isEdit = !!item; + const mode = isEdit ? 'view' : 'add'; const titleEl = document.getElementById('domain-modal-title'); - if (titleEl) titleEl.textContent = isEdit ? '도메인 정보 수정' : '신규 도메인 등록'; + if (titleEl) titleEl.textContent = isEdit ? '도메인 정보 상세' : '신규 도메인 등록'; + + setEditLock('domain-asset-form', mode, { saveBtnId: 'btn-save-domain', revertBtnId: 'btn-revert-domain' }); const setVal = (id: string, val: any) => { const el = document.getElementById(id) as HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement; @@ -131,17 +169,40 @@ export function openDomainModal(item: any = null) { setVal('domain-corp', item?.corp || ''); setVal('domain-service-name', item?.service_name || ''); setVal('domain-name', item?.domain_name || ''); - setVal('domain-start-date', item?.start_date || ''); - setVal('domain-expiry-date', item?.expiry_date || ''); + setVal('domain-start-date', formatExcelDate(item?.start_date)); + setVal('domain-expiry-date', formatExcelDate(item?.expiry_date)); setVal('domain-price', item?.price || ''); setVal('domain-manager-main', item?.manager_main || ''); setVal('domain-manager-sub', item?.manager_sub || ''); setVal('domain-remarks', item?.remarks || ''); + const deleteBtn = document.getElementById('btn-delete-domain'); + if (deleteBtn) deleteBtn.style.display = isEdit ? 'block' : 'none'; + openModal('domain-asset-modal'); createIcons({ icons: { X, Save, Database, CalendarClock, Edit2 } }); } +async function saveDomainBatch() { + try { + const response = await fetch(`http://${location.hostname}:3000/api/ops/domain/batch`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(state.masterData.domain) + }); + + if (response.ok) { + closeModals(); + window.dispatchEvent(new CustomEvent('refresh-view')); + } else { + throw new Error('DB 저장 실패'); + } + } catch (err) { + console.error(err); + alert('저장 중 오류가 발생했습니다.'); + } +} + async function saveDomain() { const getVal = (id: string) => (document.getElementById(id) as HTMLInputElement)?.value || ''; @@ -164,29 +225,17 @@ async function saveDomain() { return; } - if (currentItem) { + if (currentItem && currentItem.id.startsWith('DOM-')) { + // 신규 추가 후 바로 수정하는 경우 등 대응 + const idx = state.masterData.domain.findIndex(d => d.id === currentItem.id); + if (idx > -1) state.masterData.domain[idx] = newDomain; + else state.masterData.domain.push(newDomain); + } else if (currentItem) { const idx = state.masterData.domain.findIndex(d => d.id === currentItem.id); if (idx > -1) state.masterData.domain[idx] = newDomain; } else { state.masterData.domain.push(newDomain); } - try { - const response = await fetch(`http://${location.hostname}:3000/api/ops/domain/batch`, { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(state.masterData.domain) - }); - - if (response.ok) { - // alert('성공적으로 저장되었습니다.'); - closeModals(); - window.dispatchEvent(new CustomEvent('refresh-view')); - } else { - throw new Error('DB 저장 실패'); - } - } catch (err) { - console.error(err); - alert('저장 중 오류가 발생했습니다.'); - } + await saveDomainBatch(); } diff --git a/src/components/Modal/HWModal.ts b/src/components/Modal/HWModal.ts index 10370d5..6465a85 100644 --- a/src/components/Modal/HWModal.ts +++ b/src/components/Modal/HWModal.ts @@ -45,14 +45,17 @@ const HW_FIELD_MAP: Record = { '모니터링': '모니터링', 'OS': ASSET_SCHEMA.OS.key, 'CPU': ASSET_SCHEMA.CPU.key, + 'GPU': ASSET_SCHEMA.GPU.key, 'RAM': ASSET_SCHEMA.RAM.key, 'SSD1': ASSET_SCHEMA.STORAGE1.key, 'SSD2': ASSET_SCHEMA.STORAGE2.key, + 'SSD3': ASSET_SCHEMA.STORAGE3.key, 'HW사양': 'HW사양', '담당자_정': ASSET_SCHEMA.MANAGER_MAIN.key, '담당자_부': ASSET_SCHEMA.MANAGER_SUB.key, '구매일': ASSET_SCHEMA.PURCHASE_YM.key, '금액': ASSET_SCHEMA.PRICE.key, + '납품업체': ASSET_SCHEMA.VENDOR.key, '비고': ASSET_SCHEMA.REMARKS.key, '사용자': ASSET_SCHEMA.USER.key }; @@ -118,9 +121,11 @@ const HW_FORM_HTML = `
+
+
@@ -132,6 +137,7 @@ const HW_FORM_HTML = `
+
@@ -170,10 +176,13 @@ function applyTypeSpecificUI(type: string) { os: document.getElementById('hw-os-group'), cpu: document.getElementById('hw-cpu-group'), ram: document.getElementById('hw-ram-group'), + gpu: document.getElementById('hw-gpu-group'), ssd1: document.getElementById('hw-ssd1-group'), ssd2: document.getElementById('hw-ssd2-group'), + ssd3: document.getElementById('hw-ssd3-group'), hwSpec: document.getElementById('hw-hwspec-group'), monitoring: document.getElementById('hw-monitoring-group'), + vendor: document.getElementById('hw-vendor-group'), user: document.querySelector('.pc-only') as HTMLElement }; @@ -224,16 +233,16 @@ function applyTypeSpecificUI(type: string) { if (upperType === '노트북') { if (groups.detailPurpose) groups.detailPurpose.style.display = 'none'; nonServer.forEach(el => (el as HTMLElement).style.display = 'flex'); - ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'hwSpec'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; }); + ['model', 'os', 'cpu', 'gpu', 'ram', 'ssd1', 'ssd2', 'ssd3', 'hwSpec', 'vendor'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; }); } else { if (groups.detailPurpose) groups.detailPurpose.style.display = 'flex'; if (detailPurpose === '서버') { serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex'); if (groups.networkTitle) groups.networkTitle.style.display = 'flex'; - ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'monitoring'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; }); + ['model', 'os', 'cpu', 'gpu', 'ram', 'ssd1', 'ssd2', 'ssd3', 'monitoring', 'vendor'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; }); } else { nonServer.forEach(el => (el as HTMLElement).style.display = 'flex'); - ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'hwSpec'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; }); + ['model', 'os', 'cpu', 'gpu', 'ram', 'ssd1', 'ssd2', 'ssd3', 'hwSpec', 'vendor'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; }); } } } @@ -241,7 +250,7 @@ function applyTypeSpecificUI(type: string) { serverOnly.forEach(el => (el as HTMLElement).style.display = 'flex'); if (groups.networkTitle) groups.networkTitle.style.display = 'flex'; if (groups.specTitle) groups.specTitle.style.display = 'flex'; - ['model', 'os', 'cpu', 'ram', 'ssd1', 'ssd2', 'monitoring'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; }); + ['model', 'os', 'cpu', 'gpu', 'ram', 'ssd1', 'ssd2', 'ssd3', 'monitoring', 'vendor'].forEach(k => { if (groups[k]) groups[k]!.style.display = 'flex'; }); } } diff --git a/src/components/Modal/UploadPreviewModal.ts b/src/components/Modal/UploadPreviewModal.ts index 88c64f5..d83c17a 100644 --- a/src/components/Modal/UploadPreviewModal.ts +++ b/src/components/Modal/UploadPreviewModal.ts @@ -210,12 +210,22 @@ async function confirmUpload() { else if (tab === '도메인') endpoint = `${API_BASE}/api/ops/domain/batch`; if (endpoint) { - const response = await fetch(endpoint, { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(data) - }); - if (response.ok) successCount++; + try { + const response = await fetch(endpoint, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(data) + }); + if (response.ok) { + successCount++; + } else { + const errRes = await response.json(); + throw new Error(`[${tab}] ${errRes.error || '저장 실패'}`); + } + } catch (e: any) { + alert(`카테고리 '${tab}' 저장 중 오류: ${e.message}`); + throw e; // Stop processing further tabs + } } } @@ -228,7 +238,7 @@ async function confirmUpload() { } } catch (err) { console.error(err); - alert('업로드 중 오류가 발생했습니다.'); + // 상세 에러는 내부 catch에서 이미 alert으로 띄움 } finally { if (confirmBtn) { confirmBtn.disabled = false; @@ -274,7 +284,7 @@ async function generateBulkCodes() { for (const prefix in groups) { const rows = groups[prefix]; // Fetch current next code for this prefix - const res = await fetch(`http://172.16.40.100:3000/api/generate-asset-code?prefix=${prefix}`); + const res = await fetch(`http://${location.hostname}:3000/api/generate-asset-code?prefix=${prefix}`); const result = await res.json(); if (result.nextCode) { let baseNum = parseInt(result.nextCode.replace(prefix, '')); diff --git a/src/core/excelHandler.ts b/src/core/excelHandler.ts index 8611246..71b173b 100644 --- a/src/core/excelHandler.ts +++ b/src/core/excelHandler.ts @@ -72,8 +72,8 @@ export interface MasterAssetData { logs: HardwareLog[]; } -const PC_HEADERS = ['법인', '자산코드', '사용자', '위치', '모델명', '메인보드', 'CPU', 'GPU', 'RAM', 'SSD1', 'SSD2', 'HDD1', 'HDD2', 'IP주소', 'HW사양', '구매연월', '금액', '납품업체', '품의서명', '비고']; -const SERVER_HEADERS = ['법인', '자산코드', '구매연월', '유형', '용도', '상세내용', '현사용조직', '이전사용조직', '위치', '담당자(정)', '담당자(부)', 'IP 주소 1', 'IP 주소 2', '원격도구', '서버 ID', '서버 PW', '모델명', 'OS', 'CPU', 'RAM', 'GPU', 'Storage 1', 'Storage 2', 'Storage 3', '모니터링', '비고']; +const PC_HEADERS = ['법인', '자산코드', '구매연월', '사용자', '현사용조직', '이전사용조직', '위치', '담당자(정)', '담당자(부)', '모델명', 'OS', 'CPU', 'GPU', 'RAM', 'SSD1', 'SSD2', 'SSD3', '메인보드', 'IP주소', '금액', '납품업체', '품의서명', '비고']; +const SERVER_HEADERS = ['법인', '자산코드', '구매연월', '유형', '용도', '상세내용', '현사용조직', '이전사용조직', '위치', '담당자(정)', '담당자(부)', 'IP 주소 1', 'IP 주소 2', '원격도구', '서버 ID', '서버 PW', '모델명', 'OS', 'CPU', 'RAM', 'GPU', 'Storage 1', 'Storage 2', 'Storage 3', '모니터링', '금액', '납품업체', '품의서명', '비고']; const STORAGE_HEADERS = ['법인', '유형', '자산코드', '명칭', '위치', '모델명', '용량', '담당자(정)', '담당자(부)', 'IP주소', 'MAC주소', '구매연월', '금액', '납품업체', '품의서명', '비고']; const EQUIP_HEADERS = ['법인', '비품유형', '자산코드', '명칭', '위치', '관리자', 'IP주소', 'MACaddress', 'HW사양', 'OS', '구매연월', '금액', '납품업체', '품의서명', '비고']; const MOBILE_HEADERS = ['법인', '자산코드', '명칭', '위치', '관리자', '기기유형', 'OS', '구매연월', '금액', '납품업체', '품의서명', '비고']; @@ -98,9 +98,19 @@ export function downloadTemplate() { { name: '도메인', headers: DOMAIN_HEADERS } ]; + const sampleData: Record = { + '개인PC': ['(주)에이치엠', 'PC-24001', '202401', '홍길동', '기술팀', '-', '서울본사 7층', '김관리', '이부관', 'LG Gram 16', 'Windows 11', 'i7-1360P', 'RTX 3050', '16GB', '512GB', '-', '-', 'LG Mainboard', '192.168.0.10', '1500000', 'LG전자', '2024_상반기_PC구매.pdf', '신규 입사자 지급용'], + '서버': ['(주)에이치엠', 'SRV-24001', '202401', '물리', '웹서버', '운영 웹 서버', '인프라팀', '-', 'IDC 센터 1-A', '박서버', '최백업', '10.0.0.1', '10.0.0.2', 'RDP', 'admin', '********', 'Dell PowerEdge R750', 'Ubuntu 22.04', 'Xeon Gold 6330', '128GB', '-', '1TB SSD', '1TB SSD', '2TB HDD', 'Zabbix', '8500000', '델테크놀로지스', '2024_IDC_확장품의.pdf', '운영 환경 전용'], + '도메인': ['도메인', '(주)에이치엠', '대표홈페이지', 'hm-corp.com', '2024-01-01', '2025-01-01', '55000', '홍길동', '이부관', '가비아 자동갱신'] + }; + tabConfigs.forEach(config => { - const ws = XLSX.utils.aoa_to_sheet([config.headers]); - ws['!cols'] = Array(config.headers.length).fill({ wch: 18 }); + const data = [config.headers]; + if (sampleData[config.name]) { + data.push(sampleData[config.name]); + } + const ws = XLSX.utils.aoa_to_sheet(data); + ws['!cols'] = Array(config.headers.length).fill({ wch: 20 }); XLSX.utils.book_append_sheet(wb, ws, config.name); }); @@ -110,11 +120,11 @@ export function downloadTemplate() { export function exportToExcel(masterData: MasterAssetData) { const wb = XLSX.utils.book_new(); const exportMap = [ - { tab: '개인PC', list: masterData.pc, headers: PC_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.사용자, a.위치, a.모델명, a.메인보드, a.CPU, a.GPU, a.RAM, a.SSD1, a.SSD2, a.HDD1, a.HDD2, a.IP주소, a.HW사양, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] }, - { tab: '서버', list: masterData.server, headers: SERVER_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.구매연월, a.storage유형, a.용도, a.상세, a.현사용조직, a.이전사용조직, a.위치, a.담당자_정, a.담당자_부, a.IP주소, a.IP2, a.원격접속, a.서버ID, a.서버PW, a.모델명, a.OS, a.CPU, a.RAM, a.GPU, a.SSD1, a.SSD2, a.HDD1, a.모니터링, a.비고] }, - { tab: '스토리지', list: masterData.storage, headers: STORAGE_HEADERS, map: (a: any) => [a.법인, a.storage유형, a.자산코드, a.명칭, a.위치, a.모델명, a.용량, a.담당자_정, a.담당자_부, a.IP주소, a.MACaddress, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] }, - { tab: '전산비품', list: masterData.equip, headers: EQUIP_HEADERS, map: (a: any) => [a.법인, a.비품유형, a.자산코드, a.명칭, a.위치, a.관리자, a.IP주소, a.MACaddress, a.HW사양, a.OS, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] }, - { tab: '모바일기기', list: masterData.mobile, headers: MOBILE_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.명칭, a.위치, a.관리자, a.type, a.OS, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] }, + { tab: '개인PC', list: masterData.pc, headers: PC_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.구매연월, a.사용자, a.현사용조직, a.이전사용조직, a.위치, a.담당자_정, a.담당자_부, a.모델명, a.OS, a.CPU, a.GPU, a.RAM, a.SSD1, a.SSD2, a.SSD3, a.메인보드, a.IP주소, a.금액, a.납품업체, a.품의서명, a.비고] }, + { tab: '서버', list: masterData.server, headers: SERVER_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.구매연월, a.type, a.상세용도, a.상세, a.현사용조직, a.이전사용조직, a.위치, a.담당자_정, a.담당자_부, a.IP주소, a.IP2, a.원격접속, a.서버ID, a.서버PW, a.모델명, a.OS, a.CPU, a.RAM, a.GPU, a.SSD1, a.SSD2, a.SSD3, a.모니터링, a.금액, a.납품업체, a.품의서명, a.비고] }, + { tab: '스토리지', list: masterData.storage, headers: STORAGE_HEADERS, map: (a: any) => [a.법인, a.상세용도, a.자산코드, a.명칭, a.위치, a.모델명, a.용량, a.담당자_정, a.담당자_부, a.IP주소, a.MACaddress, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] }, + { tab: '전산비품', list: masterData.equip, headers: EQUIP_HEADERS, map: (a: any) => [a.법인, a.상세용도, a.자산코드, a.명칭, a.위치, a.관리자, a.IP주소, a.MACaddress, a.HW사양, a.OS, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] }, + { tab: '모바일기기', list: masterData.mobile, headers: MOBILE_HEADERS, map: (a: any) => [a.법인, a.자산코드, a.명칭, a.위치, a.관리자, a.상세용도, a.OS, a.구매연월, a.금액, a.납품업체, a.품의서명, a.비고] }, { tab: '구독SW', list: masterData.subSw, headers: SUB_SW_HEADERS, map: (a: any) => [a.분야, a.법인, a.제품명, a.부서, a.수량, a.금액, a.구매일, a.납품업체, a.시작일, a.만료일, a.라이선스유형, a.계정명, a.비고] }, { tab: '영구SW', list: masterData.permSw, headers: PERM_SW_HEADERS, map: (a: any) => [a.분야, a.법인, a.제품명, a.부서, a.수량, a.금액, a.구매일, a.납품업체, a.시작일, a.만료일, a.라이선스키, a.계정명, a.비고] }, { tab: '클라우드', list: masterData.cloud, headers: CLOUD_HEADERS, map: (a: any) => [a.플랫폼명, a.법인, a.제품명, a.부서, a.계정명, a.결제수단, a.결제일, a.연결카드번호, a.당월청구액, a.비고] }, @@ -131,7 +141,7 @@ export function exportToExcel(masterData: MasterAssetData) { /** * 엑셀 날짜 데이터(숫자 또는 문자열)를 YYYY-MM-DD 형식의 문자열로 변환 */ -function formatExcelDate(val: any): string { +export function formatExcelDate(val: any): string { if (!val) return ''; if (typeof val === 'number') { // 엑셀 날짜 숫자 (1899-12-30 기준 일수) @@ -142,7 +152,7 @@ function formatExcelDate(val: any): string { if (typeof val === 'string') { return val.replace(/\./g, '-').trim(); } - return String(val); + return val ? String(val) : ''; } export async function parseExcel(file: File): Promise { @@ -150,25 +160,36 @@ export async function parseExcel(file: File): Promise { const reader = new FileReader(); reader.onload = (e) => { try { - const workbook = XLSX.read(e.target?.result, { type: 'binary' }); + const workbook = XLSX.read(e.target?.result, { type: 'array' }); const parsedData: any = {}; - workbook.SheetNames.forEach(sheetName => { - const rows = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]) as any[]; + workbook.SheetNames.forEach(rawSheetName => { + const sheetName = rawSheetName.trim(); + const ws = workbook.Sheets[rawSheetName]; + const rows = XLSX.utils.sheet_to_json(ws, { defval: "" }) as any[]; const list: any[] = []; - rows.forEach(r => { + rows.forEach(rawR => { + // 헤더명에 공백이 포함된 경우 대비하여 키 정리 (trim) + const r: any = {}; + Object.keys(rawR).forEach(k => { r[k.trim()] = rawR[k]; }); + const common = { id: Math.random().toString(36).substring(2, 9) }; if (sheetName === '개인PC') { - list.push({ ...common, type: '개인PC', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 사용자: r['사용자']||'', 위치: r['위치']||'', 모델명: r['모델명']||'', 메인보드: r['메인보드']||'', CPU: r['CPU']||'', GPU: r['GPU']||'', RAM: r['RAM']||'', SSD1: r['SSD1']||'', SSD2: r['SSD2']||'', HDD1: r['HDD1']||'', HDD2: r['HDD2']||'', IP주소: r['IP주소']||'', HW사양: r['HW사양']||'', 구매연월: formatExcelDate(r['구매연월']), 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' }); + const purchaseYM = formatExcelDate(r['구매연월']).replace(/-/g, '').substring(0, 6); + list.push({ ...common, type: '개인PC', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 구매연월: purchaseYM, 사용자: r['사용자']||'', 현사용조직: r['현사용조직']||'', 이전사용조직: r['이전사용조직']||'', 위치: r['위치']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', 모델명: r['모델명']||'', OS: r['OS']||'', CPU: r['CPU']||'', GPU: r['GPU']||'', RAM: r['RAM']||'', SSD1: r['SSD1']||'', SSD2: r['SSD2']||'', SSD3: r['SSD3']||'', 메인보드: r['메인보드']||'', IP주소: r['IP주소']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' }); } else if (sheetName === '서버') { - list.push({ ...common, type: '서버', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 구매연월: formatExcelDate(r['구매연월']), storage유형: r['유형']||'물리', 용도: r['용도']||'', 상세: r['상세내용']||'', 현사용조직: r['현사용조직']||'', 이전사용조직: r['이전사용조직']||'', 위치: r['위치']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', IP주소: r['IP 주소 1']||'', IP2: r['IP 주소 2']||'', 원격접속: r['원격도구']||'', 서버ID: r['서버 ID']||'', 서버PW: r['서버 PW']||'', 모델명: r['모델명']||'', OS: r['OS']||'', CPU: r['CPU']||'', RAM: r['RAM']||'', GPU: r['GPU']||'', SSD1: r['Storage 1']||'', SSD2: r['Storage 2']||'', HDD1: r['Storage 3']||'', 모니터링: r['모니터링']||'', 비고: r['비고']||'' }); + const purchaseYM = formatExcelDate(r['구매연월']).replace(/-/g, '').substring(0, 6); + list.push({ ...common, type: '서버', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 구매연월: purchaseYM, 상세용도: r['용도']||'', 상세: r['상세내용']||'', 현사용조직: r['현사용조직']||'', 이전사용조직: r['이전사용조직']||'', 위치: r['위치']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', IP주소: r['IP 주소 1']||'', IP2: r['IP 주소 2']||'', 원격접속: r['원격도구']||'', 서버ID: r['서버 ID']||'', 서버PW: r['서버 PW']||'', 모델명: r['모델명']||'', OS: r['OS']||'', CPU: r['CPU']||'', RAM: r['RAM']||'', GPU: r['GPU']||'', SSD1: r['Storage 1']||'', SSD2: r['Storage 2']||'', SSD3: r['Storage 3']||'', 모니터링: r['모니터링']||'', 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'', type2: r['유형']||'물리' }); } else if (sheetName === '스토리지') { - list.push({ ...common, type: '스토리지', 법인: r['법인']||'', storage유형: r['유형']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 모델명: r['모델명']||'', 용량: r['용량']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', IP주소: r['IP주소']||'', MACaddress: r['MAC주소']||'', 구매연월: formatExcelDate(r['구매연월']), 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' }); + const purchaseYM = formatExcelDate(r['구매연월']).replace(/-/g, '').substring(0, 6); + list.push({ ...common, type: '스토리지', 법인: r['법인']||'', storage유형: r['유형']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 모델명: r['모델명']||'', 용량: r['용량']||'', 담당자_정: r['담당자(정)']||'', 담당자_부: r['담당자(부)']||'', IP주소: r['IP주소']||'', MACaddress: r['MAC주소']||'', 구매연월: purchaseYM, 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' }); } else if (sheetName === '전산비품') { - list.push({ ...common, type: '전산비품', 법인: r['법인']||'', 비품유형: r['비품유형']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 관리자: r['관리자']||'', IP주소: r['IP주소']||'', MACaddress: r['MACaddress']||'', HW사양: r['HW사양']||'', OS: r['OS']||'', 구매연월: formatExcelDate(r['구매연월']), 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' }); + const purchaseYM = formatExcelDate(r['구매연월']).replace(/-/g, '').substring(0, 6); + list.push({ ...common, type: '전산비품', 법인: r['법인']||'', 비품유형: r['비품유형']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 관리자: r['관리자']||'', IP주소: r['IP주소']||'', MACaddress: r['MACaddress']||'', HW사양: r['HW사양']||'', OS: r['OS']||'', 구매연월: purchaseYM, 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' }); } else if (sheetName === '모바일기기') { - list.push({ ...common, type: '모바일기기', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 관리자: r['관리자']||'', 기기유형: r['기기유형']||'', OS: r['OS']||'', 구매연월: formatExcelDate(r['구매연월']), 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' }); + const purchaseYM = formatExcelDate(r['구매연월']).replace(/-/g, '').substring(0, 6); + list.push({ ...common, type: '모바일기기', 법인: r['법인']||'', 자산코드: r['자산코드']||'', 명칭: r['명칭']||'', 위치: r['위치']||'', 관리자: r['관리자']||'', 기기유형: r['기기유형']||'', OS: r['OS']||'', 구매연월: purchaseYM, 금액: r['금액']||'', 납품업체: r['납품업체']||'', 품의서명: r['품의서명']||'', 비고: r['비고']||'' }); } else if (sheetName === '구독SW') { list.push({ ...common, type: '구독SW', 분야: r['분야']||'', 법인: r['법인']||'', 부서: r['부서']||'', 제품명: r['제품명']||'', 구매일: formatExcelDate(r['구매일']), 시작일: formatExcelDate(r['시작일']), 만료일: formatExcelDate(r['만료일']), 라이선스유형: r['라이선스유형']||'', 금액: r['금액']||'', 수량: parseInt(r['수량']||'1'), 계정명: r['계정명']||'', 납품업체: r['납품업체']||'', 비고: r['비고']||'' }); } else if (sheetName === '영구SW') { @@ -184,6 +205,6 @@ export async function parseExcel(file: File): Promise { resolve(parsedData); } catch (err) { reject(err); } }; - reader.readAsBinaryString(file); + reader.readAsArrayBuffer(file); }); } diff --git a/src/core/schema.ts b/src/core/schema.ts index a0e8f83..33e7782 100644 --- a/src/core/schema.ts +++ b/src/core/schema.ts @@ -22,6 +22,7 @@ export const ASSET_SCHEMA = { VENDOR: { key: '납품업체', db: 'vendor', ui: '납품업체' }, DOC_NAME: { key: '품의서명', db: 'doc_name', ui: '품의서' }, REMARKS: { key: '비고', db: 'remarks', ui: '비고' }, + DETAIL_PURPOSE: { key: '상세용도', db: 'detail_purpose', ui: '용도' }, // ─── 하드웨어 상세 (Hardware) ─── USER: { key: '사용자', db: 'purpose', ui: '사용자' }, @@ -35,6 +36,8 @@ export const ASSET_SCHEMA = { IP_ADDR: { key: 'IP주소', db: 'ip_address', ui: 'IP 주소 1' }, IP_ADDR2: { key: 'IP2', db: 'ip2', ui: 'IP 주소 2' }, MAC_ADDR: { key: 'MACaddress', db: 'mac_address', ui: 'MAC 주소' }, + GPU: { key: 'GPU', db: 'gpu', ui: 'GPU' }, + STORAGE3: { key: 'SSD3', db: 'storage3', ui: 'Storage 3' }, STATUS: { key: '현재상태', db: 'status', ui: '현재상태' }, STORE_LOC: { key: '보관위치', db: 'storage_location',ui: '보관위치' }, diff --git a/src/main.ts b/src/main.ts index 845e314..e4eb5ae 100644 --- a/src/main.ts +++ b/src/main.ts @@ -174,6 +174,10 @@ function initApp() { createIcons({ icons: { Download, Upload, FileSpreadsheet, Plus, X, LayoutDashboard, Monitor, Server, Database, Laptop, CalendarClock, Key, Cpu, Layers, Users, Paperclip, Edit2, History, RefreshCcw, BookOpen, Settings } }); + window.addEventListener('refresh-view', () => { + console.log('🔄 Refreshing view due to event'); + refreshView(); + }); } document.addEventListener('DOMContentLoaded', initApp); diff --git a/src/views/List/DomainListView.ts b/src/views/List/DomainListView.ts index aa04dd5..9313b54 100644 --- a/src/views/List/DomainListView.ts +++ b/src/views/List/DomainListView.ts @@ -1,13 +1,16 @@ import { state } from '../../core/state'; -import { formatPrice, dynamicSort } from '../../core/utils'; +import { formatPrice, dynamicSort, createBadge } from '../../core/utils'; import { createIcons, Plus, Edit2, Trash2 } from 'lucide'; import { openDomainModal } from '../../components/Modal/DomainModal'; import { setupTableSorting, SortState } from '../../core/tableHandler'; +import { formatExcelDate } from '../../core/excelHandler'; + +// 정렬 상태를 모듈 수준에서 관리하여 화면 갱신 시에도 유지되도록 함 +let persistentSortState: SortState = { key: '', direction: 'asc' }; export function renderDomainList(container: HTMLElement) { container.innerHTML = ''; - let sortState: SortState = { key: '', direction: 'asc' }; const fullList = state.masterData.domain; const header = document.createElement('div'); @@ -30,12 +33,11 @@ export function renderDomainList(container: HTMLElement) { 법인 서비스명 관리도메인 + 구매업체 시작일 만료일 금액 - 담당자 - 담당자(부) - 비고 + 담당자(정/부) @@ -48,13 +50,13 @@ export function renderDomainList(container: HTMLElement) { const updateTable = () => { let filtered = [...fullList]; - if (sortState.key) { - filtered = dynamicSort(filtered, sortState.key, sortState.direction); + if (persistentSortState.key) { + filtered = dynamicSort(filtered, persistentSortState.key, persistentSortState.direction); } tbody.innerHTML = ''; if (filtered.length === 0) { - tbody.innerHTML = `등록된 도메인 정보가 없습니다.`; + tbody.innerHTML = `등록된 도메인 정보가 없습니다.`; return; } @@ -62,25 +64,32 @@ export function renderDomainList(container: HTMLElement) { const tr = document.createElement('tr'); tr.className = 'domain-row'; tr.style.cursor = 'pointer'; + const managerHtml = [ + item.manager_main ? `${createBadge('정', 'primary')} ${item.manager_main}` : '', + item.manager_sub ? `${createBadge('부', 'muted')} ${item.manager_sub}` : '' + ].filter(v => v !== '').join(' / '); + tr.innerHTML = ` ${idx + 1} ${item.type} ${item.corp || ''} ${item.service_name || ''} ${item.domain_name || ''} - ${item.start_date || ''} - ${item.expiry_date || ''} + ${item.remarks || ''} + ${formatExcelDate(item.start_date)} + ${formatExcelDate(item.expiry_date)} ${formatPrice(item.price)} - ${item.manager_main || ''} - ${item.manager_sub || ''} - ${item.remarks || ''} + ${managerHtml || '-'} `; - tr.addEventListener('click', () => openDomainModal(item)); + tr.addEventListener('click', (e) => { + console.log('Row clicked:', item.domain_name); + openDomainModal(item); + }); tbody.appendChild(tr); }); - setupTableSorting(table, sortState, (key, dir) => { - sortState = { key, direction: dir }; + setupTableSorting(table, persistentSortState, (key, dir) => { + persistentSortState = { key, direction: dir }; updateTable(); }); }; diff --git a/src/views/List/PcListView.ts b/src/views/List/PcListView.ts index d7fde27..25da0c4 100644 --- a/src/views/List/PcListView.ts +++ b/src/views/List/PcListView.ts @@ -44,8 +44,6 @@ export function renderPcList(container: HTMLElement) { ${ASSET_SCHEMA.ORG.ui} ${ASSET_SCHEMA.ASSET_CODE.ui} ${ASSET_SCHEMA.USER.ui} - ${ASSET_SCHEMA.LOCATION.ui} - 담당자(정/부) ${ASSET_SCHEMA.MAINBOARD.ui} ${ASSET_SCHEMA.CPU.ui} ${ASSET_SCHEMA.RAM.ui} @@ -53,6 +51,7 @@ export function renderPcList(container: HTMLElement) { ${ASSET_SCHEMA.PURCHASE_YM.ui} ${ASSET_SCHEMA.PRICE.ui} ${ASSET_SCHEMA.DOC_NAME.ui} + 담당자(정/부) @@ -85,7 +84,7 @@ export function renderPcList(container: HTMLElement) { tbody.innerHTML = ''; if (filtered.length === 0) { - tbody.innerHTML = `${UI_TEXT.MESSAGES.NO_DATA}`; + tbody.innerHTML = `${UI_TEXT.MESSAGES.NO_DATA}`; return; } @@ -108,8 +107,6 @@ export function renderPcList(container: HTMLElement) { ${asset[ASSET_SCHEMA.ORG.key]||'-'} ${asset[ASSET_SCHEMA.ASSET_CODE.key]} ${asset[ASSET_SCHEMA.USER.key]||''} - ${asset[ASSET_SCHEMA.LOCATION.key]||''} - ${managerHtml || '-'} ${asset[ASSET_SCHEMA.MAINBOARD.key]||'-'} ${asset[ASSET_SCHEMA.CPU.key]||''} ${asset[ASSET_SCHEMA.RAM.key]||''} @@ -117,6 +114,7 @@ export function renderPcList(container: HTMLElement) { ${asset[ASSET_SCHEMA.PURCHASE_YM.key] || ''} ${Number(asset[ASSET_SCHEMA.PRICE.key]||0).toLocaleString()} ${asset[ASSET_SCHEMA.DOC_NAME.key] ? '' : '-'} + ${managerHtml || '-'} `; tr.addEventListener('click', () => openHwModal(asset, 'view')); tbody.appendChild(tr); diff --git a/src/views/List/ServerListView.ts b/src/views/List/ServerListView.ts index 158e6e5..d215ffc 100644 --- a/src/views/List/ServerListView.ts +++ b/src/views/List/ServerListView.ts @@ -48,7 +48,7 @@ export function renderServerList(container: HTMLElement) { ${ASSET_SCHEMA.CORP.ui} ${ASSET_SCHEMA.ORG.ui} ${ASSET_SCHEMA.ASSET_CODE.ui} - 용도 + ${ASSET_SCHEMA.DETAIL_PURPOSE.ui} 상세 ${ASSET_SCHEMA.LOCATION.ui} 담당자(정/부) @@ -106,7 +106,7 @@ export function renderServerList(container: HTMLElement) { ${asset[ASSET_SCHEMA.CORP.key]} ${asset[ASSET_SCHEMA.ORG.key]||'-'} ${asset[ASSET_SCHEMA.ASSET_CODE.key]} - ${formatInline(asset.용도)} + ${formatInline(asset[ASSET_SCHEMA.DETAIL_PURPOSE.key])} ${formatInline(asset.상세)} ${formatInline(asset[ASSET_SCHEMA.LOCATION.key])} ${managerHtml || '-'}