精确发送更改

CapMachine.Wpf/CanDrive/ToomossCan.cs

@@ -33,6 +33,9 @@ namespace CapMachine.Wpf.CanDrive
         {
             ContainerProvider = containerProvider;
             HighSpeedDataService = ContainerProvider.Resolve<HighSpeedDataService>();
+
+            //Stopwatch.Frequency表示高精度计时器每秒的计数次数（ticks/秒）每毫秒的ticks数 = 每秒的ticks数 ÷ 1000
+            TicksPerMs = Stopwatch.Frequency / 1000.0;
         }
 
         /// <summary>
@@ -350,19 +353,19 @@ namespace CapMachine.Wpf.CanDrive
             {
                 StringBuilder MsgName = new StringBuilder(32);
                 CAN_DBCParser.DBC_GetMsgName(DBCHandle, i, MsgName);
-                Console.WriteLine("Msg.Name = {0}", MsgName);
+                //Console.WriteLine("Msg.Name = {0}", MsgName);
                 int DBCSigNum = CAN_DBCParser.DBC_GetMsgSignalQuantity(DBCHandle, MsgName);
                 StringBuilder Publisher = new StringBuilder(32);
                 CAN_DBCParser.DBC_GetMsgPublisher(DBCHandle, MsgName, Publisher);
                 long MsgId;
                 MsgId = CAN_DBCParser.DBC_GetMsgIDByName(DBCHandle, MsgName);
 
-                Console.Write("Signals:");
+                //Console.Write("Signals:");
                 for (int j = 0; j < DBCSigNum; j++)
                 {
                     StringBuilder SigName = new StringBuilder(32);
                     CAN_DBCParser.DBC_GetMsgSignalName(DBCHandle, MsgName, j, SigName);
-                    Console.Write("{0} ", SigName);
+                    //Console.Write("{0} ", SigName);
 
                     //增加信息数据
                     ListCanDbcModel.Add(new CanDbcModel()
@@ -376,7 +379,7 @@ namespace CapMachine.Wpf.CanDrive
                         Publisher = Publisher.ToString()
                     });
                 }
-                Console.WriteLine("");
+                //Console.WriteLine("");
             }
 
             //Dbc解析成功
@@ -426,11 +429,11 @@ namespace CapMachine.Wpf.CanDrive
             int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length);
             if (SendedNum >= 0)
             {
-                Console.WriteLine("Success send frames:{0}", SendedNum);
+                //Console.WriteLine("Success send frames:{0}", SendedNum);
             }
             else
             {
-                Console.WriteLine("Send CAN data failed! {0}", SendedNum);
+                //Console.WriteLine("Send CAN data failed! {0}", SendedNum);
             }
         }
 
@@ -527,11 +530,11 @@ namespace CapMachine.Wpf.CanDrive
                         int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length);
                         if (SendedNum >= 0)
                         {
-                            Console.WriteLine("Success send frames:{0}", SendedNum);
+                            //Console.WriteLine("Success send frames:{0}", SendedNum);
                         }
                         else
                         {
-                            Console.WriteLine("Send CAN data failed! {0}", SendedNum);
+                            //Console.WriteLine("Send CAN data failed! {0}", SendedNum);
                         }
                     }
                     catch (Exception ex)
@@ -568,14 +571,14 @@ namespace CapMachine.Wpf.CanDrive
                                 //CanMsgBuffer[i] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure((IntPtr)((UInt32)msgPtRead + i * Marshal.SizeOf(typeof(USB2CAN.CAN_MSG))), typeof(USB2CAN.CAN_MSG)); //有溢出报错
                                 CanMsgBuffer[i] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure((IntPtr)(msgPtRead + i * Marshal.SizeOf(typeof(USB2CAN.CAN_MSG))), typeof(USB2CAN.CAN_MSG));
 
-                                Console.WriteLine("CanMsg[{0}].ID = 0x{1}", i, CanMsgBuffer[i].ID.ToString("X8"));
-                                Console.WriteLine("CanMsg[{0}].TimeStamp = {1}", i, CanMsgBuffer[i].TimeStamp);
-                                Console.Write("CanMsg[{0}].Data = ", i);
+                                //Console.WriteLine("CanMsg[{0}].ID = 0x{1}", i, CanMsgBuffer[i].ID.ToString("X8"));
+                                //Console.WriteLine("CanMsg[{0}].TimeStamp = {1}", i, CanMsgBuffer[i].TimeStamp);
+                                //Console.Write("CanMsg[{0}].Data = ", i);
                                 for (int j = 0; j < CanMsgBuffer[i].DataLen; j++)
                                 {
                                     Console.Write("{0} ", CanMsgBuffer[i].Data[j].ToString("X2"));
                                 }
