fix: resolve all TypeScript build errors after Setting branch merge

This commit is contained in:
2026-04-23 18:36:33 +09:00
parent 5feaa5f170
commit 4b88ac01a4
11 changed files with 49 additions and 44 deletions

View File

@@ -1,6 +1,7 @@
import * as XLSX from 'xlsx';
export interface HardwareAsset {
[key: string]: any;
id: string;
type: string; // '개인PC', '서버', '스토리지', '전산비품', '모바일기기'
법인: string;
@@ -47,13 +48,14 @@ export interface HardwareAsset {
}
export interface SoftwareAsset {
[key: string]: any;
id: string;
type: string; // '구독SW', '영구SW', '클라우드'
분야?: string;
법인: string;
부서?: string;
제품명: string;
구매연월: string;
구매연월?: string;
구독일?: string;
만료일?: string;
라이선스유형?: string;
@@ -100,6 +102,9 @@ export interface MasterAssetData {
mobile: HardwareAsset[];
subSw: SoftwareAsset[];
permSw: SoftwareAsset[];
cloud: SoftwareAsset[];
hw: HardwareAsset[];
sw: SoftwareAsset[];
swUsers: any[]; // { sw_id, userData: [] } 형태로 처리
logs: HardwareLog[];
}
@@ -168,7 +173,7 @@ export async function parseExcel(file: File): Promise<MasterAssetData> {
reader.onload = (e) => {
try {
const workbook = XLSX.read(e.target?.result, { type: 'binary' });
const data: MasterAssetData = { pc: [], server: [], storage: [], equip: [], mobile: [], subSw: [], permSw: [], swUsers: [], logs: [] };
const data: MasterAssetData = { pc: [], server: [], storage: [], equip: [], mobile: [], subSw: [], permSw: [], cloud: [], hw: [], sw: [], swUsers: [], logs: [] };
workbook.SheetNames.forEach(sheetName => {
const rows = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]) as any[];
if (sheetName === '개인PC') {

View File

@@ -19,9 +19,10 @@ export interface MasterAssetData {
}
export interface AppState {
activeCategory: 'dashboard' | 'hw' | 'sw';
activeCategory: 'dashboard' | 'hw' | 'sw' | 'ops';
activeSubTab: string; // '대시보드', '개인PC', '서버', '스토리지', '전산비품', '구독SW', '영구SW', '클라우드'
masterData: MasterAssetData;
activeCharts?: any[];
}
// 초기 상태