SJ84
/
INT_PT002
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
106 Commits
1 Branch
0 Tags
12 MiB
Commit Graph

106 Commits (8e6dfbce7bb93a3d39df59298760eb67713b94b0)
 

Author SHA1 Message Date
Seonjae 3b52c42a9c 레시피 명칭 변경 2023-04-05 15:01:56 +09:00
DESKTOP-999R8N3\CJY 2a4fccc19e Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 2023-04-05 11:36:55 +09:00
Seonjae bb556bb4d3 Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 into main 2023-04-05 11:17:23 +09:00
Seonjae 707059875f 위치 수정 2023-04-05 11:17:12 +09:00
DESKTOP-999R8N3\CJY 3c6ada8643 Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 2023-04-05 11:15:54 +09:00
DESKTOP-999R8N3\CJY fe528b2f59 메인화면 배경변경(바이킹마섹 로고 추가) 2023-04-05 11:15:39 +09:00
Seonjae a404a67b03 Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 into main 2023-04-05 11:08:42 +09:00
Seonjae 7221d79541 MainDisplay2 - Language 추가 
시스템정보 - Language 변경 테스트 버튼 추가
 2023-04-05 11:08:36 +09:00
DESKTOP-999R8N3\CJY 82889b6dd1 Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 2023-04-05 10:54:32 +09:00
DESKTOP-999R8N3\CJY c64577df90 - 디자인 작업 중 
- Backup 추가 중
- 메인화면 이미지 촬영용으로 수정
 2023-04-05 10:54:17 +09:00
Seonjae db7021ce12 Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 into main 2023-04-05 10:34:26 +09:00
Seonjae 6ec64e0ed1 서보설정추가 2023-04-05 10:34:20 +09:00
DESKTOP-999R8N3\CJY 2e313bc7fd - Log 디자인작업 완료 
- Log 백업기능 추가 중
 2023-04-04 17:29:19 +09:00
DESKTOP-999R8N3\CJY 1774ce1e66 - Alarm listbox에 표시 
- 시스템정보 - 시간설정 추가
 2023-04-04 09:09:48 +09:00
Seonjae b031d92edb 로그인 및 알람 수정 2023-04-03 11:52:58 +09:00
Seonjae 70918a95b7 Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 into main 2023-04-03 10:47:46 +09:00
Seonjae cae7e712c3 유저설정 수정 2023-04-03 10:47:40 +09:00
DESKTOP-999R8N3\CJY c7447a0e9d Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 
# Conflicts:
#	INT_PT002/Forms/FormMainDisplay2.Designer.cs
 2023-03-31 16:04:48 +09:00
DESKTOP-999R8N3\CJY a3f8e93810 - 메인화면 단계별 라벨 크기 위치 조정 작업 완료 
- 이미지는 차주 재작업
 2023-03-31 16:01:43 +09:00
Seonjae 8505a12a64 Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 into main 
# Conflicts:
#	INT_PT002/Forms/FormMainDisplay2.Designer.cs
 2023-03-31 15:56:49 +09:00
Seonjae a6485cd8dd 유저설정 수정 2023-03-31 15:50:30 +09:00
Seonjae eeee46edd9 유저설정 수정 2023-03-31 15:50:09 +09:00
DESKTOP-999R8N3\CJY 105a2b6834 Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 2023-03-31 13:33:25 +09:00
DESKTOP-999R8N3\CJY 87bcafda85 메인화면 이미지 수정 중 2023-03-31 13:33:07 +09:00
Seonjae f9e4f1f687 예외처리 2023-03-31 13:32:47 +09:00
Seonjae 3234629296 로그인 수정 및 로그 수정 2023-03-31 13:32:17 +09:00
Seonjae f1860f9a99 Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 into main 
# Conflicts:
#	INT_PT002/Controls/Log/ControlMenuLogAlarm.Designer.cs
#	INT_PT002/Controls/Manual/ControlMenuManualIoTest.Designer.cs
#	INT_PT002/Controls/System/ControlMenuSystemStatus.Designer.cs
#	INT_PT002/Forms/FormMainDisplay2.Designer.cs
 2023-03-31 11:05:37 +09:00
