2 次代碼提交 1ba3932a11 ... 2a4c19c95d

作者 SHA1 備註 提交日期
  user_zyx 2a4c19c95d Merge branch 'master' of http://39.106.7.239:3000/user_zyx/B20_UV_LogPC 9 月之前
  user_zyx 180832e26e 完成字典增删改查导 9 月之前

二進制
B20UVLog/CSVHelper.cs


二進制
B20UVLog/Models/DictModel.cs


+ 1 - 1
B20UVLog/Pages/ANALogData.xaml

@@ -24,7 +24,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>

+ 1 - 1
B20UVLog/Pages/Alarm.xaml

@@ -24,7 +24,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <Grid Grid.Row="2">
             <Grid.ColumnDefinitions>

+ 1 - 1
B20UVLog/Pages/AxisData.xaml

@@ -32,7 +32,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
             <My:MButton x:Name="BtnChart" Content="图表"  Click="BtnChart_Click" Type="Success"/>
         </StackPanel>
         <Grid Grid.Row="2">

二進制
B20UVLog/Pages/AxisData.xaml.cs


+ 1 - 1
B20UVLog/Pages/EQPStatus.xaml

@@ -24,7 +24,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>

+ 1 - 1
B20UVLog/Pages/GlassInformation.xaml

@@ -24,7 +24,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>

+ 1 - 1
B20UVLog/Pages/IO.xaml

@@ -25,7 +25,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>

+ 1 - 1
B20UVLog/Pages/LampData.xaml

@@ -24,7 +24,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>

+ 1 - 1
B20UVLog/Pages/LampUseTime.xaml

@@ -24,7 +24,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>

+ 1 - 1
B20UVLog/Pages/RecipeBody.xaml

@@ -24,7 +24,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>

+ 1 - 1
B20UVLog/Pages/RecipeCount.xaml

@@ -24,7 +24,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>

+ 1 - 1
B20UVLog/Pages/RobotInterfaceIn.xaml

@@ -23,7 +23,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <My:MPagination Grid.Row="1" x:Name="MyPagination" PageSize="1" PageIndexChange="MyPagination_PageIndexChange" IsShowTotalNum="False" IsShowPageSize="False"/>
         <StackPanel x:Name="DP" Grid.Row="2">

+ 1 - 1
B20UVLog/Pages/RobotInterfaceOut.xaml

@@ -23,7 +23,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <My:MPagination Grid.Row="1" x:Name="MyPagination" PageSize="1" PageIndexChange="MyPagination_PageIndexChange" IsShowTotalNum="False" IsShowPageSize="False"/>
         <StackPanel x:Name="DP" Grid.Row="2">

+ 1 - 1
B20UVLog/Pages/SYSPara.xaml

@@ -23,7 +23,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <StackPanel x:Name="DP" Grid.Row="1">
             <My:MPagination x:Name="MyPagination" PageSize="1" 

+ 1 - 1
B20UVLog/Pages/ServoAxisStatus.xaml

@@ -24,7 +24,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>

+ 1 - 1
B20UVLog/Pages/YMeasureData.xaml

@@ -21,7 +21,7 @@
             <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
             <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
             <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            <!--<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"/>

二進制
B20UVLog/ViewModels/DictionarySetViewModel.cs


二進制
B20UVLog/Windows/Chart.xaml.cs


+ 42 - 10
B20UVLog/Windows/DictionarySet.xaml

@@ -14,28 +14,60 @@
     <Grid>
         <DockPanel LastChildFill="True" Margin="20">
             <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-                <My:MComboBox Title="选择字典种类">
-                    <ComboBoxItem>常规</ComboBoxItem>
-                    <ComboBoxItem>警告</ComboBoxItem>
-                    <ComboBoxItem>报警</ComboBoxItem>
+                <My:MComboBox Title="选择字典种类" Text="{Binding Type}">
+                    <ComboBoxItem>Normal</ComboBoxItem>
+                    <ComboBoxItem>Alarm</ComboBoxItem>
+                    <ComboBoxItem>Warn</ComboBoxItem>
                 </My:MComboBox>
