kjs
d13422f7ac
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-28 13:39:41 +09:00
kjs
025fe04192
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-28 13:39:40 +09:00
hyeonsu
63db466504
Merge pull request '지도에 마커 기능 추가' ( #155 ) from feat/rest-api into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/155
2025-10-28 13:39:17 +09:00
2c30d40623
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/rest-api
2025-10-28 13:39:07 +09:00
e6c11a0e04
지도에 마커 기능 추가
2025-10-28 13:38:22 +09:00
kjs
f0cae99c8d
Merge branch 'main' into feature/screen-management
2025-10-28 13:38:11 +09:00
kjs
57f7c48cd9
빌드 오류 수정: 불완전한 백업 파일 삭제
2025-10-28 13:34:46 +09:00
kjs
7c45b3e254
플로우 위젝 라벨표시 및 , 배치관리 회사별 분리
2025-10-28 12:06:54 +09:00
kjs
c0f2fbbd88
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-28 11:54:44 +09:00
kjs
c333a9fd9d
공통코드,REST API 회사별 분리
2025-10-28 11:54:44 +09:00
d5e72ce901
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-28 10:08:40 +09:00
kjs
c48eec78ac
Merge pull request '회사별 메뉴 분리 및 권한 관리' ( #153 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/153
2025-10-28 10:07:32 +09:00
kjs
561d9cb855
Merge branch 'main' into feature/screen-management
2025-10-28 10:07:24 +09:00
kjs
25f6217433
회사별 메뉴 분리 및 권한 관리
2025-10-28 10:07:07 +09:00
39bd9c3351
메인이랑 머지
2025-10-28 09:49:26 +09:00
b09a7c8398
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-28 09:49:19 +09:00
c52e77f37d
디벨롭
2025-10-28 09:32:03 +09:00
kjs
34353b712c
Merge pull request 'feature/screen-management' ( #152 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/152
2025-10-27 18:36:31 +09:00
kjs
35581ac8d2
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-27 18:36:22 +09:00
kjs
6dd321ddab
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-27 18:35:49 +09:00
5b394473f4
restapi 여러개 띄우는거 작업 가능하게 하는거 진행중
2025-10-27 18:33:15 +09:00
kjs
821336d40d
최고관리자가 부여한 권한에 따라 메뉴 보여주기
2025-10-27 18:27:32 +09:00
hyeonsu
d7e8feafc8
Merge pull request '대시보드 기타 수정사항(3d 야드 위주)' ( #151 ) from feat/rest-api into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/151
2025-10-27 17:27:23 +09:00
kjs
15776e76f5
최고 관리자는 좌측에 공통 메뉴만 보이도록 수정
2025-10-27 17:14:28 +09:00
9b337496b8
3d요소 디자인 변경
2025-10-27 17:05:33 +09:00
kjs
02df4355e2
회사별 메뉴 필터링 기능
2025-10-27 16:58:43 +09:00
kjs
29c49d7f07
각 회사별 데이터 분리
2025-10-27 16:40:59 +09:00
8a318ea741
야드 캔버스 수정
2025-10-27 16:09:06 +09:00
640a9a741c
야드 관리 수정 안되는 현상 해결
2025-10-27 16:06:51 +09:00
d1e399b1c4
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/rest-api
2025-10-27 16:01:27 +09:00
8788b47663
에러 해결
2025-10-27 15:46:13 +09:00
270c322daf
대시보드 기타 수정사항 적용
2025-10-27 15:19:48 +09:00
d4579e4221
뷰어 부분 반응형 적용 및 원형 차트 설정 변경
2025-10-27 14:38:43 +09:00
hyeonsu
4f2cf6c0ff
Merge pull request '기타 수정사항' ( #150 ) from feat/rest-api into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/150
2025-10-27 13:35:02 +09:00
cc4dd5ffdc
파일 에러 수정
2025-10-27 13:24:25 +09:00
4bbe29e18e
어드민 계정 식별 방법 수정
2025-10-27 13:20:49 +09:00
bc36c00712
리스트 위젯 제목 한 개만 렌더링
2025-10-27 13:20:31 +09:00
189f0e03a0
새요소 추가 시에도 위로 올리기 체크 구현
2025-10-27 12:02:15 +09:00
kjs
783ce5594e
아이디값 제거
2025-10-27 11:50:25 +09:00
kjs
a3bfcdf2d8
이력테이블 기준 컬럼 설정 기능
2025-10-27 11:41:30 +09:00
3b5f0b638f
중력 적용 및 요소 쌓기 구현
2025-10-27 11:40:11 +09:00
f0bb349c8c
3d요소에 그리드 스냅 시스템 적용
2025-10-27 11:16:54 +09:00
kjs
5fdefffd26
로그시스템 개선
2025-10-27 11:11:08 +09:00
kjs
f14d9ee66c
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-27 09:49:15 +09:00
kjs
a9d85b780b
플로우 각 단계별 컬럼 설정기능
2025-10-27 09:49:13 +09:00
hyeonsu
1116bb2b73
Merge pull request '외부커넥션 관리 - rest api ui개선' ( #149 ) from feat/rest-api into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/149
2025-10-27 09:43:58 +09:00
463cbd29f9
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/rest-api
2025-10-27 09:40:34 +09:00
ef5b86cc4c
rest api 연결 ui 개선
2025-10-27 09:39:11 +09:00
kjs
07f65e43c7
Merge pull request 'feature/screen-management' ( #148 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/148
2025-10-24 18:08:45 +09:00
kjs
ce45502f60
Merge branch 'main' into feature/screen-management
2025-10-24 18:08:37 +09:00
kjs
hyeonsu
dohyeons
leeheejin