Browse Source

2024年7月3日

user_zyx 1 year ago
parent
commit
ae601afa1d

+ 0 - 4
B20UVLog/B20UVLog.csproj

@@ -21,10 +21,6 @@
     </Reference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Helpers\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\TFT-MelsecMcNet\TFT-MelsecMcNet.csproj" />
   </ItemGroup>

BIN
B20UVLog/ConfigHelper.cs


+ 4 - 1
B20UVLog/MainWindow.xaml

@@ -6,7 +6,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:B20UVLog" xmlns:viewmodels="clr-namespace:B20UVLog.ViewModels"
              mc:Ignorable="d"
-        Title="UV Log" Height="960" Width="1800">
+        Title="UV Log" Height="960" Width="1800"
+             WindowState="Maximized">
     <Window.DataContext>
         <viewmodels:MainWindowViewModel/>
     </Window.DataContext>
@@ -50,7 +51,9 @@
                 <My:MTreeViewItem Header="EQP Status"></My:MTreeViewItem>
                 <My:MTreeViewItem Header="Recipe Count"></My:MTreeViewItem>
                 <My:MTreeViewItem Header="ANALog Data"></My:MTreeViewItem>
+                <My:MTreeViewItem Header="Lamp Data"></My:MTreeViewItem>
                 <My:MTreeViewItem Header="Alarm"></My:MTreeViewItem>
+                <My:MTreeViewItem Header="Warning"></My:MTreeViewItem>
                 <My:MTreeViewItem Header="IO"></My:MTreeViewItem>
             </TreeView>
         </Grid>

BIN
B20UVLog/MainWindow.xaml.cs


BIN
B20UVLog/Models/PLCItem.cs


BIN
B20UVLog/Models/ServoAxisStatusModel.cs


+ 8 - 4
B20UVLog/Pages/ANALogData.xaml

@@ -23,10 +23,14 @@
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
-        </StackPanel>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <My:MDataGrid x:Name="MyControlDataGrid"  AutoGenerateColumns="True"/>
+            <My:MPagination x:Name="MyPagination"  PageIndexChange="MyPagination_PageIndexChange"/>
+        </Grid>
 
     </Grid>
 

+ 8 - 4
B20UVLog/Pages/Alarm.xaml

@@ -23,10 +23,14 @@
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
-        </StackPanel>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <My:MDataGrid x:Name="MyControlDataGrid"  AutoGenerateColumns="True"/>
+            <My:MPagination x:Name="MyPagination"  PageIndexChange="MyPagination_PageIndexChange"/>
+        </Grid>
 
     </Grid>
 

+ 72 - 8
B20UVLog/Pages/AxisData.xaml

@@ -18,7 +18,7 @@
         </Grid.RowDefinitions>
         <TextBlock Grid.Row="0" Text="Axis Data" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
-            <My:MComboBox>
+            <My:MComboBox SelectedIndex="{Binding DataGroupIndex}" SelectionChanged="MComboBox_SelectionChanged">
                 <ComboBoxItem>WSZ1,2,3,4</ComboBoxItem>
                 <ComboBoxItem>WSX1,2 WSY1,2</ComboBoxItem>
                 <ComboBoxItem>CSXL,CSYL,CSZL</ComboBoxItem>
@@ -33,17 +33,81 @@
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
             <My:MButton x:Name="BtnChart" Content="图表"  Click="BtnChart_Click" Type="Success"/>
         </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
