Skip to content

G
GC_Branch
Commit f763039e authored by leon.huang's avatar leon.huang
Browse files
Options

临时提交准备合并

parent a520cd62
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1368 additions and 476 deletions
GcDevicePc/MDIBase.en.resx
View file @ f763039e
...@@ -118,45 +118,6 @@ ...@@ -118,45 +118,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<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="UserMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>164, 25</value>
</data>
<data name="UserMainMenu.Text" xml:space="preserve">
<value>User Management</value>
</data>
<data name="SystemMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>76, 25</value>
</data>
<data name="SystemMainMenu.Text" xml:space="preserve">
<value>System</value>
</data>
<data name="SettingMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 25</value>
</data>
<data name="SettingMainMenu.Text" xml:space="preserve">
<value>Set up</value>
</data>
<data name="DataMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 25</value>
</data>
<data name="DataMainMenu.Text" xml:space="preserve">
<value>Data</value>
</data>
<data name="DebugMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>73, 25</value>
</data>
<data name="DebugMainMenu.Text" xml:space="preserve">
<value>Debug</value>
</data>
<data name="HelpMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>57, 25</value>
</data>
<data name="HelpMainMenu.Text" xml:space="preserve">
<value>Help</value>
</data>
<data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 29</value>
</data>
<data name="UserLoginMenu.Size" type="System.Drawing.Size, System.Drawing"> <data name="UserLoginMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>173, 26</value> <value>173, 26</value>
</data> </data>
...@@ -169,6 +130,12 @@ ...@@ -169,6 +130,12 @@
<data name="UserLogoutMenu.Text" xml:space="preserve"> <data name="UserLogoutMenu.Text" xml:space="preserve">
<value>User Logout</value> <value>User Logout</value>
</data> </data>
<data name="UserMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>164, 25</value>
</data>
<data name="UserMainMenu.Text" xml:space="preserve">
<value>User Management</value>
</data>
<data name="SystemStartMenu.Size" type="System.Drawing.Size, System.Drawing"> <data name="SystemStartMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>255, 26</value> <value>255, 26</value>
</data> </data>
...@@ -205,6 +172,12 @@ ...@@ -205,6 +172,12 @@
<data name="sysconfigp.Text" xml:space="preserve"> <data name="sysconfigp.Text" xml:space="preserve">
<value>Option</value> <value>Option</value>
</data> </data>
<data name="SystemMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>76, 25</value>
</data>
<data name="SystemMainMenu.Text" xml:space="preserve">
<value>System</value>
</data>
<data name="NetWorkMenu.Size" type="System.Drawing.Size, System.Drawing"> <data name="NetWorkMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>275, 26</value> <value>275, 26</value>
</data> </data>
...@@ -244,6 +217,12 @@ ...@@ -244,6 +217,12 @@
<data name="GCConfigMenuItem.Text" xml:space="preserve"> <data name="GCConfigMenuItem.Text" xml:space="preserve">
<value>Instrument Configuration</value> <value>Instrument Configuration</value>
</data> </data>
<data name="SettingMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 25</value>
</data>
<data name="SettingMainMenu.Text" xml:space="preserve">
<value>Set up</value>
</data>
<data name="HistoryDataMenu.Size" type="System.Drawing.Size, System.Drawing"> <data name="HistoryDataMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>204, 26</value> <value>204, 26</value>
</data> </data>
...@@ -262,6 +241,12 @@ ...@@ -262,6 +241,12 @@
<data name="HistoryPicMenu.Text" xml:space="preserve"> <data name="HistoryPicMenu.Text" xml:space="preserve">
<value>Data Analysis</value> <value>Data Analysis</value>
</data> </data>
<data name="DataMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 25</value>
</data>
<data name="DataMainMenu.Text" xml:space="preserve">
<value>Data</value>
</data>
<data name="testToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="testToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>131, 26</value> <value>131, 26</value>
</data> </data>
...@@ -283,6 +268,12 @@ ...@@ -283,6 +268,12 @@
<data name="取消ToolStripMenuItem.Text" xml:space="preserve"> <data name="取消ToolStripMenuItem.Text" xml:space="preserve">
<value>Cancel</value> <value>Cancel</value>
</data> </data>
<data name="DebugMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>73, 25</value>
</data>
<data name="DebugMainMenu.Text" xml:space="preserve">
<value>Debug</value>
</data>
<data name="AboutMenu.Size" type="System.Drawing.Size, System.Drawing"> <data name="AboutMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>221, 26</value> <value>221, 26</value>
</data> </data>
...@@ -313,14 +304,23 @@ ...@@ -313,14 +304,23 @@
<data name="说明ToolStripMenuItem.Text" xml:space="preserve"> <data name="说明ToolStripMenuItem.Text" xml:space="preserve">
<value>Remarks</value> <value>Remarks</value>
</data> </data>
<data name="邮箱ToolStripMenuItem.Text" xml:space="preserve">
<value>E-mail：tetvoc@126.com</value>
</data>
<data name="反馈ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="反馈ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>221, 26</value> <value>221, 26</value>
</data> </data>
<data name="反馈ToolStripMenuItem.Text" xml:space="preserve"> <data name="反馈ToolStripMenuItem.Text" xml:space="preserve">
<value>Feedback</value> <value>Feedback</value>
</data> </data>
<data name="邮箱ToolStripMenuItem.Text" xml:space="preserve"> <data name="HelpMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>E-mail：tetvoc@126.com</value> <value>57, 25</value>
</data>
<data name="HelpMainMenu.Text" xml:space="preserve">
<value>Help</value>
</data>
<data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 29</value>
</data> </data>
<data name="toolStripStatusLabelusertime.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolStripStatusLabelusertime.Size" type="System.Drawing.Size, System.Drawing">
<value>400, 27</value> <value>400, 27</value>
......
GcDevicePc/MDIBase.resx
View file @ f763039e
This diff is collapsed.
GcDevicePc/Program.cs
View file @ f763039e
...@@ -23,6 +23,11 @@ namespace GcDevicePc ...@@ -23,6 +23,11 @@ namespace GcDevicePc
{ {
if (createNew) if (createNew)
{ {
string Language = System.Threading.Thread.CurrentThread.CurrentCulture.Name;
if(Language.Contains("en"))
{
Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("en");
}
//Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("en"); //Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("en");
Application.Run(new StartForm()); Application.Run(new StartForm());
mutex.ReleaseMutex(); mutex.ReleaseMutex();
......
VocsSetup/GC_User/Logs/HmiLog_20201024.txt
View file @ f763039e
...@@ -219,3 +219,24 @@ Record Time ...@@ -219,3 +219,24 @@ Record Time
Record Time：2020-10-24 15:24:45,254 Info： HMI空闲 Record Time：2020-10-24 15:24:45,254 Info： HMI空闲
Record Time：2020-10-24 15:24:45,254 Info：点火状态:未点火 FID:-0.153 Record Time：2020-10-24 15:24:45,254 Info：点火状态:未点火 FID:-0.153
Record Time：2020-10-24 15:24:45,254 Info：前进样口:26.40 / 30柱箱:30.27 / 30前检测:24.82 / 150中检测:23.39 / 0 Record Time：2020-10-24 15:24:45,254 Info：前进样口:26.40 / 30柱箱:30.27 / 30前检测:24.82 / 150中检测:23.39 / 0
Record Time：2020-10-24 15:34:47,927 Info： HMI空闲
Record Time：2020-10-24 15:34:47,934 Info：点火状态:未点火 FID:-0.112
Record Time：2020-10-24 15:34:47,934 Info：前进样口:26.46 / 30柱箱:26.36 / 30前检测:24.96 / 150中检测:24.47 / 0
Record Time：2020-10-24 15:35:47,924 Info： HMI空闲
Record Time：2020-10-24 15:35:47,924 Info：点火状态:未点火 FID:-0.120
Record Time：2020-10-24 15:35:47,924 Info：前进样口:26.42 / 30柱箱:26.75 / 30前检测:24.95 / 150中检测:24.47 / 0
Record Time：2020-10-24 15:36:47,925 Info： HMI空闲
Record Time：2020-10-24 15:36:47,925 Info：点火状态:未点火 FID:-0.125
Record Time：2020-10-24 15:36:47,925 Info：前进样口:26.40 / 30柱箱:27.10 / 30前检测:24.95 / 150中检测:24.47 / 0
Record Time：2020-10-24 17:17:33,396 Info： HMI空闲
Record Time：2020-10-24 17:17:33,409 Info：点火状态:未点火 FID:-0.156
Record Time：2020-10-24 17:17:33,409 Info：前进样口:24.27 / 30柱箱:24.08 / 30前检测:23.75 / 150中检测:24.47 / 0
Record Time：2020-10-24 17:21:53,841 Info： HMI空闲
Record Time：2020-10-24 17:21:53,846 Info：点火状态:未点火 FID:-0.156
Record Time：2020-10-24 17:21:53,846 Info：前进样口:24.24 / 30柱箱:24.01 / 30前检测:23.71 / 150中检测:24.47 / 0
Record Time：2020-10-24 17:22:53,840 Info： HMI空闲
Record Time：2020-10-24 17:22:53,840 Info：点火状态:未点火 FID:-0.156
Record Time：2020-10-24 17:22:53,840 Info：前进样口:24.24 / 30柱箱:24.01 / 30前检测:23.71 / 150中检测:24.47 / 0
Record Time：2020-10-24 17:23:53,839 Info： HMI空闲
Record Time：2020-10-24 17:23:53,839 Info：点火状态:未点火 FID:-0.155
Record Time：2020-10-24 17:23:53,839 Info：前进样口:24.23 / 30柱箱:24.05 / 30前检测:23.70 / 150中检测:24.47 / 0
VocsSetup/GC_User/Logs/InfoLog_20201024.txt
View file @ f763039e
This diff is collapsed.
VocsSetup/GC_User/Operation Log/ErrLog/ErrLog_20201024172405.txt 0 → 100644
View file @ f763039e
This source diff could not be displayed because it is too large. You can view the blob instead.
VocsSetup/GC_User/Operation Log/OperLog/OperLog.txt
View file @ f763039e
...@@ -195,3 +195,19 @@ ...@@ -195,3 +195,19 @@
【2020-10-24 15:24:47.4800】,服务器重启： 【2020-10-24 15:24:47.4800】,服务器重启：
【2020-10-24 15:25:32.4095】,服务器开始启动：192.168.2.50:12345 【2020-10-24 15:25:32.4095】,服务器开始启动：192.168.2.50:12345
【2020-10-24 15:25:59.4533】,服务器重启： 【2020-10-24 15:25:59.4533】,服务器重启：
【2020-10-24 15:29:00.5593】,服务器开始启动：192.168.2.50:12345
【2020-10-24 15:33:20.6443】,服务器开始启动：192.168.2.50:12345
【2020-10-24 15:33:47.8675】,服务器开始启动：192.168.2.50:12345
【2020-10-24 15:37:23.9480】,服务器重启：
【2020-10-24 15:39:10.4044】,服务器开始启动：192.168.2.50:12345
【2020-10-24 16:26:42.8996】,服务器开始启动：192.168.2.50:12345
【2020-10-24 16:28:10.2417】,服务器开始启动：192.168.2.50:12345
【2020-10-24 16:32:42.5557】,服务器开始启动：192.168.2.50:12345
【2020-10-24 16:36:41.7074】,服务器开始启动：192.168.2.50:12345
【2020-10-24 17:00:24.0259】,服务器开始启动：192.168.2.50:12345
【2020-10-24 17:15:26.4321】,服务器开始启动：192.168.2.50:12345
【2020-10-24 17:15:45.4961】,服务器重启：
【2020-10-24 17:16:33.3402】,服务器开始启动：192.168.2.50:12345
【2020-10-24 17:17:48.4081】,服务器重启：
【2020-10-24 17:20:53.7860】,服务器开始启动：192.168.2.50:12345
【2020-10-24 17:24:20.6522】,服务器重启：
dll/CKVocAlgorithm.dll
View file @ f763039e
No preview for this file type
dll/CKVocAnalyzer.dll
View file @ f763039e
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment