merge: merge origin/main into HW_Dashboard and resolve conflicts

src/core/schema.ts

@@ -17,6 +17,7 @@ export const ASSET_SCHEMA = {
   PURCHASE_AMOUNT:{ key: 'purchase_amount', db: 'purchase_amount', ui: '구매금액' },
   PURCHASE_VENDOR:{ key: 'purchase_vendor', db: 'purchase_vendor', ui: '구매업체' },
   APPROVAL_DOC:   { key: 'approval_document', db: 'approval_document', ui: '품의서' },
+  SERVICE_TYPE:   { key: 'service_type', db: 'service_type',    ui: '서비스 구분' },
   MANAGER_MAIN:   { key: 'manager_primary', db: 'manager_primary', ui: '담당자(정)' },
   MANAGER_SUB:    { key: 'manager_secondary', db: 'manager_secondary', ui: '담당자(부)' },
   LOCATION:       { key: 'location',     db: 'location',        ui: '자산위치' },

src/core/state.ts

@@ -37,6 +37,7 @@ export interface MasterAssetData {
 export interface AppState {
   activeCategory: 'dashboard' | 'hw' | 'sw' | 'ops' | 'vip' | 'fac' | 'users' | 'etc';
   activeSubTab: string;
+  viewMode: 'location' | 'legacy' | 'list';
   masterData: MasterAssetData;
   activeCharts: any[];
   currentUserRole: 'admin' | 'user';
@@ -46,6 +47,7 @@ export interface AppState {
 export const state: AppState = {
   activeCategory: 'hw',
   activeSubTab: '대시보드',
+  viewMode: 'location',
   activeCharts: [],
   currentUserRole: 'user',
   masterData: {

src/core/utils.ts

@@ -1,6 +1,6 @@
 import { PAGE_DESCRIPTIONS } from './schema';
 
-export const API_BASE_URL = `http://${location.hostname}:3000`;
+export const API_BASE_URL = '';
 
 /**
  * ITAM 공통 유틸리티 함수