Seonjae 23a0f0e377 CurrentDisplay 추가 2023-03-31 10:47:21 +09:00
DESKTOP-999R8N3\CJY 79653db8ba Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 2023-03-30 19:56:23 +09:00
DESKTOP-999R8N3\CJY 15c19373ee 이미지 수정 중 2023-03-30 19:56:06 +09:00
Seonjae 86a9708298 no message 2023-03-30 14:39:14 +09:00
Seonjae b1ebad8d52 레시피, 메인화면 수정 2023-03-30 11:02:19 +09:00
Seonjae 7181b90bbc Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 into main 2023-03-29 13:38:43 +09:00
Seonjae 91716afab5 레시피수정 2023-03-29 13:38:33 +09:00
DESKTOP-999R8N3\CJY 0b2b66eb02 - 메인화면 이미지 변경 중 2023-03-29 13:36:26 +09:00
Seonjae abfdbd2c7f 레시피등 수정 2023-03-29 11:48:47 +09:00
Seonjae 2f04fa1bf6 레시피 수정등 수정 2023-03-29 11:48:08 +09:00
Seonjae f0a19e485e Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 into main 
# Conflicts:
#	INT_PT002/Forms/FormMenu.Designer.cs
 2023-03-28 09:08:09 +09:00
Seonjae bef1c65158 Form1 - UpdateDisplayAlarmView() 추가 2023-03-28 09:04:33 +09:00
DESKTOP-999R8N3\CJY b584928490 - 알람부분 수정 중 2023-03-28 09:01:00 +09:00
DESKTOP-999R8N3\CJY 38119ccbd5 Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 2023-03-27 18:02:59 +09:00
DESKTOP-999R8N3\CJY a5aa9c1dd8 - Main 
Alarm 부분 제외 데이터쪽 확인
 2023-03-27 18:00:47 +09:00
Seonjae 6e1b5ef857 csproj 파일 ignore 등록 2023-03-27 11:46:59 +09:00
DESKTOP-999R8N3\CJY bf0a0e7e6a - 시스템정보 업데이트(LCD(완), Main(테스트필요)), 기타 등등 변경 2023-03-27 11:29:31 +09:00
DESKTOP-999R8N3\CJY 413dbf0c19 로그 추가 메인 수정 중 2023-03-23 14:12:16 +09:00
DESKTOP-999R8N3\CJY 92e165a69c 메뉴 정리 2023-03-20 09:40:59 +09:00
DESKTOP-999R8N3\CJY 691c957a0a Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 
* 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002:
  장비테스트, 메인화면(관리자모드) 정보 추가 PressureData, SystemStatus,  클래스 추가
  메인화면 컨셉 디자인 추가
  1차 완료, 메인화면, 레시피  메뉴

# Conflicts:
#	INT_PT002/DialogForms/DialogFormNumKeyPad.Designer.cs
#	INT_PT002/Forms/FormMain.cs
#	INT_PT002/Forms/FormMainDisplay1.Designer.cs
#	INT_PT002/Forms/FormMainDisplay2.Designer.cs
#	INT_PT002/Forms/FormMainDisplay2.cs
#	INT_PT002/Forms/FormMainDisplay2.resx
#	INT_PT002/INT_PT002.csproj
 2023-03-17 15:12:11 +09:00
DESKTOP-999R8N3\CJY 97c5ab86f6 - 유저설정, 유저그룹에디터 추가 완료 2023-03-17 11:47:26 +09:00
Seonjae 351a7c47f2 장비테스트, 메인화면(관리자모드) 정보 추가 
PressureData, SystemStatus,  클래스 추가
 2023-03-17 08:46:55 +09:00
Seonjae 26a2aed149 메인화면 컨셉 디자인 추가 2023-03-13 09:50:04 +09:00