临时提交

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

@@ -55,7 +55,7 @@ namespace SCADA_DAQ.Customer
             YaWeiPBCDevice.Title = new string[] { "单位:%", "亚威PBC折弯机" };
             BaiChaoDevice.Title = new string[] { "单位:%", "百超折弯机" };
 
-            var LASER = OeePercentAVG("激光机");
+          
         }
 
         private void Schedual_DateTimeChanged(object sender, DateTimeChangedArgs e)
@@ -111,7 +111,7 @@ namespace SCADA_DAQ.Customer
             var listdouble = OeePercent(deviceName);
             for (int i = 0; i < listdouble.Count; i++)
             {
-                DeviceAxisY.Add( listdouble[i]);
+                DeviceAxisY.Add(listdouble[i]);
                 DeviceAisxX.Add(((i + 1).ToString() + "日"));
             }
             DeviceOeePercenValue.ChartOeeAxisYList = new ChartValues<double>();

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

@@ -18,6 +18,7 @@
             <local:UctMidcard Title="{Binding Title[1],ElementName=this}" FontSize="20" />
 
             <lvc:CartesianChart DisableAnimations="True" Margin="4" Grid.Row="2" DataClick="CartesianChart_DataClick" x:Name="OeeValueUpdate" >
+                
                 <lvc:CartesianChart.AxisX>
                     <lvc:Axis x:Name="Axisx" ShowLabels="True"  >
                         <lvc:Axis.Separator>
@@ -36,7 +37,8 @@
                 </lvc:CartesianChart.AxisY>
 
                 <lvc:CartesianChart.Series>
-                    <lvc:LineSeries  x:Name ="OeeValue"  DataLabels="True"  PointGeometrySize="10" />
+                   
+                    <lvc:LineSeries  x:Name ="OeeValue"  DataLabels="True"  PointGeometrySize="10"/>
                     <lvc:LineSeries  x:Name ="OeeValueAGV"  PointGeometrySize="5"/>
                 </lvc:CartesianChart.Series>
             </lvc:CartesianChart>

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

@@ -33,6 +33,8 @@ namespace SCADA_DAQ.Customer.Views.Uct
             OeeValue.Title = "设备Oee";
             OeeValueAGV.Title = "设备Oee平均值";
             
+
+
         }
         public void Update()
         {