diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index c9f949c..b20303d 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -941,15 +941,15 @@ namespace DyeingComputer.ViewModel int IO1015 = Convert.ToInt16( Selet_dtm("1015")); if (IO1015["+Resources.Low_waterlevel+"]";//显示水位 + Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.WaterLevel + ":" + string.Format("{0:D4}", IO1015) + "L =>["+Resources.Low_waterlevel+"]";//显示水位 } else if ((IO1015 > MT39) && (IO1015 < MT38)) { - Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.WaterLevel + ":" + IO1015 + "L =>[" + Resources.Mid_waterlevel + "]";//显示水位 + Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.WaterLevel + ":" + string.Format("{0:D4}", IO1015) + "L =>[" + Resources.Mid_waterlevel + "]";//显示水位 } else if (IO1015 > MT38) { - Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.WaterLevel + ":" + IO1015 + "L =>[" + Resources.High_waterlevel + "]";//显示水位 + Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.WaterLevel + ":" + string.Format("{0:D4}", IO1015) + "L =>[" + Resources.High_waterlevel + "]";//显示水位 } if (Pump_M) //主泵状态 { @@ -962,9 +962,9 @@ namespace DyeingComputer.ViewModel Sys_log = Sys_log + "\n-------------------------------------------------------"; Sys_log = Sys_log + "\n" + Resources.ClothWheel; Sys_log = Sys_log + "\n-------------------------------------------------------"; - if (SM01 == 1) Sys_log = Sys_log + "\n" + Resources.Medicine + Resources.Tank + "1 => [" + Resources.WaterLevel + ":" + Convert.ToInt16(Selet_dtm("1017")) + "L][" + Resources.Temperature + ":" + Convert.ToInt16(Selet_dtm("1012")) + "°C]"; - if (SM02 == 1) Sys_log = Sys_log + "\n" + Resources.Medicine + Resources.Tank + "2 => [" + Resources.WaterLevel + ":" + Convert.ToInt16(Selet_dtm("1018")) + "L][" + Resources.Temperature + ":" + Convert.ToInt16(Selet_dtm("1013")) + "°C]"; - if (SM03 == 1) Sys_log = Sys_log + "\n" + Resources.Medicine + Resources.Tank + "3 => [" + Resources.WaterLevel + ":" + Convert.ToInt16(Selet_dtm("1019")) + "L][" + Resources.Temperature + ":" + Convert.ToInt16(Selet_dtm("1014")) + "°C]"; + if (SM01 == 1) Sys_log = Sys_log + "\n" + Resources.Medicine + Resources.Tank + "1 => [" + Resources.WaterLevel + ":" + string.Format("{0:D4}", Convert.ToInt16(Selet_dtm("1017"))) + "L][" + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1012"))) + "°C]"; + if (SM02 == 1) Sys_log = Sys_log + "\n" + Resources.Medicine + Resources.Tank + "2 => [" + Resources.WaterLevel + ":" + string.Format("{0:D4}", Convert.ToInt16(Selet_dtm("1018"))) + "L][" + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1013"))) + "°C]"; + if (SM03 == 1) Sys_log = Sys_log + "\n" + Resources.Medicine + Resources.Tank + "3 => [" + Resources.WaterLevel + ":" + string.Format("{0:D4}", Convert.ToInt16(Selet_dtm("1019"))) + "L][" + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1014"))) + "°C]"; } public static DataTable dt_d = new DataTable("DIO");