diff --git a/View/EquipmentSimulationView.xaml b/View/EquipmentSimulationView.xaml index 2d0b7e8..edf2c1e 100644 --- a/View/EquipmentSimulationView.xaml +++ b/View/EquipmentSimulationView.xaml @@ -7,10 +7,10 @@ xmlns:gif="http://wpfanimatedgif.codeplex.com" mc:Ignorable="d" Loaded="UserControl_Loaded" - d:DesignHeight="1000" d:DesignWidth="1980"> + d:DesignHeight="1000" d:DesignWidth="1920"> - + @@ -616,9 +616,11 @@ VerticalAlignment="Top" HorizontalAlignment="Left" Margin="240,340,0,0"/> + + - - @@ -824,13 +826,67 @@ VerticalAlignment="Top" HorizontalAlignment="Left" Margin="240,340,0,0"/> + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/View/EquipmentSimulationView.xaml.cs b/View/EquipmentSimulationView.xaml.cs index 995154a..446a908 100644 --- a/View/EquipmentSimulationView.xaml.cs +++ b/View/EquipmentSimulationView.xaml.cs @@ -517,7 +517,9 @@ namespace DyeingComputer.View S2_T.Text = string.Format(" {0:F1}", Convert.ToDouble(MainWindowViewModel.Selet_dtm("1013"))) + "°C";//缸2温度 S2_L.Text = string.Format("{0:D4}", Convert.ToInt16(MainWindowViewModel.Selet_dtm("1018"))) + "L";//缸2水 MtH.Text = string.Format(" {0:P1}", Convert.ToDouble(MainWindowViewModel.Selet_dta("5001"))/10);//升温 - Mtl.Text = string.Format(" {0:P1}", Convert.ToDouble(MainWindowViewModel.Selet_dta("5002"))/10) ;//降温 + Mtl.Text = string.Format(" {0:P1}", Convert.ToDouble(MainWindowViewModel.Selet_dta("5002"))/10);//降温 + SL1.Text = string.Format(" {0:P1}", Convert.ToDouble(MainWindowViewModel.Selet_dta("5005")) / 10);// + SL2.Text = string.Format(" {0:P1}", Convert.ToDouble(MainWindowViewModel.Selet_dta("5006")) / 10);// ID3007 = MainWindowViewModel.Selet_dtd("3007"); ID3008 = MainWindowViewModel.Selet_dtd("3008");