From 8bb1931184e1cae708f4925f52e68f3bba5312b3 Mon Sep 17 00:00:00 2001
From: Tyrone CT <chongtao@yeah.net>
Date: Wed, 9 Apr 2025 11:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=A1=86=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=92=8C=E7=8A=B6=E6=80=81=E5=8F=98=E9=87=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CapMachine.Shared/Controls/Meter.xaml         | 14 +++----
 CapMachine.Wpf/Services/ProRuntimeService.cs  |  1 -
 .../DialogChartRtConfigViewModel.cs           |  2 +-
 .../ViewModels/ProConfigViewModel.cs          | 39 +------------------
 CapMachine.Wpf/Views/FooterView.xaml          |  6 +--
 5 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/CapMachine.Shared/Controls/Meter.xaml b/CapMachine.Shared/Controls/Meter.xaml
index 17737a1..c033f37 100644
--- a/CapMachine.Shared/Controls/Meter.xaml
+++ b/CapMachine.Shared/Controls/Meter.xaml
@@ -19,7 +19,7 @@
         UniformCornerRadius="2">
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="2*" />
+                <RowDefinition Height="2.2*" />
                 <RowDefinition Height="3*" />
                 <RowDefinition Height="1.5*" />
             </Grid.RowDefinitions>
@@ -28,22 +28,22 @@
                 Background="#404040"
                 CornerRadius="3" />
             <StackPanel Margin="1,3,1,0">
-                <DockPanel Margin="1,3">
+                <DockPanel Margin="1,5,1,2">
                     <TextBlock
                         Margin="1,0,1,0"
                         VerticalAlignment="Center"
                         DockPanel.Dock="Left"
-                        FontSize="14"
+                        FontSize="13"
                         Foreground="White"
                         Text="PV" />
                     <TextBlock
-                        Margin="0,0,0,0"
+                        Margin="1,0,0,0"
                         VerticalAlignment="Center"
                         FontSize="13"
                         Foreground="White"
                         Text="{Binding ElementName=MeterInstance, Path=PVValue}" />
                     <TextBlock
-                        Margin="0,0"
+                        Margin="0,0,1,0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         DockPanel.Dock="Right"
@@ -51,7 +51,7 @@
                         Foreground="White"
                         Text="{Binding ElementName=MeterInstance, Path=Unit}" />
                 </DockPanel>
-                <DockPanel Margin="1,-3,2,0">
+                <DockPanel Margin="1,0,0,0">
                     <TextBlock
                         VerticalAlignment="Center"
                         DockPanel.Dock="Left"
@@ -60,7 +60,7 @@
                         Foreground="Gold"
                         Text="SV" />
                     <TextBlock
-                        Margin="5,0,5,0"
+                        Margin="6,0,0,0"
                         VerticalAlignment="Center"
                         FontSize="16"
                         Foreground="Gold"
diff --git a/CapMachine.Wpf/Services/ProRuntimeService.cs b/CapMachine.Wpf/Services/ProRuntimeService.cs
index f15df5d..468a3db 100644
--- a/CapMachine.Wpf/Services/ProRuntimeService.cs
+++ b/CapMachine.Wpf/Services/ProRuntimeService.cs
@@ -181,7 +181,6 @@ namespace CapMachine.Wpf.Services
                         ListProStepExe = new List<ProStepExe>(),
                         IsSpeed = itemKeyValue.Value.Name.Contains("转速") == true ? true : false,
                     });
-
                 }
             }
 
