wenjy
/
SlnMesnac.RfidUpload
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-修改最新样式

Browse Source
master
liuwf 1 month ago
parent 5bc630c44c
commit 5c309283a0
2 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File

26
SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
Unescape Escape View File

@ -4,8 +4,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SlnMesnac.RfidUpload.UI" xmlns:local="clr-namespace:SlnMesnac.RfidUpload.UI"
mc:Ignorable="d" mc:Ignorable="d" WindowState="Maximized"
Title="库存容器封发配发" Height="650" Width="1350"> Title="库存容器封发配发" Height="768" Width="1024">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
@ -65,17 +65,17 @@
Foreground="#0288d1" > Foreground="#0288d1" >
<!--resourceStyle 399行修改选中字体颜色--> <!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding no}" Header="序号" Width="*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding no}" Header="序号" Width="50" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding dbdh}" Header="调拨单号" Width="*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding dbdh}" Header="调拨单号" Width="200" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding jsdw}" Header="调入局" Width="*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding jsdw}" Header="调入局" Width="100" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding ffjhNo}" Header="封发计划编号" Width="*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding ffjhNo}" Header="封发计划编号" Width="150" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding rqzlbm}" Header="容器种类编码" Width="*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding rqzlbm}" Header="容器种类编码" Width="150" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="150" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="150" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="150" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="150" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="170" IsReadOnly="True"/>
<DataGridTemplateColumn Header="操作" Width="1.5*"> <DataGridTemplateColumn Header="操作" Width="180">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<!--<Button Content="编辑" Command="{Binding DataContext.CabinetUpdateCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}" Style="{StaticResource BUTTON_AGREE}" FontSize="14" Width="80" Height="30" Background="#009999" BorderBrush="#FF36B5C1" VerticalAlignment="Center" HorizontalAlignment="Center"/>--> <!--<Button Content="编辑" Command="{Binding DataContext.CabinetUpdateCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}" Style="{StaticResource BUTTON_AGREE}" FontSize="14" Width="80" Height="30" Background="#009999" BorderBrush="#FF36B5C1" VerticalAlignment="Center" HorizontalAlignment="Center"/>-->

46
SlnMesnac.RfidUpload.UI/MainWindow.xaml
Unescape Escape View File