-                                Console.WriteLine("");
+                                //Console.WriteLine("");
 
                                 //报文给高速记录的服务
                                 HighSpeedDataService.AppendOrUpdateMsg(new Models.HighSpeed.CommMsg()
@@ -589,11 +592,11 @@ namespace CapMachine.Wpf.CanDrive
                         }
                         else if (CanNum == 0)
                         {
-                            Console.WriteLine("No CAN data!");
+                            //Console.WriteLine("No CAN data!");
                         }
                         else
                         {
-                            Console.WriteLine("Get CAN data error!");
+                            //Console.WriteLine("Get CAN data error!");
                         }
                         Console.WriteLine("");
 
@@ -633,6 +636,195 @@ namespace CapMachine.Wpf.CanDrive
             });
         }
 
+
+        #region 精确发送报文数据
+
+        // 添加取消标记源字段用于停止任务
+        private CancellationTokenSource CycleSendCts;
+
+        /// <summary>
+        ///  计算每毫秒对应的ticks数（只需计算一次）
+        /// </summary>
+        private double TicksPerMs;
+
+        // 类成员变量定义 精确记时用
+        private readonly Stopwatch Stopwatcher = new Stopwatch();
+        private long NextExecutionTime;
+        // 计算需要等待的时间
+        private long CurrentTime;
+        private long DelayTicks;
+        private int DelayMs;
+
+        private static readonly Random _random = new Random();
+
+        /// <summary>
+        /// 精确周期发送CAN数据
+        /// </summary>
+        public void StartPrecisionCycleSendMsg()
+        {
+            // 创建取消标记源 用于控制任务的取消 允许在需要时通过取消令牌来优雅停止任务
+            var cancellationTokenSource = new CancellationTokenSource();
+            var token = cancellationTokenSource.Token;
+
+            // 保存取消标记，以便在停止时使用
+            CycleSendCts = cancellationTokenSource;//将取消标记源保存到类的成员变量CycleSendCts，这样在外部调用停止方法时可以访问它
+            NextExecutionTime = 0;//初始化NextExecutionTime为0，这个变量用于记录下一次执行的目标时间点
+
+            CycleSendTask = Task.Factory.StartNew(async () =>
+            {
+                try
+                {
+                    // 设置当前线程为高优先级
+                    Thread.CurrentThread.Priority = ThreadPriority.AboveNormal;
+
+                    // 初始化完成后开始计时
+                    Stopwatcher.Restart();
+                    // 预先计算固定值
+                    long CycleInTicks = (long)(SendCycle * TicksPerMs);
+                    //临时测试用
+                    //long lastTicks = Stopwatcher.ElapsedTicks;
+                    //IsCycleSend
+                    while (IsCycleSend && !token.IsCancellationRequested)
+                    {
+                        try
+                        {
+                            // 计算下一次执行时间点 ，将当前设置的发送周期SendCycle(毫秒)转换为Stopwatch的计时单位(tick)，累加到NextExecutionTime上
+                            NextExecutionTime += CycleInTicks; // 转换为Stopwatch计时单位
+
+                            // 获取当前时间点，以Stopwatch的tick为单位
+                            CurrentTime = Stopwatcher.ElapsedTicks;
+                            //计算需要等待的时间，即目标时间点(NextExecutionTime)与当前时间点(CurrentTime)的差值
+                            DelayTicks = NextExecutionTime - CurrentTime;
+
+                            // 如果还有等待时间，则等待，只有在目标时间点还未到达时才执行等待
+                            if (DelayTicks > 0)
+                            {
+                                ////此时是需要等待的，那么需要等待多久呢， 将需等待的tick数转换回毫秒
+                                DelayMs = (int)(DelayTicks / TicksPerMs);
+                                //20这个数据是预估和测试的，可能跟Windows抖动误差就是20ms左右，当然可以不用这个IF()判断，直接SpinWait.SpinUntil(() => Stopwatcher.ElapsedTicks >= NextExecutionTime);但是会导致当前独占一个CPU核心线程
+                                //所以设置一个20的阈值，20ms以下的延迟使用SpinWait.SpinUntil进行自旋等待，20ms以上的延迟使用Task.Delay进行异步等待，让CPU不至于一直的独占
+                                if (DelayMs <= 20)
+                                {
+                                    SpinWait.SpinUntil(() => Stopwatcher.ElapsedTicks >= NextExecutionTime);
+                                }
+                                else
+                                {
+                                    ////使用Task.Delay进行异步等待，大部分等待时间通过这种方式完成，避免线程阻塞
+                                    await Task.Delay(DelayMs - 20, token);
+                                    //// 使用SpinWait.SpinUntil进行精确的微调等待。自旋等待会占用CPU资源，但能提供更高的定时精度，确保在精确的时间点执行
+                                    ////上面的Task.Delay可能会因为系统调度等原因导致实际执行时间稍晚于预期，因此在这里使用SpinWait.SpinUntil来确保在精确的时间点执行
+                                    SpinWait.SpinUntil(() => Stopwatcher.ElapsedTicks >= NextExecutionTime);
+                                }
+                            }
+
+                            // 如果已经超过了计划时间，立即执行并重新校准
+                            if (Stopwatcher.ElapsedTicks >= NextExecutionTime + CycleInTicks)
+                            {
+                                //检测是否发生了严重延迟(超过一个周期)。如果当前时间已经超过了下一次计划时间，则说明系统负载过高或其他原因导致无法按时执行，
+                                //此时重置NextExecutionTime为当前时间，避免连续的延迟累积
+                                // 严重延迟，重新校准
+                                NextExecutionTime = Stopwatcher.ElapsedTicks;
+                                Console.WriteLine("定时发送延迟过大，重新校准时间");
+                            }
+
+                            // 使用Stopwatch记录实际的执行间隔，而不是DateTime
+                            //Console.WriteLine($"--实际间隔(ms): {(Stopwatcher.ElapsedTicks - lastTicks) / TicksPerMs:F3}, 目标: {SendCycle}");
+                            //lastTicks = Stopwatcher.ElapsedTicks;
+
+                            //Console.WriteLine($"--当前时间(毫秒): {DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}");
+
+
+                            // 执行发送CAN逻辑
+                            {
+
+                                var GroupMsg = CmdData.GroupBy(x => x.MsgName);
+                                USB2CAN.CAN_MSG[] CanMsg = new USB2CAN.CAN_MSG[GroupMsg.Count()];
+                                for (int i = 0; i < GroupMsg.Count(); i++)
+                                {
+                                    CanMsg[i] = new USB2CAN.CAN_MSG();
+                                    CanMsg[i].Data = new Byte[64];
+                                }
+
+                                IntPtr msgPtSend = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)));
+                                int Index = 0;
+                                //循环给MSG赋值数据
+                                foreach (var itemMsg in GroupMsg)
+                                {
+                                    foreach (var itemSignal in itemMsg)
+                                    {
+                                        CAN_DBCParser.DBC_SetSignalValue(DBCHandle, new StringBuilder(itemMsg.Key), new StringBuilder(itemSignal.SignalName), itemSignal.SignalCmdValue);
+                                    }
+                                    CAN_DBCParser.DBC_SyncValueToCANMsg(DBCHandle, new StringBuilder(itemMsg.Key), msgPtSend);
+                                    CanMsg[Index] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure(msgPtSend, typeof(USB2CAN.CAN_MSG));
+                                    Index++;
+                                }
+
+                                //通过DBC写入数据后生成CanMsg
+                                //将信号值填入CAN消息里面
+
+                                //释放申请的临时缓冲区
+                                Marshal.FreeHGlobal(msgPtSend);
+
+                                //发送CAN数据
+                                int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length);
+                                if (SendedNum >= 0)
+                                {
+                                    //Console.WriteLine("Success send frames:{0}", SendedNum);
+                                    //IsSendOk = true;
+                                }
+                                else
+                                {
+                                    //Console.WriteLine("Send CAN data failed! {0}", SendedNum);
+                                    //IsSendOk = false;
+                                }
+
+                            }
+
+                        }
+                        catch (TaskCanceledException)
+                        {
+                            // 任务被取消，正常退出
+                            break;
+                        }
+                        catch (Exception ex)
+                        {
+                            Console.WriteLine($"CAN周期发送异常: {ex.Message}");
+                            // 短暂暂停避免异常情况下CPU占用过高
+                            await Task.Delay(10, token);
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // 确保在任何情况下（正常退出、异常、取消）都会停止计时器
+                    Stopwatcher.Stop();
+
+                    // 清理其他可能的资源
+                    Console.WriteLine("CAN周期发送任务已结束，资源已清理");
+                }
+                finally
+                {
+                    // 确保在任何情况下（正常退出、异常、取消）都会停止计时器
+                    Stopwatcher.Stop();
+                }
+
+            }, token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+        }
+
+
+        /// <summary>
+        /// 修改停止发送的方法
+        /// </summary>
+        public void StopCycleSendMsg()
+        {
+            IsCycleSend = false;
+            CycleSendCts?.Cancel();
+        }
+
+        #endregion
+
+
+
         /// <summary>
         /// 接受CAN消息
         /// </summary>

