sc/DyeingComputer
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

Browse Source
This commit is contained in:
sc committed 2024-09-27 00:06:01 +08:00
2 parents 4c797978b1 b52688186e
commit 2161134874
1 file changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files
ViewModel/MainWindowViewModel.cs
+6 -6
View File
@@ -941,15 +941,15 @@ namespace DyeingComputer.ViewModel
int IO1015 = Convert.ToInt16( Selet_dtm("1015")); int IO1015 = Convert.ToInt16( Selet_dtm("1015"));
if (IO1015<MT39) if (IO1015<MT39)
{ {
Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.WaterLevel + ":" + IO1015 + "L =>["+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)) 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) 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) //主泵状态 if (Pump_M) //主泵状态
{ {
@@ -962,9 +962,9 @@ namespace DyeingComputer.ViewModel
Sys_log = Sys_log + "\n-------------------------------------------------------"; Sys_log = Sys_log + "\n-------------------------------------------------------";
Sys_log = Sys_log + "\n" + Resources.ClothWheel; Sys_log = Sys_log + "\n" + Resources.ClothWheel;
Sys_log = Sys_log + "\n-------------------------------------------------------"; 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 (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 + ":" + Convert.ToInt16(Selet_dtm("1018")) + "L][" + Resources.Temperature + ":" + Convert.ToInt16(Selet_dtm("1013")) + "°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 + ":" + Convert.ToInt16(Selet_dtm("1019")) + "L][" + Resources.Temperature + ":" + Convert.ToInt16(Selet_dtm("1014")) + "°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"); public static DataTable dt_d = new DataTable("DIO");