diff --git a/CapMachine.Model/QuickCpLimtNo.cs b/CapMachine.Model/QuickLimtNo.cs similarity index 94% rename from CapMachine.Model/QuickCpLimtNo.cs rename to CapMachine.Model/QuickLimtNo.cs index d0e3d38..e446eff 100644 --- a/CapMachine.Model/QuickCpLimtNo.cs +++ b/CapMachine.Model/QuickLimtNo.cs @@ -7,8 +7,8 @@ using System.Threading.Tasks; namespace CapMachine.Model { - [Table(Name = "QuickCpLimtNo")] - public class QuickCpLimtNo + [Table(Name = "QuickLimtNo")] + public class QuickLimtNo { /// /// 主键 diff --git a/CapMachine.Model/QuickCpPIDNo.cs b/CapMachine.Model/QuickPIDNo.cs similarity index 95% rename from CapMachine.Model/QuickCpPIDNo.cs rename to CapMachine.Model/QuickPIDNo.cs index 1de77da..ea84752 100644 --- a/CapMachine.Model/QuickCpPIDNo.cs +++ b/CapMachine.Model/QuickPIDNo.cs @@ -7,8 +7,8 @@ using System.Threading.Tasks; namespace CapMachine.Model { - [Table(Name = "QuickCpPIDNo")] - public class QuickCpPIDNo + [Table(Name = "QuickPIDNo")] + public class QuickPIDNo { /// /// 主键 diff --git a/CapMachine.Model/QuickProStepExecute.cs b/CapMachine.Model/QuickProStepExecute.cs index f21e6ac..1aa359f 100644 --- a/CapMachine.Model/QuickProStepExecute.cs +++ b/CapMachine.Model/QuickProStepExecute.cs @@ -119,7 +119,7 @@ namespace CapMachine.Model /// /// PID NO-CpPIDNoInfo-用的是Cp表的QuickCpPIDNo模型,是一样的,因为里面有仪表名称 /// - public QuickCpPIDNo KpPIDNoInfo { get; set; } + public QuickPIDNo KpPIDNoInfo { get; set; } /// /// Limit NO @@ -130,7 +130,7 @@ namespace CapMachine.Model /// /// PID NO-CpPIDNoInfo 用的是Cp表的QuickCpLimtNo模型,是一样的,因为里面有仪表名称 /// - public QuickCpLimtNo KpLimitNoInfo { get; set; } + public QuickLimtNo KpLimitNoInfo { get; set; } /// /// Alarm NO diff --git a/CapMachine.Wpf/Models/Meter/MeterRtDataModel.cs b/CapMachine.Wpf/Models/Meter/MeterRtDataModel.cs index 9f5e99f..9585bd1 100644 --- a/CapMachine.Wpf/Models/Meter/MeterRtDataModel.cs +++ b/CapMachine.Wpf/Models/Meter/MeterRtDataModel.cs @@ -60,10 +60,12 @@ namespace CapMachine.Wpf.Models ////////////////////////////////////////////////// #region 仪表实时数据 + + + private OperateResult _RtOperateResultContinuousData; /// /// 通信结果长度连续值 /// - private OperateResult _RtOperateResultContinuousData; public OperateResult RtOperateResultContinuousData { get { return _RtOperateResultContinuousData; } @@ -79,6 +81,7 @@ namespace CapMachine.Wpf.Models get { return _RtOperateResultPV; } set { _RtOperateResultPV = value; } } + private double _RtPV; /// /// 实时值PV