Browse Source

临时提交

谢翼翔 1 year ago
parent
commit
983ea6e03c

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

@@ -96,11 +96,15 @@ namespace SCADA_DAQ.Customer
 
 
         public void OeeChart(string deviceName, IList<string> DeviceAisxX, IChartValues DeviceAxisY)
         public void OeeChart(string deviceName, IList<string> DeviceAisxX, IChartValues DeviceAxisY)
         {
         {
-
+            var dayCount = DateTime.Now.Day;
             var listdouble = OeePercent(deviceName);
             var listdouble = OeePercent(deviceName);
             for (int i = 0; i < listdouble.Count; i++)
             for (int i = 0; i < listdouble.Count; i++)
             {
             {
-                DeviceAxisY.Add(listdouble[i]);
+                if ( i < dayCount)
+                {
+                    DeviceAxisY.Add(listdouble[i]);
+                }
+               
                 DeviceAisxX.Add(((i + 1).ToString() + "日"));
                 DeviceAisxX.Add(((i + 1).ToString() + "日"));
 
 
             }
             }

+ 2 - 2
skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ/Customer/Views/Uct/UctDeviceChart.xaml.cs

@@ -30,8 +30,8 @@ namespace SCADA_DAQ.Customer.Views.Uct
             InitializeComponent();
             InitializeComponent();
             OeeValue.FontSize = 10;
             OeeValue.FontSize = 10;
             OeeValue.Foreground = new SolidColorBrush(Colors.White);
             OeeValue.Foreground = new SolidColorBrush(Colors.White);
-            OeeValue.Title = "设备Oee";
-            OeeValueAGV.Title = "设备Oee平均值";
+            OeeValue.Title = "设备时间稼动率";
+            OeeValueAGV.Title = "设备时间稼动率平均值";
             OeeValue.LabelPoint = t => string.Format("{0}%", t.Y);
             OeeValue.LabelPoint = t => string.Format("{0}%", t.Y);
             OeeValueAGV.LabelPoint = t => string.Format("{0}%", t.Y);
             OeeValueAGV.LabelPoint = t => string.Format("{0}%", t.Y);