diff --git a/CapMachine.Wpf/ViewModels/DialogChartRtConfigViewModel.cs b/CapMachine.Wpf/ViewModels/DialogChartRtConfigViewModel.cs
index 461e769..55fbe1f 100644
--- a/CapMachine.Wpf/ViewModels/DialogChartRtConfigViewModel.cs
+++ b/CapMachine.Wpf/ViewModels/DialogChartRtConfigViewModel.cs
@@ -84,7 +84,7 @@ namespace CapMachine.Wpf.ViewModels
         /// </summary>
         private void LoadChartSourceData()
         {
-            foreach (var item in MachineRtDataService.TagManger.DicTags)
+            foreach (var item in MachineRtDataService.TagManger.DicTags.OrderBy(a=>a.Value.Id))
             {
                 ChartSrcDataListViewItems.Add(new ChartSrcData()
                 {
diff --git a/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs b/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs
index 4680a32..6b76749 100644
--- a/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs
+++ b/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs
@@ -2324,48 +2324,13 @@ namespace CapMachine.Wpf.ViewModels
             if (ProSegRunListViewItems != null && ProSegRunListViewItems.Count() > 0)
             {
                 //当前的程序开始标记
-                ProParsSongZhiHelper.Start();
+                //ProParsSongZhiHelper.Start();
+
                 //返回的数据
                 List<PlcParsData> ReturnPlcParsData = new List<PlcParsData>();
 
                 ProRuntimeService.LoadProSegRun(ProSegRunListViewItems.ToList());
 
-                ////var Data=FreeSql.Select<ProSegRun>(
-                ////以每个程序为单元循环执行
-                //foreach (var item in ProSegRunListViewItems)
-                //{
-                //    var FindData = FreeSql.Select<ProgramSeg>(item.ProgramSegId)
-                //            .IncludeMany(a => a.ProSteps,
-                //            then => then.IncludeMany(b => b.MeterSpeeds)
-                //            .IncludeMany(b => b.MeterCond1Temps)
-                //            .IncludeMany(b => b.MeterCond2Temps)
-                //            .IncludeMany(b => b.MeterCond2Presss)
-                //            .IncludeMany(b => b.MeterEVAPExpTemps)
-                //            .IncludeMany(b => b.MeterExPresss)
-                //            .IncludeMany(b => b.MeterHVVols)
-                //            .IncludeMany(b => b.MeterInhPresss)
-                //            .IncludeMany(b => b.MeterInhTemps)
-                //            .IncludeMany(b => b.MeterLubePresss)
-                //            .IncludeMany(b => b.MeterLVVols)
-                //            .IncludeMany(b => b.MeterOCRs)
-                //            .IncludeMany(b => b.MeterOS1Temps)
-                //            .IncludeMany(b => b.MeterOS2Temps)
-                //            .IncludeMany(b => b.MeterPTCEntTemps)
-                //            .IncludeMany(b => b.MeterPTCFlows)
-                //            .IncludeMany(b => b.MeterPTCPws)
-                //            .IncludeMany(b => b.MeterEnvRHs)
-                //            .IncludeMany(b => b.MeterEnvTemps)
-                //        ).ToList().FirstOrDefault();
-
-                //    if (FindData != null && FindData.ProSteps != null && FindData.ProSteps.Any())
-                //    {
-                //        //执行程序的步骤集合数据
-                //        ReturnPlcParsData = ProParsSongZhiHelper.GetPlcParsData(FindData.ProSteps, FindData.ProRepeat);
-                //        //把次数给PLC，那么此时应该是最后一个程序给PLC了
-                //        ProParsSongZhiHelper.LoadProCycleToPlc(MachineRtDataService.SiemensDrive, FindData.ProRepeat);
-                //    }
-                //}
-
                 ////防止上一次下载的程序多余当前的步骤，为了清空多余的步骤数据，增加一行的数据
                 //ReturnPlcParsData = ProParsSongZhiHelper.AddNullData(ReturnPlcParsData);
                 ////装载PLC地址
diff --git a/CapMachine.Wpf/Views/FooterView.xaml b/CapMachine.Wpf/Views/FooterView.xaml
index acb26f1..858290a 100644
--- a/CapMachine.Wpf/Views/FooterView.xaml
+++ b/CapMachine.Wpf/Views/FooterView.xaml
@@ -47,7 +47,7 @@
                 <Border.Style>
                     <Style BasedOn="{StaticResource BoardStyle}" TargetType="Border">
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding SysRunService.MachineRunState1.IsRunState}" Value="true">
+                            <DataTrigger Binding="{Binding ProRuntimeService.MachineRunState1.IsRunState}" Value="true">
                                 <Setter Property="Background" Value="LimeGreen" />
                             </DataTrigger>
                         </Style.Triggers>
@@ -77,7 +77,7 @@
                 <Border.Style>
                     <Style BasedOn="{StaticResource BoardStyle}" TargetType="Border">
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding SysRunService.MachineRunState1.IsProLoad}" Value="true">
+                            <DataTrigger Binding="{Binding ProRuntimeService.MachineRunState1.IsProLoad}" Value="true">
                                 <Setter Property="Background" Value="LimeGreen" />
                             </DataTrigger>
                         </Style.Triggers>
@@ -99,7 +99,7 @@
                         Margin="5,0"
                         FontSize="16"
                         Foreground="White"
-                        Text="{Binding SysRunService.MachineRunState1.IsProLoad, Converter={StaticResource BoolFinishStrConvert}}" />
+                        Text="{Binding ProRuntimeService.MachineRunState1.IsProLoad, Converter={StaticResource BoolFinishStrConvert}}" />
 
                 </StackPanel>
             </Border>