diff --git a/.vs/HighWayIot/FileContentIndex/1908475a-6cd8-4b3f-902e-143be43b2f61.vsidx b/.vs/HighWayIot/FileContentIndex/1908475a-6cd8-4b3f-902e-143be43b2f61.vsidx deleted file mode 100644 index 3cbe3d1c..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/1908475a-6cd8-4b3f-902e-143be43b2f61.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/26b4b671-6a72-4949-83a1-89655bf2d419.vsidx b/.vs/HighWayIot/FileContentIndex/26b4b671-6a72-4949-83a1-89655bf2d419.vsidx new file mode 100644 index 00000000..fb70eda8 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/26b4b671-6a72-4949-83a1-89655bf2d419.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/67c94427-ab2b-4412-98b6-a0e695f2ad6e.vsidx b/.vs/HighWayIot/FileContentIndex/67c94427-ab2b-4412-98b6-a0e695f2ad6e.vsidx deleted file mode 100644 index 000d10fd..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/67c94427-ab2b-4412-98b6-a0e695f2ad6e.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/78317007-b93a-4d0d-a734-eaa2e008b706.vsidx b/.vs/HighWayIot/FileContentIndex/78317007-b93a-4d0d-a734-eaa2e008b706.vsidx new file mode 100644 index 00000000..da4870bb Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/78317007-b93a-4d0d-a734-eaa2e008b706.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/9ef815d9-c343-49e6-8100-ffc7e951f299.vsidx b/.vs/HighWayIot/FileContentIndex/9ef815d9-c343-49e6-8100-ffc7e951f299.vsidx new file mode 100644 index 00000000..6067470b Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/9ef815d9-c343-49e6-8100-ffc7e951f299.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/a89fc347-e1ca-4ab6-9e64-fb705e97c5f0.vsidx b/.vs/HighWayIot/FileContentIndex/a89fc347-e1ca-4ab6-9e64-fb705e97c5f0.vsidx deleted file mode 100644 index ddcc1c07..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/a89fc347-e1ca-4ab6-9e64-fb705e97c5f0.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/8cada85f-6b77-4880-8437-b0e056c5b368.vsidx b/.vs/HighWayIot/FileContentIndex/f41613f8-76fc-45ab-88d6-2a30830bad15.vsidx similarity index 64% rename from .vs/HighWayIot/FileContentIndex/8cada85f-6b77-4880-8437-b0e056c5b368.vsidx rename to .vs/HighWayIot/FileContentIndex/f41613f8-76fc-45ab-88d6-2a30830bad15.vsidx index eda0c4f5..9d077c5e 100644 Binary files a/.vs/HighWayIot/FileContentIndex/8cada85f-6b77-4880-8437-b0e056c5b368.vsidx and b/.vs/HighWayIot/FileContentIndex/f41613f8-76fc-45ab-88d6-2a30830bad15.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 734ddbc5..17e66e7a 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index d5cdd4c8..d5d9c8d2 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb index 5837f72e..0689cc09 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index d5cdd4c8..d5d9c8d2 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb index 5837f72e..0689cc09 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml index 9f5dd009..db9a49da 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml @@ -6,7 +6,7 @@ xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan" xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan" mc:Ignorable="d" - Title="MES生产计划" Height="800" Width="1500" Name="window" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei" Background="#1152AC" + Title="MES生产计划" Height="800" Width="1600" Name="window" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei" Background="#1152AC" ResizeMode="NoResize" >