CapMachine.Wpf/CapMachine.Wpf.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

CapMachine.Wpf/Converts/SecToStrConvert.cs

@@ -43,10 +43,22 @@ namespace CapMachine.Wpf.Converts
             //int second = TotalSec % 60;
 
             //return string.Format("{0}:{1}:{2}", hour, minute, second);
-            ////Console.WriteLine(result);
+            //////Console.WriteLine(result);
 
-            TimeSpan TimeInfo = TimeSpan.FromSeconds(TotalSec);
-            return TimeInfo.ToString();
+            //TimeSpan TimeInfo = TimeSpan.FromSeconds(TotalSec);
+            //return TimeInfo.ToString();
+
+            return ConvertSecToTimeStr(TotalSec);
+        }
+
+        private string ConvertSecToTimeStr(int totalSeconds)
+        {
+            int hours = totalSeconds / 3600;
+            int remainingSeconds = totalSeconds % 3600;
+            int minutes = remainingSeconds / 60;
+            int seconds = remainingSeconds % 60;
+
+            return $"{hours}:{minutes:D2}:{seconds:D2}";
         }
 
         /// <summary>
@@ -57,8 +69,9 @@ namespace CapMachine.Wpf.Converts
         {
             try
             {
-                TimeSpan TimeInfo = TimeSpan.Parse(timeString);
-                return (int)TimeInfo.TotalSeconds;
+                //TimeSpan TimeInfo = TimeSpan.Parse(timeString);
+                //return (int)TimeInfo.TotalSeconds;
+                return ConvertTimeStrToSecs(timeString);
             }
             catch (Exception ex)
             {
@@ -68,5 +81,23 @@ namespace CapMachine.Wpf.Converts
            
             
         }
+
+        public  int ConvertTimeStrToSecs(string timeString)
+        {
+            string[] parts = timeString.Split(':');
+            if (parts.Length != 3) return 0;
+            //throw new FormatException("Invalid time format. Use 'hh:mm:ss'");
+
+            if (!int.TryParse(parts[0], out int hours) || hours < 0) return 0;
+            //throw new ArgumentException("小時必須為非負整數");
+
+            if (!int.TryParse(parts[1], out int minutes) || minutes < 0 || minutes >= 60) return 0;
+            //throw new ArgumentException("分鐘必須為 0-59 的整數");
+
+            if (!int.TryParse(parts[2], out int seconds) || seconds < 0 || seconds >= 60) return 0;
+            //throw new ArgumentException("秒必須為 0-59 的整數");
+
+            return hours * 3600 + minutes * 60 + seconds;
+        }
     }
 }

