diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo index ea6fc7a3..a9c29bda 100644 Binary files a/.vs/HighWayIot/v16/.suo and b/.vs/HighWayIot/v16/.suo differ diff --git a/Aucma.Scada.UI/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj index 4504f455..397e1c43 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -224,6 +224,10 @@ {89a1edd9-d79e-468d-b6d3-7d07b8843562} HighWayIot.Common + + {75180EE5-13AE-499B-B0F6-C7BFEE1140CC} + HighWayIot.Config + {deabc30c-ec6f-472e-bd67-d65702fdaf74} HighWayIot.Log4net diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml index 976c3339..73bf7a9c 100644 --- a/Aucma.Scada.UI/MainWindow.xaml +++ b/Aucma.Scada.UI/MainWindow.xaml @@ -10,7 +10,7 @@ > - + @@ -21,13 +21,13 @@ - + - + - + @@ -168,7 +168,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -230,7 +230,7 @@ - + diff --git a/Aucma.Scada.UI/MainWindow.xaml.cs b/Aucma.Scada.UI/MainWindow.xaml.cs index 9e23f9d0..7a0dbf40 100644 --- a/Aucma.Scada.UI/MainWindow.xaml.cs +++ b/Aucma.Scada.UI/MainWindow.xaml.cs @@ -1,4 +1,5 @@ using Aucma.Scada.UI.viewModel; +using HighWayIot.Config; using System; using System.Collections.Generic; using System.Linq; @@ -26,6 +27,7 @@ namespace Aucma.Scada.UI InitializeComponent(); MainViewModel mainViewModel = new MainViewModel(); this.DataContext = mainViewModel; + } } } diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml index 8541c0a1..f627657d 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml @@ -36,28 +36,28 @@ - - + + - - + + - - + + - - + + - - + + @@ -131,7 +131,7 @@ RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" - Foreground="White" > + Foreground="Gray" > @@ -143,10 +143,10 @@ -