From cd7c9e15bc51e65be0b456129d7d380667b9351e Mon Sep 17 00:00:00 2001 From: yantian yue <306727702@qq.com> Date: 星期五, 29 十二月 2023 12:47:39 +0800 Subject: [PATCH] 更新 --- YX/obj/Debug/YX.csproj.AssemblyReference.cache | 0 YX/wt/Frmwt.cs | 17 +++++++---------- YX/obj/Debug/YX.exe | 0 YX/bin/Debug/YX.exe | 0 .vs/YX/v16/.suo | 0 YX/obj/Debug/YX.pdb | 0 YX/bin/Debug/YX.pdb | 0 YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache | 0 8 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.vs/YX/v16/.suo b/.vs/YX/v16/.suo index ad0ff8b..4deea29 100644 --- a/.vs/YX/v16/.suo +++ b/.vs/YX/v16/.suo Binary files differ diff --git a/YX/bin/Debug/YX.exe b/YX/bin/Debug/YX.exe index ef40b75..bbb01cd 100644 --- a/YX/bin/Debug/YX.exe +++ b/YX/bin/Debug/YX.exe Binary files differ diff --git a/YX/bin/Debug/YX.pdb b/YX/bin/Debug/YX.pdb index 0cc5b54..b9fedcc 100644 --- a/YX/bin/Debug/YX.pdb +++ b/YX/bin/Debug/YX.pdb Binary files differ diff --git a/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 117af10..63094c9 100644 --- a/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/YX/obj/Debug/YX.csproj.AssemblyReference.cache b/YX/obj/Debug/YX.csproj.AssemblyReference.cache index f5e894a..615d88d 100644 --- a/YX/obj/Debug/YX.csproj.AssemblyReference.cache +++ b/YX/obj/Debug/YX.csproj.AssemblyReference.cache Binary files differ diff --git a/YX/obj/Debug/YX.exe b/YX/obj/Debug/YX.exe index ef40b75..bbb01cd 100644 --- a/YX/obj/Debug/YX.exe +++ b/YX/obj/Debug/YX.exe Binary files differ diff --git a/YX/obj/Debug/YX.pdb b/YX/obj/Debug/YX.pdb index 0cc5b54..b9fedcc 100644 --- a/YX/obj/Debug/YX.pdb +++ b/YX/obj/Debug/YX.pdb Binary files differ diff --git a/YX/wt/Frmwt.cs b/YX/wt/Frmwt.cs index 1871bba..31a0d79 100644 --- a/YX/wt/Frmwt.cs +++ b/YX/wt/Frmwt.cs @@ -49,7 +49,7 @@ { Console.WriteLine($"鍙戠敓閿欒锛歿ex}"); } - dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "绉伴噸"); + dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "鍥涚爜鍚堜竴"); macBox.Text = GetMacByNetworkInterface(); } @@ -59,16 +59,13 @@ while (true) { ProcessDelegate showProcess = new ProcessDelegate(LabelShow); - //string str = "1\n2\n3\n"; - //str = str.Replace("\n", string.Empty); // 灏� \n 鏇挎崲涓虹┖瀛楃涓� string str = ModbusTCPRead(5, 1).Trim("\n".ToCharArray()); if (ModbusTCPRead(5, 1).Trim("\n".ToCharArray()) == "1") { try { - //PSN = ModbusTCPRead(5, 20).Replace("\n", string.Empty); - PSN = ModbusTCPReadString(25, 30).Replace("\0", string.Empty); + PSN = ModbusTCPReadString(25, 30).Replace("\0", string.Empty); //灏哱0鏇挎崲涓虹┖瀛楃涓� PSN2 = ModbusTCPReadString(45, 20).Replace("\0", string.Empty); PSN3 = ModbusTCPReadString(65, 20).Replace("\0", string.Empty); label1.Invoke(showProcess); @@ -237,7 +234,7 @@ CreateUserName = FrmLogin.loginUserName, LocalIP = FrmLogin.LocalIP, LogMessage = "WI6027璋冪敤澶辫触锛�", - Type = "绉伴噸", + Type = "鍥涚爜鍚堜竴", ClassName = typeof(FrmLogin).ToString() }); return; @@ -268,7 +265,7 @@ } } } - dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "绉伴噸"); + dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "鍥涚爜鍚堜竴"); Refresh(); } @@ -350,7 +347,7 @@ CreateUserName = FrmLogin.loginUserName, LocalIP = FrmLogin.LocalIP, LogMessage = "WI601K鎺ュ彛璋冪敤澶辫触锛�" + jo["content"].ToString(), - Type = "绉伴噸", + Type = "鍥涚爜鍚堜竴", ClassName = typeof(FrmLogin).ToString() }); return false; @@ -381,7 +378,7 @@ CreateUserName = FrmLogin.loginUserName, LocalIP = FrmLogin.LocalIP, LogMessage = "WI1032鎺ュ彛璋冪敤澶辫触锛�" + jo["content"].ToString(), - Type = "绉伴噸", + Type = "鍥涚爜鍚堜竴", ClassName = typeof(FrmLogin).ToString() }); return null; @@ -438,7 +435,7 @@ CreateUserName = FrmLogin.loginUserName, LocalIP = FrmLogin.LocalIP, LogMessage = "WI6041鎺ュ彛璋冪敤澶辫触锛�" + jo["content"].ToString(), - Type = "绉伴噸", + Type = "鍥涚爜鍚堜竴", ClassName = typeof(FrmLogin).ToString() }); return false; -- Gitblit v1.9.3