diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo index 3a0cb03a..f51bb4f1 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 121ff12e..7c634780 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -88,12 +88,28 @@ IndexControl.xaml + + AssemblyPlanControl.xaml + + + InStoreInfoControl.xaml + LogInfoControl.xaml + + InventoryInfoControl.xaml + + + OutStoreInfoControl.xaml + + + TaskInfoControl.xaml + RecordControl.xaml + @@ -101,6 +117,14 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -117,6 +141,18 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml index 4ebc72e4..9a04aaca 100644 --- a/Aucma.Scada.UI/MainWindow.xaml +++ b/Aucma.Scada.UI/MainWindow.xaml @@ -31,13 +31,17 @@ - + -