dohyeons
|
2d57c5e9ee
|
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/dashboard
|
2025-10-14 16:52:46 +09:00 |
|
dohyeons
|
c896b2182c
|
수평 바 차트 구현
|
2025-10-14 16:49:57 +09:00 |
leeheejin
|
230888daa7
|
lhj 브랜치 main에 병합 - 모든 위젯 통합 (리스크/알림, 배송, 캘린더, 운전자 관리)
|
2025-10-14 16:42:23 +09:00 |
|
leeheejin
|
c6930a4e66
|
배송/화물현황과 리스크/알림(api 활용, 공공데이터 복구시 대체될 가능성 있음)
|
2025-10-14 16:36:00 +09:00 |
|
dohyeons
|
60090873b3
|
내부 db로만 요청이 보내지는 현상 수정
|
2025-10-14 15:59:16 +09:00 |
|
dohyeons
|
f040e8eb35
|
차트 구현 2차 완료
|
2025-10-14 15:50:15 +09:00 |
|
dohyeons
|
4cc5f1344f
|
차트 구현 1차 완료(바 차트 작동)
|
2025-10-14 15:25:11 +09:00 |
|
dohyeons
|
3db7feb36b
|
차트 구현 phase2 완료
|
2025-10-14 14:10:49 +09:00 |
|
dohyeons
|
e667ee7106
|
차트 구현 phase1 완료
|
2025-10-14 13:59:54 +09:00 |
|
dohyeons
|
2050a22656
|
차트 구현 계획 md 파일 생성
|
2025-10-14 13:46:09 +09:00 |
 hyeonsu
|
c3f24cdece
|
Merge pull request '달력 및 기사 관리 위젯 구현' (#97) from feature/dashboard into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/97
|
2025-10-14 13:22:17 +09:00 |
|
dohyeons
|
5cd5ad6c49
|
캔버스 너비 초과하는 배치 막음
|
2025-10-14 13:20:17 +09:00 |
|
dohyeons
|
ce599fab22
|
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/dashboard
|
2025-10-14 11:58:13 +09:00 |
|
leeheejin
|
909024b635
|
캔버스 색상 오류 수정 및 국토부 api 적용
|
2025-10-14 11:55:31 +09:00 |
|
dohyeons
|
2b104b8455
|
불필요한 가져오기 삭제
|
2025-10-14 11:53:40 +09:00 |
|
dohyeons
|
d149f0baaa
|
기사 관리 위젯에서 테마 관련 코드 삭제
|
2025-10-14 11:46:14 +09:00 |
|
dohyeons
|
0d4b985d5a
|
기사 관리 위젯 구현
|
2025-10-14 11:26:53 +09:00 |
|
dohyeons
|
7cad74a41f
|
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/dashboard
|
2025-10-14 10:51:28 +09:00 |
|
dohyeons
|
2311729338
|
달력 위젯 구현
|
2025-10-14 10:48:17 +09:00 |
|
leeheejin
|
85c561c8b5
|
메인 받은거랑 계산기 위젯, 배경색
|
2025-10-14 10:34:18 +09:00 |
|
dohyeons
|
4dbb55f6e1
|
달력 위젯 구현 md파일
|
2025-10-14 10:29:56 +09:00 |
|
hyeonsu
|
97902d2a49
|
Merge pull request '시계 위젯 구현' (#96) from feature/dashboard into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/96
|
2025-10-14 10:24:34 +09:00 |
|
dohyeons
|
7ccd8fbc6a
|
시계 위젯 설정을 팝오버로 변경
|
2025-10-14 10:23:20 +09:00 |
|
dohyeons
|
788745ef37
|
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/dashboard
|
2025-10-14 10:13:35 +09:00 |
|
dohyeons
|
ce65e6106d
|
시계 위젯 구현
|
2025-10-14 10:12:40 +09:00 |
|
leeheejin
|
f65caf45cd
|
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node
|
2025-10-14 10:06:50 +09:00 |
|
leeheejin
|
dac3e927aa
|
환율 위젯과 날씨 위젯
|
2025-10-14 10:05:40 +09:00 |
|
dohyeons
|
4813da827e
|
기본 시간(서울) 시계 위젯 구현
|
2025-10-14 09:41:33 +09:00 |
 kjs
|
9775b28d9d
|
Merge pull request 'feature/screen-management' (#95) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/95
|
2025-10-13 19:18:21 +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 |
|
hyeonsu
|
5b58681603
|
Merge pull request '리포트 관리 되돌리기' (#94) from feature/report into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/94
|
2025-10-13 19:16:29 +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
|
26649b78f3
|
환율과 날씨 위젯 api 활용 완료 날씨는 현재 기상청 ai hub로 사용중 나중에 공공데이터 서비스가 가능할때 바꾸기 바람
|
2025-10-13 19:04:28 +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 |
|
hyeonsu
|
f88bedc0ab
|
Merge pull request 'gridUtils 되돌리기' (#93) from feature/report into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/93
|
2025-10-13 18:37:42 +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 |
|
kjs
|
e8123932ba
|
화면관리 12컬럼 중간 커밋
|
2025-10-13 18:28:03 +09:00 |
|
hyeonsu
|
cabaada5b8
|
Merge pull request '대시보드 그리드 스냅 적용' (#92) from feature/dashboard into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/92
|
2025-10-13 18:14:20 +09:00 |
|
dohyeons
|
c9e5e2ee72
|
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/dashboard
|
2025-10-13 18:12:14 +09:00 |
|
dohyeons
|
faf201dfc6
|
위젯을 아래로 배치하도록 설정
|
2025-10-13 18:10:58 +09:00 |
|
dohyeons
|
3672bbd997
|
캔버스 크기 조절
|
2025-10-13 18:09:20 +09:00 |
|
kjs
|
534d174234
|
Merge pull request 'feature/screen-management' (#91) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/91
|
2025-10-13 17:48:52 +09:00 |
|
kjs
|
c99936cef0
|
Merge branch 'main' into feature/screen-management
|
2025-10-13 17:48:44 +09:00 |
|
kjs
|
0dc4d53876
|
제어관리 노드 작동 방식 수정
|
2025-10-13 17:47:24 +09:00 |
|
dohyeons
|
39e3aa14cb
|
우측 사이드바 너비 조정
|
2025-10-13 17:21:24 +09:00 |