Commit Graph

293 Commits

Author SHA1 Message Date
kjs b402602b69 Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-23 17:26:17 +09:00
kjs f9c6ef70db 플로우 위젯 컴포넌트와 버튼의 연동 2025-10-23 17:26:14 +09:00
kjs 5203d0fa50 Merge branch 'main' into feature/screen-management 2025-10-23 17:01:54 +09:00
kjs 8c89b9cf86 테이블 리스트 수정 2025-10-23 16:50:41 +09:00
hjlee b3afd923c9 Merge pull request 'lhj' (#137) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/137
2025-10-23 15:17:14 +09:00
kjs 70d2c96c80 컴포넌트 잘림현상 수정 2025-10-23 15:06:00 +09:00
kjs b104cd94f2 텍스트 설정 초기화 되는 오류 수정 2025-10-23 13:24:37 +09:00
leeheejin 331261bc80 날씨 2025-10-23 13:17:21 +09:00
kjs 23f7b89cc5 Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-23 13:15:53 +09:00
kjs 4996dd5562 버튼 액션 안되는 버그 수정 2025-10-23 13:15:52 +09:00
leeheejin 753c170839 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj
; Please enter a commit message to explain why this merge is necessary,
; especially if it merges an updated upstream into a topic branch.
;
; Lines starting with ';' will be ignored, and an empty message aborts
; the commit.
2025-10-23 12:31:27 +09:00
leeheejin 8ec54b4e7d 날씨 진행 중 세이브 2025-10-23 12:31:14 +09:00
kjs 184adffdcb Merge branch 'main' into feature/screen-management 2025-10-23 11:31:48 +09:00
kjs 0c3ce4d3eb text타입 라벨 표시문제 수정 2025-10-23 09:56:38 +09:00
kjs 2dd96f5a74 화면관리ui수정 2025-10-22 17:19:47 +09:00
leeheejin 13f4d07577 메일관리 2025-10-22 17:07:38 +09:00
leeheejin 479b0ba3ed ui 고치기 전 세이브 2025-10-22 16:06:04 +09:00
dohyeons b62f2ffc10 api관리 구현(대시보드쪽) 2025-10-22 09:45:47 +09:00
leeheejin 9cb705dba8 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj
; Please enter a commit message to explain why this merge is necessary,
; especially if it merges an updated upstream into a topic branch.
;
; Lines starting with ';' will be ignored, and an empty message aborts
; the commit.
2025-10-21 17:33:07 +09:00
leeheejin 10d112bd69 버튼 문제 해결 2025-10-21 17:32:54 +09:00
dohyeons 74d287daa9 테이블 변경 이력 로그 시스템 구현 2025-10-21 15:08:41 +09:00
kjs cc84e604b1 인풋 오류 수정 2025-10-21 14:41:56 +09:00
kjs 74ebb565e6 플로우 로그기능 수정 2025-10-21 14:21:29 +09:00
dohyeons 090cba09f1 rest api 관리 구현 2025-10-21 10:59:15 +09:00
kjs 1f12df2f79 플로우 외부db연결 2025-10-20 17:50:27 +09:00
kjs 7d8abc0449 플로우 분기처리 구현 2025-10-20 15:53:00 +09:00
kjs de9491aa29 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-20 10:56:23 +09:00
kjs f9c171c513 플로우 구현 2025-10-20 10:55:33 +09:00
dohyeons 8932f61298 Phase 1-4 완료 2025-10-20 09:53:31 +09:00
kjs 52c7391cf5 Merge branch 'main' into feature/screen-management 2025-10-17 17:15:47 +09:00
kjs 2e916678fa ui개선 2025-10-17 16:21:08 +09:00
kjs 2a8081a253 반응형 및 테이블 리스트 컴포넌트 오류 수정 2025-10-17 15:31:23 +09:00
dohyeons 184d687f0f 일단 야드관리 3d 드래그앤 드랍까지 2025-10-17 15:26:21 +09:00
kjs 92e7cef2bc 버튼 컬럼수 조정 2025-10-17 09:32:46 +09:00
kjs 29a2a18d69 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-16 18:19:21 +09:00
kjs d7a845ad9f 반응형 레이아웃 기능 구현 2025-10-16 18:16:57 +09:00
kjs a0dde51109 분할 패널 및 반복 필드 그룹 컴포넌트 2025-10-16 15:05:24 +09:00
dohyeons 9168844fab Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/dashboard 2025-10-16 10:56:34 +09:00
dohyeons 9e1a7c53e1 settings 저장 2025-10-16 10:27:43 +09:00
kjs 716cfcb2cf 화면정보 수정 및 미리보기 기능 2025-10-15 18:31:40 +09:00
kjs c42853f261 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-15 17:32:22 +09:00
kjs 0c3462a646 Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-15 17:29:30 +09:00
kjs 7686158a01 분할레이아웃 2025-10-15 17:25:38 +09:00
leeheejin 0b5b140625 대시보드 위젯 렌더링 수정 및 외부 API 키 통합
- DashboardViewer에 ListSummaryWidget 연결
- list 위젯이 실제 DB 데이터 표시하도록 수정
- ITS_API_KEY (국토교통부 교통사고 API) 추가
- KMA_API_KEY (기상청 특보 API) 재적용
- dashboard.ts API URL 수정 (/api로 통일)
2025-10-15 17:02:06 +09:00
dohyeons d4949983fb Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/dashboard 2025-10-15 16:30:52 +09:00
leeheejin 39ddf59275 범용적으로 만든것들이랑 ui 수정 2025-10-15 16:16:27 +09:00
dohyeons eff3b45dc9 기간 필터링 추가 2025-10-15 15:05:20 +09:00
kjs 4c05b25fd8 Merge branch 'main' into feature/screen-management 2025-10-15 13:33:26 +09:00
kjs 3d242c1c8e 화면관리 ui개선 및 파일업로드 설정 2025-10-15 13:30:11 +09:00
leeheejin 36aec28708 차량위치 위젯 기존꺼 분할 완료 2025-10-15 10:29:15 +09:00