-        </StackPanel>
-        <Popup x:Name="PopupChart" StaysOpen="False" PlacementRectangle="10,50,0,0">
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <My:MDataGrid x:Name="DataGrid1" ItemsSource="{Binding GridData1}" Visibility="Collapsed">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="WSZ1(mm)" Binding="{Binding WSZ1,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="WSZ2(mm)" Binding="{Binding WSZ2,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="WSZ3(mm)" Binding="{Binding WSZ3,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="WSZ4(mm)" Binding="{Binding WSZ4,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="时间" Binding="{Binding RecordTime}"/>
+                </DataGrid.Columns>
+            </My:MDataGrid>
+            <My:MDataGrid x:Name="DataGrid2" ItemsSource="{Binding GridData2}" Visibility="Collapsed">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="WSX1(mm)" Binding="{Binding WSX1,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="WSX2(mm)" Binding="{Binding WSX2,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="WSY1(mm)" Binding="{Binding WSY1,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="WSY2(mm)" Binding="{Binding WSY2,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="时间" Binding="{Binding RecordTime}"/>
+                </DataGrid.Columns>
+            </My:MDataGrid>
+            <My:MDataGrid x:Name="DataGrid3" ItemsSource="{Binding GridData3}" Visibility="Collapsed">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="CSXL(mm)" Binding="{Binding CSXL,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="CSYL(mm)" Binding="{Binding CSYL,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="CSZL(mm)" Binding="{Binding CSZL,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="时间" Binding="{Binding RecordTime}"/>
+                </DataGrid.Columns>
+            </My:MDataGrid>
+            <My:MDataGrid x:Name="DataGrid4" ItemsSource="{Binding GridData4}" Visibility="Collapsed">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="CSXR(mm)" Binding="{Binding CSXR,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.0001}"/>
+                    <DataGridTextColumn Header="CSYR(mm)" Binding="{Binding CSYR,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.0001}"/>
+                    <DataGridTextColumn Header="CSZR(度)" Binding="{Binding CSZR,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.00001}"/>
+                    <DataGridTextColumn Header="时间" Binding="{Binding RecordTime}"/>
+                </DataGrid.Columns>
+            </My:MDataGrid>
+            <My:MDataGrid x:Name="DataGrid5" ItemsSource="{Binding GridData5}" Visibility="Collapsed">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="WSL(mm)" Binding="{Binding WSL,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="WSS(mm)" Binding="{Binding WSS,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
+                    <DataGridTextColumn Header="时间" Binding="{Binding RecordTime}"/>
+                </DataGrid.Columns>
+            </My:MDataGrid>
+            <My:MPagination x:Name="MyPagination" Grid.Row="1" PageIndexChange="MyPagination_PageIndexChange"/>
+        </Grid>
+        <Popup x:Name="PopupChart" StaysOpen="False" PlacementRectangle="10,100,0,0">
             <Border Background="White" BorderThickness="1" BorderBrush="{StaticResource DefaultBorderBrush}" Padding="10">
-                <lvc:CartesianChart Height="450" Width="800" 
+                <StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                    </StackPanel>
+                    <lvc:CartesianChart Height="600" Width="1000" 
                                     Series="{Binding Series}" 
                                     Title="{Binding Title}"
                                     LegendPosition="Top">
-                </lvc:CartesianChart>
+                    </lvc:CartesianChart>
+                </StackPanel>
             </Border>
         </Popup>
     </Grid>

BIN
B20UVLog/Pages/AxisData.xaml.cs


+ 8 - 4
B20UVLog/Pages/EQPStatus.xaml

@@ -23,10 +23,14 @@
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
-        </StackPanel>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <My:MDataGrid x:Name="MyControlDataGrid"  AutoGenerateColumns="True"/>
+            <My:MPagination x:Name="MyPagination" PageIndexChange="MyPagination_PageIndexChange"/>
+        </Grid>
 
     </Grid>
 

+ 70 - 6
B20UVLog/Pages/GlassInformation.xaml

@@ -3,11 +3,13 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:B20UVLog.Pages" xmlns:My="clr-namespace:MyWPFControl.Controls;assembly=MyWPFControl"
+      xmlns:local="clr-namespace:B20UVLog.Pages" xmlns:My="clr-namespace:MyWPFControl.Controls;assembly=MyWPFControl" xmlns:viewmodels="clr-namespace:B20UVLog.ViewModels"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="GlassInformation">
-
+    <Page.DataContext>
+        <viewmodels:GlassInformationViewModel/>
+    </Page.DataContext>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>
@@ -24,10 +26,72 @@
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
-        </StackPanel>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <My:MDataGrid x:Name="MyControlDataGrid" ItemsSource="{Binding GridData}" >
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="LordingTime" Binding="{Binding LordingTime}"/>
+                    <DataGridTextColumn Header="UnlordingTime" Binding="{Binding UnlordingTime}"/>
+                    <DataGridTextColumn Header="GlassID1" Binding="{Binding GlassID1}"/>
+                    <DataGridTextColumn Header="GlassID2" Binding="{Binding GlassID2}"/>
+                    <DataGridTextColumn Header="GlassID3" Binding="{Binding GlassID3}"/>
+                    <DataGridTextColumn Header="GlassID4" Binding="{Binding GlassID4}"/>
+                    <DataGridTextColumn Header="GlassID5" Binding="{Binding GlassID5}"/>
+                    <DataGridTextColumn Header="GlassID6" Binding="{Binding GlassID6}"/>
+                    <DataGridTextColumn Header="GlassID7" Binding="{Binding GlassID7}"/>
+                    <DataGridTextColumn Header="GlassID8" Binding="{Binding GlassID8}"/>
+                    <DataGridTextColumn Header="GlassID9" Binding="{Binding GlassID9}"/>
+                    <DataGridTextColumn Header="GlassID10" Binding="{Binding GlassID10}"/>
+                    <DataGridTextColumn Header="QTimeData(s)" Binding="{Binding QTimeData}"/>
+                    <DataGridTextColumn Header="TactTime(s)" Binding="{Binding TactTime,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="AlignmentResult" Binding="{Binding AlignmentResult}"/>
+                    <DataGridTextColumn Header="dx-L(μm)" Binding="{Binding AlignmentResult_dxL}"/>
+                    <DataGridTextColumn Header="dy-L(μm)" Binding="{Binding AlignmentResult_dyL}"/>
+                    <DataGridTextColumn Header="dx-R(μm)" Binding="{Binding AlignmentResult_dxR}"/>
+                    <DataGridTextColumn Header="dy-R(μm)" Binding="{Binding AlignmentResult_dyR}"/>
+                    <DataGridTextColumn Header="X(μm)" Binding="{Binding AlignmentResult_X}"/>
+                    <DataGridTextColumn Header="Y(μm)" Binding="{Binding AlignmentResult_Y}"/>
+                    <DataGridTextColumn Header="Z(度)" Binding="{Binding AlignmentResult_Z,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.0001}"/>
+                    <DataGridTextColumn Header="IrradiationTime(s)" Binding="{Binding IrradiationTime,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L1-Luminance(W/cm²)" Binding="{Binding L1Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L2-Luminance(W/cm²)" Binding="{Binding L2Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L3-Luminance(W/cm²)" Binding="{Binding L3Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L4-Luminance(W/cm²)" Binding="{Binding L4Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L5-Luminance(W/cm²)" Binding="{Binding L5Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L6-Luminance(W/cm²)" Binding="{Binding L6Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L7-Luminance(W/cm²)" Binding="{Binding L7Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L8-Luminance(W/cm²)" Binding="{Binding L8Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L9-Luminance(W/cm²)" Binding="{Binding L9Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L10-Luminance(W/cm²)" Binding="{Binding L10Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L11-Luminance(W/cm²)" Binding="{Binding L11Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L12-Luminance(W/cm²)" Binding="{Binding L12Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L13-Luminance(W/cm²)" Binding="{Binding L13Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="L14-Luminance(W/cm²)" Binding="{Binding L14Luminance,
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.1}"/>
+                    <DataGridTextColumn Header="时间" Binding="{Binding RecordTime}"/>
+                </DataGrid.Columns>
+            </My:MDataGrid>
+            <My:MPagination Grid.Row="1" x:Name="MyPagination" PageIndexChange="MyPagination_PageIndexChange"/>
+        </Grid>
 
     </Grid>
 

BIN
B20UVLog/Pages/GlassInformation.xaml.cs


+ 8 - 4
B20UVLog/Pages/IO.xaml

@@ -23,10 +23,14 @@
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
-        </StackPanel>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <My:MDataGrid x:Name="MyControlDataGrid"  AutoGenerateColumns="True"/>
+            <My:MPagination x:Name="MyPagination"  PageIndexChange="MyPagination_PageIndexChange"/>
+        </Grid>
 
     </Grid>
 

+ 14 - 0
B20UVLog/Pages/LampData.xaml

@@ -0,0 +1,14 @@
+<Page x:Class="B20UVLog.Pages.LampData"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:B20UVLog.Pages"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="LampData">
+
+    <Grid>
+        
+    </Grid>
+</Page>

BIN
B20UVLog/Pages/LampData.xaml.cs


+ 8 - 4
B20UVLog/Pages/LampUseTime.xaml

@@ -24,10 +24,14 @@
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
-        </StackPanel>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <My:MDataGrid x:Name="MyControlDataGrid"  AutoGenerateColumns="True"/>
+            <My:MPagination Grid.Row="1" x:Name="MyPagination" PageIndexChange="MyPagination_PageIndexChange"/>
+        </Grid>
 
     </Grid>
 

+ 8 - 4
B20UVLog/Pages/RecipeBody.xaml

@@ -23,10 +23,14 @@
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
-        </StackPanel>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <My:MDataGrid x:Name="MyControlDataGrid" AutoGenerateColumns="True"/>
+            <My:MPagination Grid.Row="1" x:Name="MyPagination" PageIndexChange="MyPagination_PageIndexChange"/>
+        </Grid>
 
     </Grid>
 

+ 8 - 4
B20UVLog/Pages/RecipeCount.xaml

@@ -23,10 +23,14 @@
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
-        </StackPanel>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <My:MDataGrid x:Name="MyControlDataGrid"  AutoGenerateColumns="True"/>
+            <My:MPagination x:Name="MyPagination"   PageIndexChange="MyPagination_PageIndexChange"/>
+        </Grid>
 
     </Grid>
 

+ 1 - 1
B20UVLog/Pages/RobotInterface.xaml

@@ -22,7 +22,7 @@
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
-        <My:MPagination Grid.Row="1" x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
+        <My:MPagination Grid.Row="1" x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange" IsShowPageSize="False"/>
         <StackPanel x:Name="DP" Grid.Row="2">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>

+ 405 - 4
B20UVLog/Pages/SYSPara.xaml

@@ -24,19 +24,22 @@
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
         <StackPanel x:Name="DP" Grid.Row="1">
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
+            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange" IsShowPageSize="False"/>
         </StackPanel>
         <WrapPanel Grid.Row="2" Orientation="Vertical" Margin="10 10 0 0" IsHitTestVisible="False">
             <WrapPanel.Resources>
                 <Style TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle}">
-                    <Setter Property="Width" Value="150"/>
+                    <!--<Setter Property="Width" Value="165"/>-->
                     <Setter Property="TextAlignment" Value="Right"/>
-                    <Setter Property="Margin" Value="0 0 5 0"/>
+                    <Setter Property="Margin" Value="5 0 5 0"/>
                 </Style>
                 <Style TargetType="My:MTextBox" BasedOn="{StaticResource TextBoxStyle}">
-                    <Setter Property="Width" Value="120"/>
+                    <Setter Property="Width" Value="80"/>
                     <Setter Property="Title" Value=""/>
                 </Style>
+                <Style TargetType="My:MRadioButton" BasedOn="{StaticResource RadioButtonStyle}">
+                    <Setter Property="Margin" Value="2 0 -15 0"/>
+                </Style>
                 <Style TargetType="StackPanel">
                     <Setter Property="Orientation" Value="Horizontal"/>
                 </Style>
@@ -193,6 +196,404 @@
                 <My:MRadioButton>有效</My:MRadioButton>
                 <My:MRadioButton>无效</My:MRadioButton>
             </StackPanel>
+            <StackPanel>
+                <TextBlock>StageZ允许偏差值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>StageZ允许电流差值异常:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>StageZ允许偏差值报警:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>StageZ允许偏差值异常检测时间:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Camera1-X Alignment位置:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Camera1-Y Alignment位置:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Camera1-Z Alignment位置:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Camera2-X Alignment位置:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Camera2-Y Alignment位置:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Camera2-Z Alignment位置:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask装/卸上升量:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask装/卸上升次数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask装/卸上升速度:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask装/卸上升待机时间:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask装/卸下降量:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask装/卸下降次数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask装/卸下降速度:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask装/卸下降待机时间:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask吸着位置移动速度:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask Load Over报警次数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>最大照射时间:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp1照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp2照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp3照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp4照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp5照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp6照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp7照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp8照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp9照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp10照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp11照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp12照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp13照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp14照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp1照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp2照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp3照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp4照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp5照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp6照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp7照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp8照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp9照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp10照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp11照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp12照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp13照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp14照度校正系数:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp1照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp2照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp3照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp4照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp5照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp6照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp7照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp8照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp9照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp10照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp11照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp12照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp13照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>UV Lamp14照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp1照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp2照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp3照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp4照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp5照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp6照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp7照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp8照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp9照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp10照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp11照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp12照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp13照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>可视光 Lamp14照度设定值:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Work Thickness Max:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Work Thickness Min:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask预热:</TextBlock>
+                <My:MRadioButton>有效</My:MRadioButton>
+                <My:MRadioButton>无效</My:MRadioButton>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Mask装/卸高速速度:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>照度调整/测定速度:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>Lamp使用时间上限:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor1 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor2 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor3 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor4 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor5 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor6 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor7 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor8 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor9 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor10 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor11 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor12 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor13 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor14 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>漏水Sensor15 Check:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>MaintPassword:</TextBlock>
+                <My:MTextBox/>
+            </StackPanel>
+            
         </WrapPanel>
     </Grid>
 

+ 22 - 23
B20UVLog/Pages/ServoAxisStatus.xaml

@@ -3,10 +3,13 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:B20UVLog.Pages" xmlns:My="clr-namespace:MyWPFControl.Controls;assembly=MyWPFControl"
+      xmlns:local="clr-namespace:B20UVLog.Pages" xmlns:My="clr-namespace:MyWPFControl.Controls;assembly=MyWPFControl" xmlns:viewmodels="clr-namespace:B20UVLog.ViewModels"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="ServoAxisStatus">
+    <Page.DataContext>
+        <viewmodels:ServoAxisStatusViewModel/>
+    </Page.DataContext>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>
@@ -15,24 +18,7 @@
         </Grid.RowDefinitions>
         <TextBlock Grid.Row="0" Text="Servo Axis Status" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
-            <My:MComboBox>
-                <ComboBoxItem>WSZ1</ComboBoxItem>
-                <ComboBoxItem>WSZ2</ComboBoxItem>
-                <ComboBoxItem>WSZ3</ComboBoxItem>
-                <ComboBoxItem>WSZ4</ComboBoxItem>
-                <ComboBoxItem>WSX1</ComboBoxItem>
-                <ComboBoxItem>WSX2</ComboBoxItem>
-                <ComboBoxItem>WSY1</ComboBoxItem>
-                <ComboBoxItem>WSY2</ComboBoxItem>
-                <ComboBoxItem>CSXL</ComboBoxItem>
-                <ComboBoxItem>CSYL</ComboBoxItem>
-                <ComboBoxItem>CSZL</ComboBoxItem>
-                <ComboBoxItem>CSXR</ComboBoxItem>
-                <ComboBoxItem>CSYR</ComboBoxItem>
-                <ComboBoxItem>CSZR</ComboBoxItem>
-                <ComboBoxItem>WSL</ComboBoxItem>
-                <ComboBoxItem>WSS</ComboBoxItem>
-            </My:MComboBox>
+            <My:MComboBox SelectedItem="{Binding AxisName}" ItemsSource="{Binding AxisNames}" SelectionChanged="MComboBox_SelectionChanged"/>
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>
             <TextBlock Text="--" VerticalAlignment="Center" Margin="2"/>
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
@@ -40,10 +26,23 @@
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
-        </StackPanel>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <My:MDataGrid x:Name="MyControlDataGrid" ItemsSource="{Binding GridData}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="AxisName" Binding="{Binding AxisName}"/>
+                    <DataGridTextColumn Header="AlarmCode" Binding="{Binding AlarmCode}"/>
+                    <DataGridTextColumn Header="AlarmDescribe" Binding="{Binding AlarmDescribe}"/>
+                    <DataGridTextColumn Header="WarningCode" Binding="{Binding WarningCode}"/>
+                    <DataGridTextColumn Header="WarningDescribe" Binding="{Binding WarningDescribe}"/>
+                    <DataGridTextColumn Header="时间" Binding="{Binding RecordTime}"/>
+                </DataGrid.Columns>
+            </My:MDataGrid>
+            <My:MPagination Grid.Row="1" x:Name="MyPagination" PageIndexChange="MyPagination_PageIndexChange"/>
+        </Grid>
 
     </Grid>
 

BIN
B20UVLog/Pages/ServoAxisStatus.xaml.cs


+ 1 - 1
B20UVLog/Pages/YMeasureData.xaml

@@ -24,8 +24,8 @@
             <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
         </StackPanel>
         <StackPanel x:Name="DP" Grid.Row="2">
+            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange" IsShowPageSize="False"/>
             <My:MDataGrid x:Name="MyControlDataGrid" DockPanel.Dock="Top" AutoGenerateColumns="True"/>
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange"/>
         </StackPanel>
 
     </Grid>

BIN
B20UVLog/ViewModels/AxisDataViewModel.cs


BIN
B20UVLog/ViewModels/DBSetViewModel.cs


BIN
B20UVLog/ViewModels/GlassInformationViewModel.cs


BIN
B20UVLog/ViewModels/PLCSetViewModel.cs


BIN
B20UVLog/ViewModels/ServoAxisStatusViewModel.cs


BIN
B20UVLog/ViewModels/SysParaViewModel.cs


+ 16 - 14
B20UVLog/Windows/DBSet.xaml

@@ -4,10 +4,13 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:B20UVLog.Windows"
-        mc:Ignorable="d"
+        xmlns:local="clr-namespace:B20UVLog.Windows" xmlns:viewmodels="clr-namespace:B20UVLog.ViewModels"
+             mc:Ignorable="d"
              WindowStyle="ToolWindow"
         Title="数据库配置" Height="300" Width="750">
+    <Window.DataContext>
+        <viewmodels:DBSetViewModel/>
+    </Window.DataContext>
     <Grid>
         <Grid Margin="20">
             <Grid.Resources>
@@ -27,28 +30,27 @@
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
-                <RowDefinition/>
                 <RowDefinition Height="auto"/>
+                <RowDefinition/>
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="DataSource:"/>
-            <My:MTextBox  Grid.Column="1" Grid.Row="0"/>
+            <My:MTextBox  Grid.Column="1" Grid.Row="0" Text="{Binding DataSource}"/>
             <TextBlock Grid.Column="2" Grid.Row="0" Text="Port:"/>
-            <My:MTextBox  Grid.Column="3" Grid.Row="0"/>
+            <My:MTextBox  Grid.Column="3" Grid.Row="0" Text="{Binding Port}"/>
             <TextBlock Grid.Column="0" Grid.Row="1" Text="User:"/>
-            <My:MTextBox  Grid.Column="1" Grid.Row="1"/>
+            <My:MTextBox  Grid.Column="1" Grid.Row="1" Text="{Binding User}"/>
             <TextBlock Grid.Column="2" Grid.Row="1" Text="Password:"/>
-            <My:MTextBox  Grid.Column="3" Grid.Row="1"/>
+            <My:MTextBox  Grid.Column="3" Grid.Row="1" Text="{Binding Password}"/>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="Database:"/>
-            <My:MComboBox  Grid.Column="1" Grid.Row="2"/>
-            <My:MButton Grid.Column="2" Grid.Row="2" Content="刷新" Icon="{StaticResource Icon-sync}"/>
+            <My:MTextBox  Grid.Column="1" Grid.Row="2" Text="{Binding Database}"/>
             <StackPanel Orientation="Vertical" Grid.Row="3" Grid.ColumnSpan="5">
                 <TextBlock Text="连接字符串:" HorizontalAlignment="Left"/>
-                <TextBlock Text="balabalba" HorizontalAlignment="Left" Margin="10"/>
+                <TextBlock Text="{Binding ConStr}" HorizontalAlignment="Left" Margin="10"/>
+            </StackPanel>
+            <StackPanel Grid.Column="4" Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right">
+                <My:MButton Type="Primary" Command="{Binding SaveCommand}">确定</My:MButton>
+                <!--<My:MButton HorizontalAlignment="Right">取消</My:MButton>-->
             </StackPanel>
-            <DockPanel Grid.Column="4" Grid.Row="4" >
-                <My:MButton Type="Primary" DockPanel.Dock="Right">确定</My:MButton>
-                <My:MButton DockPanel.Dock="Right" HorizontalAlignment="Right">取消</My:MButton>
-            </DockPanel>
         </Grid>
     </Grid>
 </My:MWindow>

+ 51 - 6
B20UVLog/Windows/PLCSet.xaml

@@ -4,10 +4,13 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:B20UVLog.Windows"
-        mc:Ignorable="d"
+        xmlns:local="clr-namespace:B20UVLog.Windows" xmlns:viewmodels="clr-namespace:B20UVLog.ViewModels"
+             mc:Ignorable="d"
              WindowStyle="ToolWindow"
-        Title="PLC配置" Height="650" Width="1240">
+        Title="PLC配置" Height="800" Width="1400">
+    <Window.DataContext>
+        <viewmodels:PLCSetViewModel/>
+    </Window.DataContext>
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
@@ -32,12 +35,13 @@
             <Line DockPanel.Dock="Top" Stroke="{StaticResource DefaultBorderBrush}" X1="0" X2="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=DockPanel}}" StrokeThickness="2" Margin="10"/>
             <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
                 <TextBlock>PLC地址:</TextBlock>
-                <My:MTextBox></My:MTextBox>
+                <My:MTextBox Clearable="True"></My:MTextBox>
                 <My:MButton Type="Primary">查询</My:MButton>
-                <My:MButton Type="Primary" Plain="True">导入</My:MButton>
+                <My:MButton Type="Primary">新增</My:MButton>
+                <My:MButton Type="Warning">导入</My:MButton>
             </StackPanel>
             <My:MPagination DockPanel.Dock="Bottom" Margin="5"/>
-            <My:MDataGrid ItemsSource="{Binding}" DockPanel.Dock="Top" Margin="10">
+            <My:MDataGrid ItemsSource="{Binding PLCItems}" DockPanel.Dock="Top" Margin="10">
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="地址" Binding="{Binding}" Width="100"></DataGridTextColumn>
                     <DataGridTextColumn Header="类型" Binding="{Binding}" Width="100"></DataGridTextColumn>
@@ -49,9 +53,50 @@
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
+                                    <My:MButton IsText="True" Icon="{StaticResource Icon-sign-out-alt}">读取</My:MButton>
+                                    <My:MButton x:Name="Btn_Write" IsText="True" Icon="{StaticResource Icon-sign-in-alt}">写入</My:MButton>
+                                    <StackPanel x:Name="Panel_Value" Orientation="Horizontal" Visibility="Collapsed">
+                                        <My:MTextBox x:Name="Text_Value" Width="80"/>
+                                        <My:MButton x:Name="Btn_Value_OK" Square="True" IsText="True" Icon="{StaticResource Icon-check}"/>
+                                        <My:MButton x:Name="Btn_Value_Cancel" Square="True" IsText="True" Icon="{StaticResource Icon-times}"/>
+                                    </StackPanel>
                                     <My:MButton IsText="True" Icon="{StaticResource Icon-edit}">编辑</My:MButton>
                                     <My:MButton IsText="True" Icon="{StaticResource Icon-trash-alt}">删除</My:MButton>
                                 </StackPanel>
+                                <DataTemplate.Triggers>
+                                    <EventTrigger SourceName="Btn_Write" RoutedEvent="Button.Click">
+                                        <BeginStoryboard>
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Panel_Value"
+                                                                               Storyboard.TargetProperty="(UIElement.Visibility)">
+                                                    <DiscreteObjectKeyFrame KeyTime="0"
+                                                                            Value="{x:Static Visibility.Visible}"/>
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Btn_Write"
+                                                                               Storyboard.TargetProperty="(UIElement.Visibility)">
+                                                    <DiscreteObjectKeyFrame KeyTime="0"
+                                                                            Value="{x:Static Visibility.Collapsed}"/>
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </BeginStoryboard>
+                                    </EventTrigger>
+                                    <EventTrigger SourceName="Btn_Value_Cancel" RoutedEvent="Button.Click">
+                                        <BeginStoryboard>
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Panel_Value"
+                                                                               Storyboard.TargetProperty="Visibility">
+                                                    <DiscreteObjectKeyFrame KeyTime="0"
+                                                                            Value="{x:Static Visibility.Collapsed}"/>
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Btn_Write"
+                                                                               Storyboard.TargetProperty="Visibility">
+                                                    <DiscreteObjectKeyFrame KeyTime="0"
+                                                                            Value="{x:Static Visibility.Visible}"/>
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </BeginStoryboard>
+                                    </EventTrigger>
+                                </DataTemplate.Triggers>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>

BIN
dll/MyWPFControl.dll