临时提交

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ/Customer/Models/OEEData/OeeProperty.cs

@@ -8,7 +8,7 @@ namespace SCADA_DAQ.Customer.Models.OEEData
 {
     public class OeeProperty
     {
-        public List<double> DeviceEvceryOeePercent { get; set; }
+        public List<double> DeviceEveryDayOeePercent { get; set; }
 
 
     }

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ/Customer/UctFrmDeviceOeeInformation.xaml.cs

@@ -23,22 +23,22 @@ namespace SCADA_DAQ.Customer
     /// <summary>
     /// UctFrmDeviceOeeInformation.xaml 的交互逻辑
     /// </summary>
-    [UctMenu("设备OEE界面",Icon ="看板")]
+    [UctMenu("设备OEE界面", Icon = "看板")]
     public partial class UctFrmDeviceOeeInformation : BaseUctFrm
     {
-       
+        public OeeProperty DeviceOeePercenValue = new OeeProperty();
         public UctFrmDeviceOeeInformation()
         {
             InitializeComponent();
-         
+
             ToolBar.Visibility = Visibility.Collapsed;
             Image_Title.Source = SCADA.CommonCtrl.WpfHelper.VisualHelper.ImageToImageSource(@"Icon\VertivBck.png");
             LocalTime.Text = DateTime.Now.ToString("dddd yyyy年MM月dd日 HH:mm");
             GetOeeData();
 
-            new OeeProperty().DeviceEvceryOeePercent = OeePercent("高机母线冲剪机");
-            
+            DeviceOeePercenValue.DeviceEveryDayOeePercent= OeePercent("高机母线冲剪机");
 
+            
         }
         public IEnumerable<OEEDataModel> OeeData { get; set; }
 
@@ -49,7 +49,7 @@ namespace SCADA_DAQ.Customer
             var first = DateTime.Parse(Days.First().StartTime.ToString());
             var last = DateTime.Parse(Days.Last().EndTime.ToString());
             OeeData = Env.SqlDAL.App_Vertiv_MachineInfoOeeData.GetData<OEEDataModel>().Where(t => t.CreateTime >= first & t.CreateTime <= last);
-            
+
         }
         public List<double> OeePercent(string deviceName)
         {
@@ -75,7 +75,7 @@ namespace SCADA_DAQ.Customer
                     }
                 }
                 allOeePercentage.Add(dayRunTime);
-                dayRunTime=0;
+                dayRunTime = 0;
             }
             return allOeePercentage;
         }