-                <My:MButton Type="Primary">新增</My:MButton>
-                <My:MButton Type="Warning">导入</My:MButton>
+                <My:MTextBox Title="字典编码" Text="{Binding Code}"/>
+                <My:MButton Type="Primary" Click="MButton_Search_Click">查询</My:MButton>
+                <My:MButton Click="MButton_Reset_Click">条件重置</My:MButton>
+                <My:MButton Type="Primary" Click="MButton_Add_Click">新增</My:MButton>
+                <My:MButton Type="Success" Click="MButton_Import_Click">导入</My:MButton>
+                <My:MButton Type="Warning" Click="MButton_Export_Click">导出</My:MButton>
+                <Popup x:Name="PopDict" Placement="Bottom" PopupAnimation="Slide" StaysOpen="False">
+                    <Border Background="White" 
+                            BorderBrush="{StaticResource DefaultBorderBrushLight}"
+                            BorderThickness="{StaticResource DefaultBorderThickness}"
+                            Margin="0">
+                        <StackPanel>
+                            <TextBlock x:Name="TextTitle" FontSize="18" Margin="10 10 10 0"/>
+                            <Grid Height="260" Width="300" Margin="10">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <My:MComboBox x:Name="EditType" Grid.Row="0" Title="选择字典种类">
+                                    <ComboBoxItem>Normal</ComboBoxItem>
+                                    <ComboBoxItem>Alarm</ComboBoxItem>
+                                    <ComboBoxItem>Warn</ComboBoxItem>
+                                </My:MComboBox>
+                                <My:MTextBox x:Name="EditCode" Grid.Row="1" Title="字典编码"/>
+                                <My:MTextBox x:Name="EditKey" Grid.Row="2" Title="字典键"/>
+                                <My:MTextBox x:Name="EditValue" Grid.Row="3" Title="字典值"/>
+                                <My:MButton Grid.Row="4" Type="Primary" Width="{StaticResource DefaultWidth}" Click="MButton_OK_Click">确定</My:MButton>
+                            </Grid>
+                        </StackPanel>
+                    </Border>
+                </Popup>
+
             </StackPanel>
-            <My:MPagination DockPanel.Dock="Bottom"/>
+            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom" PageIndexChange="MPagination_PageIndexChange" PageSizeChange="MPagination_PageSizeChange"/>
             <My:MDataGrid ItemsSource="{Binding Dicts}" DockPanel.Dock="Top">
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="类型" Binding="{Binding Type}" Width="100"></DataGridTextColumn>
                     <DataGridTextColumn Header="编码" Binding="{Binding Code}" Width="100"></DataGridTextColumn>
                     <DataGridTextColumn Header="键" Binding="{Binding Key}" Width="100"></DataGridTextColumn>
                     <DataGridTextColumn Header="值" Binding="{Binding Value}" Width="100"></DataGridTextColumn>
-                    <DataGridTextColumn Header="备注" Binding="{Binding Mask}" Width="100"></DataGridTextColumn>
                     <DataGridTemplateColumn>
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
-                                    <My:MButton IsText="True" Icon="{StaticResource Icon-edit}">编辑</My:MButton>
-                                    <My:MButton IsText="True" Icon="{StaticResource Icon-trash-alt}">删除</My:MButton>
+                                    <My:MButton IsText="True" Icon="{StaticResource Icon-edit}" Click="MButton_Edit_Click">编辑</My:MButton>
+                                    <My:MButton IsText="True" Icon="{StaticResource Icon-trash-alt}" Click="MButton_Delete_Click">删除</My:MButton>
                                 </StackPanel>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>

二進制
B20UVLog/Windows/DictionarySet.xaml.cs


二進制
dll/MyWPFControl.dll