CapMachine.Wpf/Models/Tag/QuickTag.cs

@@ -72,6 +72,8 @@ namespace CapMachine.Wpf.Models.Tag
             get { return _OperateResultSource; }
             set
             {
+                if (value!.Content == null) return;
+            
                 switch (ValueType)
                 {
                     case DataType.Short:

CapMachine.Wpf/Services/CanDriveService.cs

@@ -230,7 +230,7 @@ namespace CapMachine.Wpf.Services
                     if (ListCanDbcModel.Count > 0)
                     {
                         ToomossCanDrive.IsCycleRevice = true;
-                        ToomossCanDrive.StartCycleReviceCanMsg();
+                        ToomossCanDrive.StartPrecisionCycleSendMsg();
                     }
                     else
                     {

CapMachine.Wpf/Services/MachineRtDataService.cs

@@ -1134,6 +1134,7 @@ namespace CapMachine.Wpf.Services
                         //    IsShowCount = 0;
                         //    IsValueShow = true;
                         //}
+
                         foreach (var itemTag in TagManger.DicTags)
                         {
                             //TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value = (short)random.Next(0, 100);

CapMachine.Wpf/ViewModels/ProConfigViewModel.cs

@@ -17,6 +17,7 @@ using System.Collections.ObjectModel;
 using System.Data;
 using System.Text;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace CapMachine.Wpf.ViewModels
 {
@@ -1759,7 +1760,16 @@ namespace CapMachine.Wpf.ViewModels
             //    cr.EndEdit();
             //}
 
-            var dd = par;
+            //if (par is DataGrid dataGrid && dataGrid.SelectedCells.Count > 0)
+            //{
+            //    var selectedCell = dataGrid.SelectedCells[0];
+            //    string columnHeader = selectedCell.Column.Header?.ToString();
+            //    // 处理列头信息
+            //}
+
+            //var dd = par;
+
+
             //var dd = new SelectedCellsCollection();
             //if (par is SelectedCellCo selectedCells)
             //{
@@ -15897,8 +15907,16 @@ namespace CapMachine.Wpf.ViewModels
         {
             try
             {
-                TimeSpan TimeInfo = TimeSpan.FromSeconds(TotalSec);
-                return TimeInfo.ToString();
+                //TimeSpan TimeInfo = TimeSpan.FromSeconds(TotalSec);
+                //return TimeInfo.ToString();
+
+                int hours = TotalSec / 3600;
+                int remainingSeconds = TotalSec % 3600;
+                int minutes = remainingSeconds / 60;
+                int seconds = remainingSeconds % 60;
+
+                return $"{hours}:{minutes:D2}:{seconds:D2}";
+
             }
             catch (Exception ex)
             {
@@ -15908,8 +15926,6 @@ namespace CapMachine.Wpf.ViewModels
 
         }
 
-
-
         #region 公共库
 
         /// <summary>

CapMachine.Wpf/Views/ProConfigView.xaml

@@ -833,9 +833,11 @@
                             <prism:InvokeCommandAction Command="{Binding GridSelectionChangedCmd}" CommandParameter="{Binding ElementName=MainDatagrid, Path=SelectedItem}" />
                         </i:EventTrigger>
                         <i:EventTrigger EventName="SelectedCellsChanged">
-                            <prism:InvokeCommandAction Command="{Binding GridSelectedCellsChangedCmd}" CommandParameter="{Binding SelectedCells, ElementName=MainDatagrid}" />
+                            <prism:InvokeCommandAction Command="{Binding GridSelectedCellsChangedCmd}" CommandParameter="{Binding ElementName=MainDatagrid}" />
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
+                    <!--  CommandParameter="{Binding SelectedCells, ElementName=MainDatagrid}" />  -->
+
                     <!--<prism:InvokeCommandAction Command="{Binding GridSelectionChangedCmd}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}}" />-->
                     <!--  CommandParameter="{Binding ElementName=MainDatagrid, Path=SelectedItem}"  -->
                     <!--<DataGrid.RowStyle>
@@ -1474,7 +1476,7 @@
                                             VerticalAlignment="Center"
                                             FontSize="12"
                                             FontWeight="Bold"
-                                            Text="COND1温度&#10;(℃)" />
+                                            Text="冷凝器出口水温&#x0A;(℃)" />
                                     </StackPanel>
                                 </TabItem.Header>
                                 <Controls:MeterConfig
@@ -1488,7 +1490,7 @@
                                     EditCommand="{Binding ProStepCond1TempEditCmd}"
                                     IsTimeOk="{Binding MeterCond1TempExDto.IsTimeOk}"
                                     ListMeter="{Binding ListSlopMeterCond1TempItems}"
-                                    MeterName="COND1温度"
+                                    MeterName="冷凝器出口水温"
                                     MeterSelectedChangedCmd="{Binding MeterCond1TempSlopSelectedChangedCmd}"
                                     ParConfigCommand="{Binding MeterCond1TempParConfigCmd}"
                                     SelectedMeter="{Binding SelectedSlopCond1Temp, Mode=TwoWay}"
@@ -1633,6 +1635,40 @@
                             </TabItem>-->
 
 
+                            <TabItem>
+                                <TabItem.Header>
+                                    <StackPanel
+                                        Width="90"
+                                        Margin="-20"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center">
+                                        <TextBlock
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="12"
+                                            FontWeight="Bold"
+                                            Text="吸气混合器温度&#x0A;(℃)" />
+                                    </StackPanel>
+                                </TabItem.Header>
+                                <Controls:MeterConfig
+                                    Margin="5,5,0,5"
+                                    AddCommand="{Binding ProStepOS2TempAddCmd}"
+                                    ConstSlopSelectedIndex="{Binding ProStepOS2TempSwitchConstSlopIndex, Mode=TwoWay}"
+                                    ConstantSaveCommand="{Binding ProStepOS2TempConstantSaveCmd}"
+                                    ConstantValue="{Binding SelectedConstOS2TempValue, Mode=TwoWay}"
+                                    Cycle="{Binding MeterOS2TempExDto.SlopCycle}"
+                                    DeleteCommand="{Binding ProStepOS2TempDeleteCmd}"
+                                    EditCommand="{Binding ProStepOS2TempEditCmd}"
+                                    IsTimeOk="{Binding MeterOS2TempExDto.IsTimeOk}"
+                                    ListMeter="{Binding ListSlopMeterOS2TempItems}"
+                                    MeterName="吸气混合器温度"
+                                    MeterSelectedChangedCmd="{Binding MeterOS2TempSlopSelectedChangedCmd}"
+                                    ParConfigCommand="{Binding MeterOS2TempParConfigCmd}"
+                                    SelectedMeter="{Binding SelectedSlopOS2Temp, Mode=TwoWay}"
+                                    SwitchConstSlopCommand="{Binding MeterOS2TempSwitchConstSlopCmd}"
+                                    TotalSlopTime="{Binding MeterOS2TempExDto.SlopTime}" />
+                            </TabItem>
+
 
                             <TabItem>
                                 <TabItem.Header>
@@ -1668,7 +1704,6 @@
                                     TotalSlopTime="{Binding MeterHVVolExDto.SlopTime}" />
                             </TabItem>
 
-
                             <TabItem>
                                 <TabItem.Header>
                                     <StackPanel
@@ -1771,39 +1806,7 @@
                                     TotalSlopTime="{Binding MeterOS1TempExDto.SlopTime}" />
                             </TabItem>-->
 
-                            <TabItem>
-                                <TabItem.Header>
-                                    <StackPanel
-                                        Width="90"
-                                        Margin="-20"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center">
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="12"
-                                            FontWeight="Bold"
-                                            Text="OS2温度&#10;(℃)" />
-                                    </StackPanel>
-                                </TabItem.Header>
-                                <Controls:MeterConfig
-                                    Margin="5,5,0,5"
-                                    AddCommand="{Binding ProStepOS2TempAddCmd}"
-                                    ConstSlopSelectedIndex="{Binding ProStepOS2TempSwitchConstSlopIndex, Mode=TwoWay}"
-                                    ConstantSaveCommand="{Binding ProStepOS2TempConstantSaveCmd}"
-                                    ConstantValue="{Binding SelectedConstOS2TempValue, Mode=TwoWay}"
-                                    Cycle="{Binding MeterOS2TempExDto.SlopCycle}"
-                                    DeleteCommand="{Binding ProStepOS2TempDeleteCmd}"
-                                    EditCommand="{Binding ProStepOS2TempEditCmd}"
-                                    IsTimeOk="{Binding MeterOS2TempExDto.IsTimeOk}"
-                                    ListMeter="{Binding ListSlopMeterOS2TempItems}"
-                                    MeterName="OS2温度"
-                                    MeterSelectedChangedCmd="{Binding MeterOS2TempSlopSelectedChangedCmd}"
-                                    ParConfigCommand="{Binding MeterOS2TempParConfigCmd}"
-                                    SelectedMeter="{Binding SelectedSlopOS2Temp, Mode=TwoWay}"
-                                    SwitchConstSlopCommand="{Binding MeterOS2TempSwitchConstSlopCmd}"
-                                    TotalSlopTime="{Binding MeterOS2TempExDto.SlopTime}" />
-                            </TabItem>
+
 
                             <!--<TabItem>
                                 <TabItem.Header>
@@ -1906,40 +1909,6 @@
                                     TotalSlopTime="{Binding MeterPTCPwExDto.SlopTime}" />
                             </TabItem>-->
 
-                            <TabItem>
-                                <TabItem.Header>
-                                    <StackPanel
-                                        Width="90"
-                                        Margin="-20"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center">
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="12"
-                                            FontWeight="Bold"
-                                            Text="压缩机环境湿度&#10;(%)" />
-                                    </StackPanel>
-                                </TabItem.Header>
-                                <Controls:MeterConfig
-                                    Margin="5,5,0,5"
-                                    AddCommand="{Binding ProStepEnvRHAddCmd}"
-                                    ConstSlopSelectedIndex="{Binding ProStepEnvRHSwitchConstSlopIndex, Mode=TwoWay}"
-                                    ConstantSaveCommand="{Binding ProStepEnvRHConstantSaveCmd}"
-                                    ConstantValue="{Binding SelectedConstEnvRHValue, Mode=TwoWay}"
-                                    Cycle="{Binding MeterEnvRHExDto.SlopCycle}"
-                                    DeleteCommand="{Binding ProStepEnvRHDeleteCmd}"
-                                    EditCommand="{Binding ProStepEnvRHEditCmd}"
-                                    IsTimeOk="{Binding MeterEnvRHExDto.IsTimeOk}"
-                                    ListMeter="{Binding ListSlopMeterEnvRHItems}"
-                                    MeterName="压缩机环境湿度"
-                                    MeterSelectedChangedCmd="{Binding MeterEnvRHSlopSelectedChangedCmd}"
-                                    ParConfigCommand="{Binding MeterEnvRHParConfigCmd}"
-                                    SelectedMeter="{Binding SelectedSlopEnvRH, Mode=TwoWay}"
-                                    SwitchConstSlopCommand="{Binding MeterEnvRHSwitchConstSlopCmd}"
-                                    TotalSlopTime="{Binding MeterEnvRHExDto.SlopTime}" />
-                            </TabItem>
-
                             <TabItem>
                                 <TabItem.Header>
                                     <StackPanel
@@ -1974,6 +1943,40 @@
                                     TotalSlopTime="{Binding MeterEnvTempExDto.SlopTime}" />
                             </TabItem>
 
+                            <TabItem>
+                                <TabItem.Header>
+                                    <StackPanel
+                                        Width="90"
+                                        Margin="-20"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center">
+                                        <TextBlock
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="12"
+                                            FontWeight="Bold"
+                                            Text="压缩机环境湿度&#10;(%)" />
+                                    </StackPanel>
+                                </TabItem.Header>
+                                <Controls:MeterConfig
+                                    Margin="5,5,0,5"
+                                    AddCommand="{Binding ProStepEnvRHAddCmd}"
+                                    ConstSlopSelectedIndex="{Binding ProStepEnvRHSwitchConstSlopIndex, Mode=TwoWay}"
+                                    ConstantSaveCommand="{Binding ProStepEnvRHConstantSaveCmd}"
+                                    ConstantValue="{Binding SelectedConstEnvRHValue, Mode=TwoWay}"
+                                    Cycle="{Binding MeterEnvRHExDto.SlopCycle}"
+                                    DeleteCommand="{Binding ProStepEnvRHDeleteCmd}"
+                                    EditCommand="{Binding ProStepEnvRHEditCmd}"
+                                    IsTimeOk="{Binding MeterEnvRHExDto.IsTimeOk}"
+                                    ListMeter="{Binding ListSlopMeterEnvRHItems}"
+                                    MeterName="压缩机环境湿度"
+                                    MeterSelectedChangedCmd="{Binding MeterEnvRHSlopSelectedChangedCmd}"
+                                    ParConfigCommand="{Binding MeterEnvRHParConfigCmd}"
+                                    SelectedMeter="{Binding SelectedSlopEnvRH, Mode=TwoWay}"
+                                    SwitchConstSlopCommand="{Binding MeterEnvRHSwitchConstSlopCmd}"
+                                    TotalSlopTime="{Binding MeterEnvRHExDto.SlopTime}" />
+                            </TabItem>
+
                         </TabControl>