SJ84
/
INT_PT002
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: SJ84:4fc663c33bceaf358aeeb0ae71fafcdc33c6b304
Branches Tags
SJ84:main
..
compare: SJ84:6e0567cc2b0e27563ea2fddba542bae7df49f829
Branches Tags
SJ84:main

2 Commits
4fc663c33b ... 6e0567cc2b

Author SHA1 Message Date
DESKTOP-999R8N3\CJY 6e0567cc2b Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 2024-04-19 11:29:56 +09:00
DESKTOP-999R8N3\CJY c2213b4193 버그 수정 중 2024-04-19 11:29:47 +09:00
5 changed files with 81 additions and 66 deletions
Show Stats Expand all files Collapse all files

24
INT_PT002/Controls/User/ControlMenuUserUserEditor.cs
View File

@ -111,10 +111,9 @@ namespace INT_PT002.Controls
this.labelIDBackGround.BackGroundColor = Color.Silver;
}
}
private void SetEnablePassword(bool value)
private void SetEnablePasswordTextBox(bool value)
{
this.textBoxPassword.Enabled = value;
this.buttonPasswordReset.Enabled = value;
if (value == true)
{
@ -508,7 +507,7 @@ namespace INT_PT002.Controls
this.KeyboardClose();
this.SetEnableID(true);
this.SetEnablePassword(false);
this.SetEnablePasswordTextBox(false);
this.SetEnableLevelButton(true);
this.buttonDelete.Visible = false;
@ -658,9 +657,15 @@ namespace INT_PT002.Controls
if (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.Admin
|| this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.Developer)
this.SetEnablePassword(true);
{
this.SetEnablePasswordTextBox(true);
this.buttonPasswordReset.Enabled = true;
}
else
this.SetEnablePassword(false);
{
this.SetEnablePasswordTextBox(false);
this.buttonPasswordReset.Enabled = false;
}
}
else
{
@ -719,12 +724,14 @@ namespace INT_PT002.Controls
this.SetEnableLevelButton(false);
this.SetEnableExpireDate(false);
this.SetEnablePassword(false);
this.SetEnablePasswordTextBox(false);
this.buttonPasswordReset.Enabled = false;
}
else
{
this.SetEnableLevelButton(true);
this.SetEnableExpireDate(true);
this.buttonPasswordReset.Enabled = true;
}
}
@ -978,7 +985,8 @@ namespace INT_PT002.Controls
int index = this.listBoxUserList.SelectItemIndex;
this.IsNew = false;
this.SetEnablePassword(false);
this.SetEnablePasswordTextBox(false);
this.buttonPasswordReset.Enabled = false;
//this.labelAutomaticLogoutTime.Enabled = true;
this.buttonSave.Visible = false;
if (this.buttonPasswordReset.ButtonText != "Reset")
@ -987,7 +995,7 @@ namespace INT_PT002.Controls
if (index == 0)
{
UserManager.UserManager_GetUserListID(this.listBoxUserList.Items[index].ToString());
this.SetEnablePassword(true);
this.SetEnablePasswordTextBox(true);
this.buttonPasswordReset.ButtonText = "Edit";
}
else if (index < 0)

3
INT_PT002/Forms/FormMain.cs
View File