@ -5,8 +5,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SlnMesnac.RfidUpload.UI" xmlns:local="clr-namespace:SlnMesnac.RfidUpload.UI"
xmlns:local1="clr-namespace:SlnMesnac.RfidUpload.UI.converter" xmlns:local1="clr-namespace:SlnMesnac.RfidUpload.UI.converter"
mc:Ignorable="d" d:DesignHeight="1080" d:DesignWidth="1920" mc:Ignorable="d" d:DesignHeight="768" d:DesignWidth="1024"
Title="海威物联RFID移动盘点系统" Height="766" Width="1268" Title="海威物联RFID移动盘点系统" Height="768" Width="1024"
WindowState="Maximized" WindowStyle="SingleBorderWindow" > WindowState="Maximized" WindowStyle="SingleBorderWindow" >
<!--ResizeMode="NoResize" Topmost="False"--> <!--ResizeMode="NoResize" Topmost="False"-->
@ -45,7 +45,8 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="2*"/> <RowDefinition Height="2*"/>
<RowDefinition Height="10*"/> <RowDefinition Height="*"/>
<RowDefinition Height="8*"/>
<RowDefinition Height="5*"/> <RowDefinition Height="5*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" BorderThickness="2" CornerRadius="5" Background="White" Margin="5,0,5,0"> <Border Grid.Row="0" BorderThickness="2" CornerRadius="5" Background="White" Margin="5,0,5,0">
@ -74,16 +75,15 @@
<ComboBox FontSize="16" ItemsSource="{Binding ParityItems}" SelectedItem="{Binding SelectedParityItems}" Width="120" Height="30" Margin="10,5,10,0"/> <ComboBox FontSize="16" ItemsSource="{Binding ParityItems}" SelectedItem="{Binding SelectedParityItems}" Width="120" Height="30" Margin="10,5,10,0"/>
<Button Style="{StaticResource NoBorderButtonStyle}" Width="25" Height="25" Command="{Binding systemSetCommand}" Margin="100,0,0,0">
<Image Source="Fonts/setPng.png" Stretch="Uniform" />
</Button>
</StackPanel> </StackPanel>
</Border> </Border>
<Border Grid.Row="1">
<Border Grid.Row="2">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/> <ColumnDefinition Width="3*"/>
@ -95,21 +95,18 @@
<Button Content="导出文件" Command="{Binding ExportFilesCommand}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#007DFA" BorderBrush="#007DFA" Margin="0,0,10,0"/> <Button Content="导出文件" Command="{Binding ExportFilesCommand}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#007DFA" BorderBrush="#007DFA" Margin="0,0,10,0"/>
<Button Content="清空列表" Command="{Binding EmptyFilesCommand}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="Orange" BorderBrush="Orange" Margin="0,0,10,0"/> <Button Content="清空列表" Command="{Binding EmptyFilesCommand}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="Orange" BorderBrush="Orange" Margin="0,0,10,0"/>
<Button Content="完成" Command="{Binding FinishCommand}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#007DFA" BorderBrush="#007DFA" Margin="10,0,10,0"/> <Button Content="完成" Command="{Binding FinishCommand}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#007DFA" BorderBrush="#007DFA" Margin="10,0,10,0"/>
<Label Content="数 量 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="20,0,0,0"/>
<Label Content="{Binding LabelCountParam}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
<Label Content="调拨单号 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="20,0,0,0"/>
<Label Content="{Binding MainPageDbdh}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal"> <StackPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" VerticalAlignment="Center"> <StackPanel Grid.Column="0" VerticalAlignment="Center">
<TextBlock Text="串口连接状态" FontSize="20" FontWeight="Black" Foreground="#006699" Margin="2,0,10,0"/> <TextBlock Text="串口连接状态" FontSize="20" FontWeight="Black" Foreground="#006699" Margin="2,0,10,0"/>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="1" Margin="0,0,20,0"> <StackPanel Grid.Column="1" Margin="0,0,20,0">
<Ellipse Width="30" Height="30"> <Ellipse Width="30" Height="30">
@ -130,6 +127,11 @@
</Ellipse.Style> </Ellipse.Style>
</Ellipse> </Ellipse>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" VerticalAlignment="Center">
<Button Style="{StaticResource NoBorderButtonStyle}" Width="25" Height="25" Command="{Binding systemSetCommand}" Margin="100,0,0,0">
<Image Source="Fonts/setPng.png" Stretch="Uniform" />
</Button>
</StackPanel>
</Grid> </Grid>
</StackPanel> </StackPanel>
@ -139,7 +141,17 @@
</Border> </Border>
<Border Grid.Row="1" BorderThickness="2" CornerRadius="5" Background="White" Margin="5">
<Border Grid.Row="1">
<StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal">
<Label Content="数 量 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="20,0,0,0"/>
<Label Content="{Binding LabelCountParam}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
<Label Content="调拨单号 :" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="20,0,0,0"/>
<Label Content="{Binding MainPageDbdh}" FontSize="20" FontWeight="Black" Foreground="#00CC33" Margin="5,0,10,0"/>
</StackPanel>
</Border>
<Border Grid.Row="2" BorderThickness="2" CornerRadius="5" Background="White" Margin="5">
<Border.Effect> <Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect> <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect> </Border.Effect>
@ -162,7 +174,7 @@
FontSize="15" ColumnHeaderHeight="35" FontSize="15" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" ScrollViewer.VerticalScrollBarVisibility="Visible" BorderThickness="0" CanUserAddRows="False"
Foreground="#0288d1" Grid.ColumnSpan="2" > Foreground="#0288d1" Grid.ColumnSpan="2" >
<!--resourceStyle 399行修改选中字体颜色--> <!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns> <DataGrid.Columns>
@ -184,7 +196,7 @@
</Border> </Border>
<!--日志信息--> <!--日志信息-->
<Border Grid.Row="2" BorderThickness="2" CornerRadius="5" Background="White" Margin="5,0,5,0"> <Border Grid.Row="3" BorderThickness="2" CornerRadius="5" Background="White" Margin="5,0,5,0">
<Border.Effect> <Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect> <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect> </Border.Effect>
@ -207,7 +219,7 @@
<RowDefinition Height="3*"/> <RowDefinition Height="3*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="Green" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1"> <Border Grid.Row="0" BorderBrush="Green" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1">
<ListBox Grid.Row="0" x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" FontSize="14" Foreground="Gray" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/> <ListBox Grid.Row="0" x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" FontSize="14" Foreground="Gray" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Visible"/>
</Border> </Border>

Write Preview
Loading…
Cancel
Save