Commit Graph

52 Commits

Author SHA1 Message Date
jmaniuvc
9a213b5895 merge 2025-03-13 09:37:26 +09:00
jym
bd1e748bd8 Merge pull request '완료 시간 알람 기능 복원 및 카메라 시점 기능 개발' (#21) from dev/jym/240312_04 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/21
2025-03-12 18:56:41 +09:00
정영민
7a9541be4b 완료 시간 알람 기능 복원 및 카메라 시점 기능 개발 2025-03-12 18:55:01 +09:00
jmaniuvc
8aca0cd2df 미니맵 아이콘 변경, 회전기능 추가 2025-03-12 18:07:07 +09:00
jmaniuvc
e986ea7559 미니맵 제작 2025-03-12 17:36:23 +09:00
jym
731ab1bb7a Merge pull request 'KPI 오류 수정' (#19) from dev/jym/240312_03 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/19
2025-03-12 15:02:33 +09:00
정영민
e4c89175e4 KPI 오류 수정 2025-03-12 15:02:16 +09:00
jym
69006b0529 Merge pull request '설비 KPI 기능 수정' (#18) from dev/jym/250312_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/18
2025-03-12 15:00:04 +09:00
정영민
2e6c32e3e6 설비 KPI 기능 수정 2025-03-12 14:57:35 +09:00
jym
9edc6024ae Merge pull request 'UI 패널 활성화 토글 기능 개발' (#17) from dev/jym/250312_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/17
2025-03-12 12:06:36 +09:00
정영민
971a6e3e87 UI 패널 활성화 토글 기능 개발 2025-03-12 12:04:19 +09:00
jym
407c903fed Merge pull request '작업 시간 분석 UI 기능 개발' (#16) from dev/jym/250312_00 into main
Reviewed-on: http://xrgit:3000/UVCXR/ChunilENG/pulls/16
2025-03-12 09:59:01 +09:00
정영민
9edd809f6d 작업 시간 분석 UI 기능 개발 2025-03-12 09:55:47 +09:00
jym
ea7b7b0d7b Merge pull request '녹화 및 캡처 파일 저장 기능 수정' (#15) from dev/jym/250311_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/15
2025-03-11 14:07:27 +09:00
정영민
60dd620204 녹화 및 캡처 파일 저장 기능 수정 2025-03-11 14:03:04 +09:00
jym
a9bc8aff8b Merge pull request '설정값 오류 수정' (#14) from dev/jym/250311_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/14
2025-03-11 11:45:43 +09:00
정영민
7c1d243ed0 설정값 오류 수정 2025-03-11 11:43:00 +09:00
wsh
8e3a551833 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/ChunilENG 2025-03-11 10:26:41 +09:00
wsh
5589b16b24 1 2025-03-11 10:26:38 +09:00
jym
89b94da223 Merge pull request '녹화, 캡처 기능 추가' (#13) from dev/jym/240311_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/13
2025-03-11 10:24:33 +09:00
정영민
7c3152c716 녹화, 캡처 기능 추가 2025-03-11 10:23:44 +09:00
jym
b472cc4fe1 Merge pull request '작업 조건 분석 기능 개발' (#12) from dev/jym/250310_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/12
2025-03-10 16:47:35 +09:00
정영민
f2029fd8c9 작업 조건 분석 기능 개발 2025-03-10 16:42:23 +09:00
jym
840638c6e3 Merge pull request 'pgd/20250305' (#11) from pgd/20250305 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/11
2025-03-05 19:00:00 +09:00
geondo55
ea4730f7f5 작업 조건 분석 검색 기능 개발 2025-03-05 18:49:48 +09:00
geondo55
ef58961c01 Merge branch 'main' into pgd/20250305 2025-03-05 16:37:20 +09:00
geondo55
8b3dc5de89 캘린더 추가 2025-03-05 16:36:33 +09:00
jym
29b853e73f Merge pull request '설비 코드 데이터 분리' (#10) from dev/jym/250305_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/10
2025-03-05 15:23:33 +09:00
정영민
851bb89fc2 설비 코드 데이터 분리 2025-03-05 15:22:39 +09:00
jym
79452b6a92 Merge pull request '작업 시간 분석, 작업 조건 분석 데이터 조회 테스트 기능 추가' (#9) from dev/jym/250305_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/9
2025-03-05 11:34:11 +09:00
정영민
6d30195ac8 작업 시간 분석, 작업 조건 분석 데이터 조회 테스트 기능 추가 2025-03-05 11:31:36 +09:00
jym
0df4042e4c Merge pull request '외관 적용 및 레이아웃 수정' (#8) from dev/jym/250227_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/8
2025-02-27 16:14:17 +09:00
정영민
5f8e6780aa 외관 적용 및 레이아웃 수정 2025-02-27 16:08:13 +09:00
jym
22231e588d Merge pull request '설비 대시보드 디자인 적용' (#7) from dev/jym/250225_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/7
2025-02-25 17:32:12 +09:00
정영민
db05ad68a1 설비 대시보드 디자인 적용 2025-02-25 17:31:42 +09:00
jym
7c1a6aa23c Merge pull request 'dev/jym/250225_01' (#6) from dev/jym/250225_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/6
2025-02-25 11:57:48 +09:00
정영민
d12b78f49f Merge branch 'dev/jym/250225_00' into dev/jym/250225_01
# Conflicts:
#	CompleteTimeAlarmInfo.json
2025-02-25 11:57:05 +09:00
정영민
54b1fd375e 충돌 해결 2025-02-25 11:48:09 +09:00
jym
aa43cb3de8 Merge pull request 'hovereffect' (#5) from lh/20250225merge into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/5
2025-02-25 11:46:35 +09:00
5862f39d9c hovereffect 2025-02-25 11:27:20 +09:00
정영민
632cd794b0 오류 수정 2025-02-25 10:45:32 +09:00
정영민
7ce9dddd09 불필요한 파일 제거 2025-02-25 10:25:32 +09:00
정영민
3c62a253b7 설비 KPI UI 가시성 개선 2025-02-25 10:23:33 +09:00
jym
96f4549e7a Merge pull request '완료 시간 알람 디자인 변경' (#3) from dev/jym/250224_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/3
2025-02-25 09:19:38 +09:00
정영민
0cca3657d5 완료 시간 알람 디자인 변경 2025-02-24 18:48:14 +09:00
jym
a11021c97b Merge pull request 'lh/20250224merge' (#2) from lh/20250224merge into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/2
2025-02-24 18:33:24 +09:00
1c3bd742da Merge branch 'lh/20250224' into lh/20250224merge 2025-02-24 17:34:26 +09:00
9b055be72f panel 2025-02-24 17:29:39 +09:00
jym
91c47ac8a4 Merge pull request '라이브러리 기능 수정' (#1) from dev/jym/250224_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/1
2025-02-24 16:00:37 +09:00
정영민
02c3e63a1d 라이브러리 기능 수정 2025-02-24 08:37:05 +09:00