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
kjs
a7de47e7ea
세부설정
2025-10-14 17:40:51 +09:00
kjs
a2c3737f7a
세부타입설정
2025-10-14 16:45:30 +09:00
kjs
55f52ed1b5
컬럼 세부 타입 설정
2025-10-14 11:48:04 +09:00
kjs
dadd49b98f
화면관리 수정
2025-10-13 19:18:01 +09:00
kjs
2754be3250
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-13 19:17:44 +09:00
dohyeons
55d8d5432e
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/report
2025-10-13 19:16:23 +09:00
dohyeons
28d460fecd
리포트 관리 되돌리기
2025-10-13 19:15:52 +09:00
leeheejin
75865e2283
Merge branch 'main' into lhj
2025-10-13 18:43:21 +09:00
leeheejin
87bec6760a
Merge conflict 해결 - 로컬 변경사항 유지 (날씨 API)
2025-10-13 18:39:37 +09:00
kjs
289e396406
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-13 18:38:24 +09:00
dohyeons
a53940cff9
gridUtils 되돌리기
2025-10-13 18:37:18 +09:00
kjs
216e19e25d
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-13 18:28:05 +09:00
