diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index c5a8d0a..a9ecaaa 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -177,6 +177,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 ClothWheel 的本地化字符串。 + /// + public static string ClothWheel { + get { + return ResourceManager.GetString("ClothWheel", resourceCulture); + } + } + /// /// 查找类似 Code 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 24f2eb0..add87b7 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -459,4 +459,7 @@ Low-water level + + Cloth Wheel + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 24a3672..aeaa92d 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -459,4 +459,7 @@ Low-water level + + ClothWheel + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index dc7435c..fd29129 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -459,4 +459,7 @@ 低水位 + + 布轮 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index dde1e19..41d91f3 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -447,4 +447,19 @@ 主缸 + + 比例控制 + + + 中水位 + + + 高水位 + + + 低水位 + + + 布輪 + \ No newline at end of file diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 7dc6175..368a002 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -930,12 +930,15 @@ namespace DyeingComputer.ViewModel } if (Pump_M) //主泵状态 { - Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1030"))) + "% => [" + Resources.PumpStart+"]";//主泵状态 + Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1020"))) + "% => [" + Resources.PumpStart+"]";//主泵状态 } else { - Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1030"))) + "% => [" + Resources.PumpStops+"]";//主泵状态 + Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1020"))) + "% => [" + Resources.PumpStops+"]";//主泵状态 } + Sys_log = Sys_log + "\n-------------------------------------------------------"; + Sys_log = Sys_log + "\n" + Resources.ClothWheel; + } public static DataTable dt_d = new DataTable("DIO");