diff --git a/.vs/HighWayIot/FileContentIndex/193638bb-296a-436c-b03b-0ca68672dae6.vsidx b/.vs/HighWayIot/FileContentIndex/193638bb-296a-436c-b03b-0ca68672dae6.vsidx new file mode 100644 index 00000000..30d4e531 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/193638bb-296a-436c-b03b-0ca68672dae6.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/5f1618df-c7dc-476f-86d6-e21f5596f72c.vsidx b/.vs/HighWayIot/FileContentIndex/5f1618df-c7dc-476f-86d6-e21f5596f72c.vsidx new file mode 100644 index 00000000..7f34b1c8 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/5f1618df-c7dc-476f-86d6-e21f5596f72c.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/9a1310db-970f-44b0-92bf-47696c2f01b4.vsidx b/.vs/HighWayIot/FileContentIndex/9a1310db-970f-44b0-92bf-47696c2f01b4.vsidx new file mode 100644 index 00000000..ef836187 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/9a1310db-970f-44b0-92bf-47696c2f01b4.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/b61e6108-ab9f-47fb-92fa-2fc9d55cd505.vsidx b/.vs/HighWayIot/FileContentIndex/b61e6108-ab9f-47fb-92fa-2fc9d55cd505.vsidx new file mode 100644 index 00000000..79f0dd80 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/b61e6108-ab9f-47fb-92fa-2fc9d55cd505.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 59f75571..243ec9eb 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index 4bbfe9e2..61296cd8 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache index 944a2205..b8d41713 100644 Binary files a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache and b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index 11ba1014..6f66d2a1 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb index 27fa4923..5252d105 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 99014fae..bfc469f6 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe index 11ba1014..6f66d2a1 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb index 27fa4923..5252d105 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs index 1155149e..ad734b9f 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs @@ -304,7 +304,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan /// private void RefreshPlanInfoDataGrid() { - RefreshDataGrid(); + RefreshExecutePlan(); App.Current.Dispatcher.Invoke((Action)(() => { @@ -320,7 +320,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan /// public void Init() { - RefreshDataGrid(); + RefreshExecutePlan(); App.Current.Dispatcher.Invoke((Action)(() => { @@ -398,15 +398,14 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan } /// - /// 刷新计划列表 + /// 加载正在执行的计划 /// - private void RefreshDataGrid() + private void RefreshExecutePlan() { var planInfos = assemblyPlanBusiness.GetEexecutePlanInfosByProductLineCode(); if (planInfos != null) { - RefreshStatisticsGauge(planInfos); //加载正在执行的计划 planInfos = planInfos.Where(x => x.executeStatus == 2).ToList(); if (planInfos.Count > 0) @@ -430,7 +429,15 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan PlanAmount = stringChange.ParseToInt(planInfos.Sum(x => x.planAmount).ToString()); ComplateAmout = stringChange.ParseToInt(planInfos.Sum(x => x.completeAmount).ToString()); DiffAmount = planAmount - complateAmout; - CompleRoution = complateAmout / planAmount * 100 + "%"; + double completionRate = (double)ComplateAmout / PlanAmount * 100; // 计算完成率 + CompleRoution = completionRate.ToString("0.0"); + } + else + { + PlanAmount = 0; + ComplateAmout = 0; + DiffAmount = 0; + CompleRoution = string.Empty; } } } diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 20f2c9e3..304136c0 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