25111502 调整进度条显示;添加单产品测试总时长显示;添加密码;MES接口待改
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -3,11 +3,11 @@
|
|||||||
"WorkspaceRootPath": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\",
|
"WorkspaceRootPath": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\",
|
||||||
"Documents": [
|
"Documents": [
|
||||||
{
|
{
|
||||||
"AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
|
"AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
|
||||||
"RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
|
"RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
"AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||||
"RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
"RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -200,9 +200,6 @@
|
|||||||
{
|
{
|
||||||
"AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\configini.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
"AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\configini.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||||
"RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\configini.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
"RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\configini.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||||
},
|
|
||||||
{
|
|
||||||
"AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\||{B270807C-D8C6-49EB-8EBE-8E8D566637A1}|5e9a8ac2-4f34-4521-858f-4c248ba31532"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"DocumentGroupContainers": [
|
"DocumentGroupContainers": [
|
||||||
@@ -214,6 +211,10 @@
|
|||||||
"DockedWidth": 396,
|
"DockedWidth": 396,
|
||||||
"SelectedChildIndex": 14,
|
"SelectedChildIndex": 14,
|
||||||
"Children": [
|
"Children": [
|
||||||
|
{
|
||||||
|
"$type": "Bookmark",
|
||||||
|
"Name": "ST:0:0:{5a4e9529-b6a0-46b5-be4f-0f0b239bc0eb}"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"$type": "Document",
|
"$type": "Document",
|
||||||
"DocumentIndex": 1,
|
"DocumentIndex": 1,
|
||||||
@@ -256,18 +257,6 @@
|
|||||||
"$type": "Bookmark",
|
"$type": "Bookmark",
|
||||||
"Name": "ST:254354193:0:{71f361cc-493f-47c0-923f-f2570b6f8618}"
|
"Name": "ST:254354193:0:{71f361cc-493f-47c0-923f-f2570b6f8618}"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"$type": "Document",
|
|
||||||
"DocumentIndex": 5,
|
|
||||||
"Title": "yiqiParam.cs",
|
|
||||||
"DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\yiqiParam.cs",
|
|
||||||
"RelativeDocumentMoniker": "SLC1-N\\yiqiParam.cs",
|
|
||||||
"ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\yiqiParam.cs",
|
|
||||||
"RelativeToolTip": "SLC1-N\\yiqiParam.cs",
|
|
||||||
"ViewState": "AQIAAJEAAAAAAAAAAAAUwKIAAAAoAAAA",
|
|
||||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
|
||||||
"WhenOpened": "2025-11-13T10:34:02.056Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"$type": "Document",
|
"$type": "Document",
|
||||||
"DocumentIndex": 16,
|
"DocumentIndex": 16,
|
||||||
@@ -299,8 +288,7 @@
|
|||||||
"ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\SLC1-N.csproj",
|
"ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\SLC1-N.csproj",
|
||||||
"RelativeToolTip": "SLC1-N\\SLC1-N.csproj",
|
"RelativeToolTip": "SLC1-N\\SLC1-N.csproj",
|
||||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
|
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
|
||||||
"WhenOpened": "2025-11-11T02:49:54.535Z",
|
"WhenOpened": "2025-11-11T02:49:54.535Z"
|
||||||
"EditorCaption": ""
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"$type": "Document",
|
"$type": "Document",
|
||||||
@@ -311,8 +299,7 @@
|
|||||||
"ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Electricity.cs [\u8BBE\u8BA1]",
|
"ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Electricity.cs [\u8BBE\u8BA1]",
|
||||||
"RelativeToolTip": "SLC1-N\\Electricity.cs [\u8BBE\u8BA1]",
|
"RelativeToolTip": "SLC1-N\\Electricity.cs [\u8BBE\u8BA1]",
|
||||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||||
"WhenOpened": "2025-08-18T01:03:21.678Z",
|
"WhenOpened": "2025-08-18T01:03:21.678Z"
|
||||||
"EditorCaption": " [\u8BBE\u8BA1]"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"$type": "Document",
|
"$type": "Document",
|
||||||
@@ -324,8 +311,7 @@
|
|||||||
"RelativeToolTip": "SLC1-N\\Electricity.cs",
|
"RelativeToolTip": "SLC1-N\\Electricity.cs",
|
||||||
"ViewState": "AQIAAGIBAAAAAAAAAAAuwI8BAABdAAAA",
|
"ViewState": "AQIAAGIBAAAAAAAAAAAuwI8BAABdAAAA",
|
||||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||||
"WhenOpened": "2025-10-30T02:55:49.085Z",
|
"WhenOpened": "2025-10-30T02:55:49.085Z"
|
||||||
"EditorCaption": ""
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"$type": "Document",
|
"$type": "Document",
|
||||||
@@ -340,8 +326,16 @@
|
|||||||
"EditorCaption": " [\u8BBE\u8BA1]"
|
"EditorCaption": " [\u8BBE\u8BA1]"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"$type": "Bookmark",
|
"$type": "Document",
|
||||||
"Name": "ST:0:0:{5a4e9529-b6a0-46b5-be4f-0f0b239bc0eb}"
|
"DocumentIndex": 5,
|
||||||
|
"Title": "yiqiParam.cs",
|
||||||
|
"DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\yiqiParam.cs",
|
||||||
|
"RelativeDocumentMoniker": "SLC1-N\\yiqiParam.cs",
|
||||||
|
"ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\yiqiParam.cs",
|
||||||
|
"RelativeToolTip": "SLC1-N\\yiqiParam.cs",
|
||||||
|
"ViewState": "AQIAAJEAAAAAAAAAAAAUwKIAAAAoAAAA",
|
||||||
|
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||||
|
"WhenOpened": "2025-11-13T10:34:02.056Z"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"$type": "Document",
|
"$type": "Document",
|
||||||
@@ -353,8 +347,7 @@
|
|||||||
"RelativeToolTip": "SLC1-N\\Electricity.Designer.cs",
|
"RelativeToolTip": "SLC1-N\\Electricity.Designer.cs",
|
||||||
"ViewState": "AQIAANMCAAAAAAAAAAA1wOoCAAAAAAAA",
|
"ViewState": "AQIAANMCAAAAAAAAAAA1wOoCAAAAAAAA",
|
||||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||||
"WhenOpened": "2025-10-28T09:46:39.581Z",
|
"WhenOpened": "2025-10-28T09:46:39.581Z"
|
||||||
"EditorCaption": ""
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"$type": "Document",
|
"$type": "Document",
|
||||||
|
|||||||
1418
SLC1-N/Form1.Designer.cs
generated
1418
SLC1-N/Form1.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
@@ -1340,6 +1340,18 @@ namespace SLC1_N
|
|||||||
return CH1yiqiParam_P;
|
return CH1yiqiParam_P;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 记录开始时间
|
||||||
|
private DateTime CH1start_time;
|
||||||
|
private DateTime CH2start_time;
|
||||||
|
private DateTime CH3start_time;
|
||||||
|
private DateTime CH4start_time;
|
||||||
|
|
||||||
|
// 是否刷新启动时间标志位
|
||||||
|
private bool bool_CH1start_time = false;
|
||||||
|
private bool bool_CH2start_time = false;
|
||||||
|
private bool bool_CH3start_time = false;
|
||||||
|
private bool bool_CH4start_time = false;
|
||||||
|
|
||||||
// 通道1状态机
|
// 通道1状态机
|
||||||
public void CH1machine()
|
public void CH1machine()
|
||||||
{
|
{
|
||||||
@@ -1361,6 +1373,8 @@ namespace SLC1_N
|
|||||||
CH1testCount = 0; // 重置测试次数
|
CH1testCount = 0; // 重置测试次数
|
||||||
CH1TestRecord.Reset();
|
CH1TestRecord.Reset();
|
||||||
|
|
||||||
|
bool_CH1start_time = false;
|
||||||
|
|
||||||
// 模式切回正压
|
// 模式切回正压
|
||||||
//CH1NowMode = "正压";
|
//CH1NowMode = "正压";
|
||||||
//LL28CH1client.writeRegisters(1006, GetYiqiParam(1, "P").GetArray());
|
//LL28CH1client.writeRegisters(1006, GetYiqiParam(1, "P").GetArray());
|
||||||
@@ -1375,8 +1389,16 @@ namespace SLC1_N
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (int)yiqi.prepare:
|
case (int)yiqi.prepare:
|
||||||
{
|
{
|
||||||
|
if (bool_CH1start_time == false)
|
||||||
|
{
|
||||||
|
bool_CH1start_time = true;
|
||||||
|
|
||||||
|
CH1start_time = DateTime.Now;
|
||||||
|
SetLabelText(lb_CH1testTime, $"");
|
||||||
|
}
|
||||||
|
|
||||||
// 准备超时处理
|
// 准备超时处理
|
||||||
if (!prepareOutTime_Dictionary.ContainsKey(1))
|
if (!prepareOutTime_Dictionary.ContainsKey(1))
|
||||||
{
|
{
|
||||||
@@ -1658,9 +1680,13 @@ namespace SLC1_N
|
|||||||
1, result, tb_CH1Code.Text, "");
|
1, result, tb_CH1Code.Text, "");
|
||||||
|
|
||||||
// 测试完成并且正负压都完成则视为结束
|
// 测试完成并且正负压都完成则视为结束
|
||||||
if (testfinish && PorNfinish)
|
if (testfinish && PorNfinish)
|
||||||
{
|
{
|
||||||
if(result)
|
bool_CH1start_time = false;
|
||||||
|
int time = (DateTime.Now - CH1start_time).Seconds;
|
||||||
|
SetLabelText(lb_CH1testTime, $"{time} s");
|
||||||
|
|
||||||
|
if (result)
|
||||||
{
|
{
|
||||||
m_production.AddOK();
|
m_production.AddOK();
|
||||||
}
|
}
|
||||||
@@ -1738,6 +1764,8 @@ namespace SLC1_N
|
|||||||
CH2testCount = 0; // 重置测试次数
|
CH2testCount = 0; // 重置测试次数
|
||||||
CH2TestRecord.Reset();
|
CH2TestRecord.Reset();
|
||||||
|
|
||||||
|
bool_CH2start_time = false;
|
||||||
|
|
||||||
// 模式切回正压
|
// 模式切回正压
|
||||||
//CH2NowMode = "正压";
|
//CH2NowMode = "正压";
|
||||||
//LL28CH2client.writeRegisters(1006, GetYiqiParam(2, "P").GetArray());
|
//LL28CH2client.writeRegisters(1006, GetYiqiParam(2, "P").GetArray());
|
||||||
@@ -1753,6 +1781,14 @@ namespace SLC1_N
|
|||||||
|
|
||||||
case (int)yiqi.prepare:
|
case (int)yiqi.prepare:
|
||||||
{
|
{
|
||||||
|
if (bool_CH2start_time == false)
|
||||||
|
{
|
||||||
|
bool_CH2start_time = true;
|
||||||
|
|
||||||
|
CH2start_time = DateTime.Now;
|
||||||
|
SetLabelText(lb_CH2testTime, $"");
|
||||||
|
}
|
||||||
|
|
||||||
// 准备超时处理
|
// 准备超时处理
|
||||||
if (!prepareOutTime_Dictionary.ContainsKey(2))
|
if (!prepareOutTime_Dictionary.ContainsKey(2))
|
||||||
{
|
{
|
||||||
@@ -2036,6 +2072,10 @@ namespace SLC1_N
|
|||||||
// 测试完成并且正负压都完成则视为结束
|
// 测试完成并且正负压都完成则视为结束
|
||||||
if (testfinish && PorNfinish)
|
if (testfinish && PorNfinish)
|
||||||
{
|
{
|
||||||
|
bool_CH2start_time = false;
|
||||||
|
int time = (DateTime.Now - CH2start_time).Seconds;
|
||||||
|
SetLabelText(lb_CH2testTime, $"{time} s");
|
||||||
|
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
m_production.AddOK();
|
m_production.AddOK();
|
||||||
@@ -2114,6 +2154,8 @@ namespace SLC1_N
|
|||||||
CH3testCount = 0; // 重置测试次数
|
CH3testCount = 0; // 重置测试次数
|
||||||
CH2TestRecord.Reset();
|
CH2TestRecord.Reset();
|
||||||
|
|
||||||
|
bool_CH3start_time = false;
|
||||||
|
|
||||||
// 模式切回正压
|
// 模式切回正压
|
||||||
//CH3NowMode = "正压";
|
//CH3NowMode = "正压";
|
||||||
//LL28CH3client.writeRegisters(1006, GetYiqiParam(3, "P").GetArray());
|
//LL28CH3client.writeRegisters(1006, GetYiqiParam(3, "P").GetArray());
|
||||||
@@ -2129,6 +2171,14 @@ namespace SLC1_N
|
|||||||
|
|
||||||
case (int)yiqi.prepare:
|
case (int)yiqi.prepare:
|
||||||
{
|
{
|
||||||
|
if (bool_CH3start_time == false)
|
||||||
|
{
|
||||||
|
bool_CH3start_time = true;
|
||||||
|
|
||||||
|
CH3start_time = DateTime.Now;
|
||||||
|
SetLabelText(lb_CH3testTime, $"");
|
||||||
|
}
|
||||||
|
|
||||||
// 准备超时处理
|
// 准备超时处理
|
||||||
if (!prepareOutTime_Dictionary.ContainsKey(3))
|
if (!prepareOutTime_Dictionary.ContainsKey(3))
|
||||||
{
|
{
|
||||||
@@ -2413,6 +2463,10 @@ namespace SLC1_N
|
|||||||
// 测试完成并且正负压都完成则视为结束
|
// 测试完成并且正负压都完成则视为结束
|
||||||
if (testfinish && PorNfinish)
|
if (testfinish && PorNfinish)
|
||||||
{
|
{
|
||||||
|
bool_CH3start_time = false;
|
||||||
|
int time = (DateTime.Now - CH3start_time).Seconds;
|
||||||
|
SetLabelText(lb_CH3testTime, $"{time} s");
|
||||||
|
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
m_production.AddOK();
|
m_production.AddOK();
|
||||||
@@ -2491,6 +2545,8 @@ namespace SLC1_N
|
|||||||
CH4testCount = 0; // 重置测试次数
|
CH4testCount = 0; // 重置测试次数
|
||||||
CH4TestRecord.Reset();
|
CH4TestRecord.Reset();
|
||||||
|
|
||||||
|
bool_CH4start_time = false;
|
||||||
|
|
||||||
// 模式切回正压
|
// 模式切回正压
|
||||||
//CH4NowMode = "正压";
|
//CH4NowMode = "正压";
|
||||||
//LL28CH4client.writeRegisters(1006, GetYiqiParam(4, "P").GetArray());
|
//LL28CH4client.writeRegisters(1006, GetYiqiParam(4, "P").GetArray());
|
||||||
@@ -2506,6 +2562,14 @@ namespace SLC1_N
|
|||||||
|
|
||||||
case (int)yiqi.prepare:
|
case (int)yiqi.prepare:
|
||||||
{
|
{
|
||||||
|
if (bool_CH4start_time == false)
|
||||||
|
{
|
||||||
|
bool_CH4start_time = true;
|
||||||
|
|
||||||
|
CH4start_time = DateTime.Now;
|
||||||
|
SetLabelText(lb_CH4testTime, $"");
|
||||||
|
}
|
||||||
|
|
||||||
// 准备超时处理
|
// 准备超时处理
|
||||||
if (!prepareOutTime_Dictionary.ContainsKey(4))
|
if (!prepareOutTime_Dictionary.ContainsKey(4))
|
||||||
{
|
{
|
||||||
@@ -2792,6 +2856,10 @@ namespace SLC1_N
|
|||||||
// 测试完成并且正负压都完成则视为结束
|
// 测试完成并且正负压都完成则视为结束
|
||||||
if (testfinish && PorNfinish)
|
if (testfinish && PorNfinish)
|
||||||
{
|
{
|
||||||
|
bool_CH4start_time = false;
|
||||||
|
int time = (DateTime.Now - CH4start_time).Seconds;
|
||||||
|
SetLabelText(lb_CH4testTime, $"{time} s");
|
||||||
|
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
m_production.AddOK();
|
m_production.AddOK();
|
||||||
|
|||||||
@@ -184,7 +184,7 @@
|
|||||||
<value>1251, 47</value>
|
<value>1251, 47</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>141</value>
|
<value>59</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ namespace SLC1_N
|
|||||||
Timer1.Stop();
|
Timer1.Stop();
|
||||||
this.Close();
|
this.Close();
|
||||||
}
|
}
|
||||||
else if (Password.Text == userpassword3|| Password.Text == "123456")
|
else if (Password.Text == userpassword3 || Password.Text == "123456" || Password.Text == "8888")
|
||||||
{
|
{
|
||||||
Form1.f1.lb_User.Text = "超级管理员";
|
Form1.f1.lb_User.Text = "超级管理员";
|
||||||
Form1.f1.User = "超级管理员";
|
Form1.f1.User = "超级管理员";
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<ProjectGuid>{F7F71589-095A-45C2-975C-739BE2D1CE15}</ProjectGuid>
|
<ProjectGuid>{F7F71589-095A-45C2-975C-739BE2D1CE15}</ProjectGuid>
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<RootNamespace>SLC1_N</RootNamespace>
|
<RootNamespace>SLC1_N</RootNamespace>
|
||||||
<AssemblyName>LL28-C_V25111501</AssemblyName>
|
<AssemblyName>LL28-C_V25111502</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -708,9 +708,53 @@ D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Warni
|
|||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.GenerateResource.cache
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.GenerateResource.cache
|
||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.CoreCompileInputs.cache
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.CoreCompileInputs.cache
|
||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.Up2Date
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.Up2Date
|
||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111501.exe.config
|
|
||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111501.exe
|
|
||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111501.pdb
|
|
||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111501.exe
|
|
||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111501.pdb
|
|
||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.pdb
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.pdb
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\TCP\ITcpClient.cs
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\TCP\ITcpClient.Designer.cs
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\DocumentFormat.OpenXml.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\EasyModbus.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Guna.UI.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Guna.UI2.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\HslCommunication.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Newtonsoft.Json.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Spire.XLS.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\SunnyUI.Common.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\SunnyUI.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.pdb
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\EasyModbus.xml
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Newtonsoft.Json.xml
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.AssemblyReference.cache
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\Interop.ADOX.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.ResolveComReference.cache
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_Alarm.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_hbMESset.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_HQMESconfig.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_NetworkSet.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Electricity.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form1.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_PLC_Serialport.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_PLCcontrol.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_PLC_TCP.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_RootSet.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.LeakCompensate.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_LogOn.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_SaomaSet.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Properties.Resources.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_Save.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.UserManagement.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.UserPassword.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Warning.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.GenerateResource.cache
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.CoreCompileInputs.cache
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.CopyComplete
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.exe.config
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.exe
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.pdb
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111502.exe
|
||||||
|
D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111502.pdb
|
||||||
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.exe.config
|
||||||
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.exe
|
||||||
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.pdb
|
||||||
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111502.exe
|
||||||
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111502.pdb
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -167,3 +167,12 @@ D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Deb
|
|||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.csproj.CoreCompileInputs.cache
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.csproj.CoreCompileInputs.cache
|
||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.dll
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.dll
|
||||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.pdb
|
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.pdb
|
||||||
|
D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\bin\Debug\TCP\ITcpClient.cs
|
||||||
|
D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\bin\Debug\TCP\ITcpClient.Designer.cs
|
||||||
|
D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\bin\Debug\NetWorkHelper.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\bin\Debug\NetWorkHelper.pdb
|
||||||
|
D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.AxUdpClient.resources
|
||||||
|
D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.csproj.GenerateResource.cache
|
||||||
|
D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.csproj.CoreCompileInputs.cache
|
||||||
|
D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.dll
|
||||||
|
D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.pdb
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user