@ -1577,6 +1577,7 @@ namespace INT_PT002.Forms
// 화면 표시
this.ChildFormMainDisplay.UpdateDisplayJudgmentData10(this.CurrentLeakDatas[9]);
this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData10(this.CurrentLeakDatas[9]);
this.ChildFormMainDisplay.UpdateDisplayJudgmentTrackingData(this.CurrentLeakData);
#endregion
break;
case "Z":
@ -1701,6 +1702,8 @@ namespace INT_PT002.Forms
break;
}
this.Update30000ModbusItem();
}
catch
{

38
INT_PT002/Forms/FormMainDisplay3.Designer.cs generated
View File

@ -32,8 +32,8 @@
this.smartForm1 = new SmartX.SmartForm();
this.pictureBoxProgress0_2 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2_910 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2_67 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2_8 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2_6 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2_78 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress1 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress3 = new System.Windows.Forms.PictureBox();
@ -155,8 +155,8 @@
this.smartForm1.CenterLocation = false;
this.smartForm1.Controls.Add(this.pictureBoxProgress0_2);
this.smartForm1.Controls.Add(this.pictureBoxProgress2_910);
this.smartForm1.Controls.Add(this.pictureBoxProgress2_67);
this.smartForm1.Controls.Add(this.pictureBoxProgress2_8);
this.smartForm1.Controls.Add(this.pictureBoxProgress2_6);
this.smartForm1.Controls.Add(this.pictureBoxProgress2_78);
this.smartForm1.Controls.Add(this.pictureBoxProgress2);
this.smartForm1.Controls.Add(this.pictureBoxProgress1);
this.smartForm1.Controls.Add(this.pictureBoxProgress3);
@ -288,22 +288,22 @@
this.pictureBoxProgress2_910.Name = "pictureBoxProgress2_910";
this.pictureBoxProgress2_910.Size = new System.Drawing.Size(190, 140);
//
// pictureBoxProgress2_67
// pictureBoxProgress2_6
//
this.pictureBoxProgress2_67.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38)))));
this.pictureBoxProgress2_67.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxProgress2_67.Image")));
this.pictureBoxProgress2_67.Location = new System.Drawing.Point(336, 549);
this.pictureBoxProgress2_67.Name = "pictureBoxProgress2_67";
this.pictureBoxProgress2_67.Size = new System.Drawing.Size(190, 140);
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38)))));
this.pictureBoxProgress2_6.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxProgress2_6.Image")));
this.pictureBoxProgress2_6.Location = new System.Drawing.Point(336, 549);
this.pictureBoxProgress2_6.Name = "pictureBoxProgress2_6";
this.pictureBoxProgress2_6.Size = new System.Drawing.Size(190, 140);
this.pictureBoxProgress2_6.Visible = false;
//
// pictureBoxProgress2_8
// pictureBoxProgress2_78
//
this.pictureBoxProgress2_8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38)))));
this.pictureBoxProgress2_8.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxProgress2_8.Image")));
this.pictureBoxProgress2_8.Location = new System.Drawing.Point(336, 549);
this.pictureBoxProgress2_8.Name = "pictureBoxProgress2_8";
this.pictureBoxProgress2_8.Size = new System.Drawing.Size(190, 140);
this.pictureBoxProgress2_78.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38)))));
this.pictureBoxProgress2_78.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxProgress2_78.Image")));
this.pictureBoxProgress2_78.Location = new System.Drawing.Point(336, 549);
this.pictureBoxProgress2_78.Name = "pictureBoxProgress2_78";
this.pictureBoxProgress2_78.Size = new System.Drawing.Size(190, 140);
//
// pictureBoxProgress2
//
@ -2815,8 +2815,8 @@
private SmartX.SmartLabel labelNumber7;
private SmartX.SmartLabel labelNumber6;
private SmartX.SmartLabel labelNumber5;
private System.Windows.Forms.PictureBox pictureBoxProgress2_67;
private System.Windows.Forms.PictureBox pictureBoxProgress2_8;
private System.Windows.Forms.PictureBox pictureBoxProgress2_6;
private System.Windows.Forms.PictureBox pictureBoxProgress2_78;
private System.Windows.Forms.PictureBox pictureBoxProgress2_910;
private System.Windows.Forms.PictureBox pictureBoxProgress0_2;
private SmartX.SmartTimer smartTimerTest;

78
INT_PT002/Forms/FormMainDisplay3.cs
View File

@ -848,8 +848,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -859,8 +859,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.BringToFront();
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -871,8 +871,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress1_34.Visible = true;
this.pictureBoxProgress1_34.BringToFront();
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -882,8 +882,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = true;
this.pictureBoxProgress2_5.BringToFront();
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -893,9 +893,9 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = true;
this.pictureBoxProgress2_67.BringToFront();
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = true;
this.pictureBoxProgress2_6.BringToFront();
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -904,9 +904,9 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = true;
this.pictureBoxProgress2_8.BringToFront();
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = true;
this.pictureBoxProgress2_78.BringToFront();
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -916,8 +916,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = true;
this.pictureBoxProgress2_910.BringToFront();
this.pictureBoxProgress3_11.Visible = false;
@ -927,8 +927,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = true;
this.pictureBoxProgress3_11.BringToFront();
@ -1033,8 +1033,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -1047,8 +1047,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.BringToFront();
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -1061,8 +1061,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress1_34.Visible = true;
this.pictureBoxProgress1_34.BringToFront();
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -1074,25 +1074,25 @@ namespace INT_PT002.Forms
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = true;
this.pictureBoxProgress2_5.BringToFront();
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
case Define.E_ProcessStatus._6_VacuumStart:
case Define.E_ProcessStatus._7_VacuumHold:
this.ProcessStatusStep3(status);
this.pictureBoxProgress0_1.Visible = false;
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = true;
this.pictureBoxProgress2_67.BringToFront();
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = true;
this.pictureBoxProgress2_6.BringToFront();
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
case Define.E_ProcessStatus._7_VacuumHold:
case Define.E_ProcessStatus._8_Judgment:
this.ProcessStatusStep3(status);
@ -1100,9 +1100,9 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = true;
this.pictureBoxProgress2_8.BringToFront();
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = true;
this.pictureBoxProgress2_78.BringToFront();
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -1114,8 +1114,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = true;
this.pictureBoxProgress2_910.BringToFront();
this.pictureBoxProgress3_11.Visible = false;
@ -1127,8 +1127,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = true;
this.pictureBoxProgress3_11.BringToFront();
@ -1513,6 +1513,10 @@ namespace INT_PT002.Forms
this.CollectionLabelResult[9].Visible = true;
}
}
public void UpdateDisplayJudgmentTrackingData(LeakData datas)
{
this.ParentForm.TrackingInspectionData(datas);
}
public void UpdateDisplayRecipeData(Recipe data)
{

4
INT_PT002/Forms/FormMainDisplay3.resx
View File

@ -1478,7 +1478,7 @@
VW+RVtFZ1Rvp3OT/A154OgKoXZtMAAAAAElFTkSuQmCC
</value>
</data>
<data name="pictureBoxProgress2_67.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="pictureBoxProgress2_6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAL4AAACMCAIAAABNpIRsAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@ -1911,7 +1911,7 @@
R1d4vN8pAAAAAABJRU5ErkJggg==
</value>
</data>
<data name="pictureBoxProgress2_8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="pictureBoxProgress2_78.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAL4AAACMCAIAAABNpIRsAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp