wenjy
/
Aucma.Scada
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-样式调整

Browse Source
collectionStore
liuwf 1 year ago
parent 476e39fd63
commit da2a1117cc
11 changed files with 112 additions and 153 deletions
Show Stats Download Patch File Download Diff File

126
Aucma.Scada.UI/MainWindow.xaml
Unescape Escape View File

@ -21,9 +21,8 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="0.5*"/> <RowDefinition Height="0.5*"/>
<RowDefinition Height="6*"/> <RowDefinition Height="7*"/>
<RowDefinition Height="27.5"/> <RowDefinition Height="0.7*"/>
<RowDefinition Height="35.5"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2,2,2"> <Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2,2,2">
<Grid> <Grid>
@ -32,25 +31,7 @@
<ColumnDefinition Width="7*"/> <ColumnDefinition Width="7*"/>
<ColumnDefinition Width="2*"/> <ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--<StackPanel Grid.Row="0" >
-->
<!--<TextBlock Text="AUCMA" FontSize="50" Foreground="Red" FontWeight="Bold"/>
<TextBlock Text="澳云数智" FontSize="30" Foreground="White" FontWeight="Bold"/>-->
<!--
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="AUCMA" FontSize="50" Foreground="Red" FontWeight="Bold"/>
</StackPanel>
<StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="澳云数智" FontSize="30" Foreground="White" FontWeight="Bold"/>
</StackPanel>
</Grid>
</StackPanel>-->
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="澳柯玛组装生产控制系统" FontSize="42" Foreground="White" FontWeight="Bold"/> <TextBlock Text="澳柯玛组装生产控制系统" FontSize="42" Foreground="White" FontWeight="Bold"/>
</StackPanel> </StackPanel>
@ -84,103 +65,18 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal"> <StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal">
<Button Content="入库监控" x:Name="instoreInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=instoreInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/> <Button Content="入库监控" x:Name="instoreInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=instoreInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="出库监控" x:Name="outstoreInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=outstoreInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/> <Button Content="出库监控" x:Name="outstoreInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=outstoreInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="任务列表" x:Name="taskInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=taskInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/> <Button Content="任务列表" x:Name="taskInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=taskInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="实时库存" x:Name="inventoryInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=inventoryInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/> <Button Content="实时库存" x:Name="inventoryInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=inventoryInfo}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="生产计划" x:Name="assemblyPlan" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=assemblyPlan}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/> <Button Content="生产计划" x:Name="assemblyPlan" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=assemblyPlan}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="键 盘" Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#009999" BorderBrush="#FF36B5C1" Margin="5 0"/> <Button Content="键 盘" Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="最小化" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="5 0"/> <Button Content="最小化" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="5 0" FontSize="17"/>
<Button Content="退 出" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#FF0033" BorderBrush="#FF0033" Margin="5 0"/> <Button Content="退 出" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#FF0033" BorderBrush="#FF0033" Margin="5 0" FontSize="17"/>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal"> <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal">
<!--多行状态显示-->
<!--<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Margin="0,0,0,0" VerticalAlignment="Center">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="1">
<TextBlock Text="连接状态" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
</StackPanel>
<StackPanel Grid.Column="0">
<Ellipse Width="20" Height="20">
<Ellipse.Style>
<Style TargetType="Ellipse">
<Style.Triggers>
<DataTrigger Binding="{Binding PresentColor}" Value="0">
<Setter Property="Shape.Fill" Value="Orange"/>
</DataTrigger>
<DataTrigger Binding="{Binding PresentColor}" Value="1">
<Setter Property="Shape.Fill" Value="Green"/>
</DataTrigger>
<DataTrigger Binding="{Binding PresentColor}" Value="2">
<Setter Property="Shape.Fill" Value="Red"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Ellipse.Style>
</Ellipse>
</StackPanel>
</Grid>
</StackPanel>
</Grid>
</StackPanel>
<StackPanel Grid.Row="1" Margin="0,10,0,0" VerticalAlignment="Center">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="1">
<TextBlock Text="连接状态" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
</StackPanel>
<StackPanel Grid.Column="0">
<Ellipse Width="20" Height="20">
<Ellipse.Style>
<Style TargetType="Ellipse">
<Style.Triggers>
<DataTrigger Binding="{Binding PresentColor}" Value="0">
<Setter Property="Shape.Fill" Value="Orange"/>
</DataTrigger>
<DataTrigger Binding="{Binding PresentColor}" Value="1">
<Setter Property="Shape.Fill" Value="Green"/>
</DataTrigger>
<DataTrigger Binding="{Binding PresentColor}" Value="2">
<Setter Property="Shape.Fill" Value="Red"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Ellipse.Style>
</Ellipse>
</StackPanel>
</Grid>
</StackPanel>
</Grid>
</StackPanel>
</Grid>-->
<!--单行状态显示--> <!--单行状态显示-->
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

10
Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
Unescape Escape View File

@ -6,8 +6,8 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan" xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
mc:Ignorable="d" FontFamily="Microsoft YaHei" mc:Ignorable="d" FontFamily="Microsoft YaHei" Background="#1152AC"
d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC" > d:DesignHeight="750" d:DesignWidth="1920" >
<UserControl.Resources> <UserControl.Resources>
<local1:PlanStatusConverter x:Key="PlanStatusConverter" /> <local1:PlanStatusConverter x:Key="PlanStatusConverter" />
@ -241,7 +241,7 @@
<Grid Margin="10,10"> <Grid Margin="10,10">
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}"> <lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}">
<lvc:CartesianChart.AxisX> <lvc:CartesianChart.AxisX>
<lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15" Foreground="#0288d1"> <lvc:Axis Labels="{Binding ProductionHourList}" FontSize="20" Foreground="#0288d1">
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" > <lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
</lvc:Separator> </lvc:Separator>
@ -249,7 +249,7 @@
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisX> </lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY> <lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15"> <lvc:Axis FontSize="20">
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" > <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator> </lvc:Separator>
@ -365,7 +365,7 @@
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisX> </lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY> <lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15"> <lvc:Axis FontSize="20">
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" > <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator> </lvc:Separator>

18
Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.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:Aucma.Scada.UI.Page.AssemblyPlan" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan" xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
mc:Ignorable="d" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei" mc:Ignorable="d" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei" Background="#1152AC"
Title="MES生产计划" Height="650" Width="900" Name="window" Background="#1152AC" Title="MES生产计划" Height="650" Width="1000" Name="window"
ResizeMode="NoResize" > ResizeMode="NoResize" >
<Window.Resources> <Window.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}"> <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
@ -144,12 +144,12 @@
Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" MouseLeftButtonDown="dataGrid_MouseLeftButtonDown"> Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" MouseLeftButtonDown="dataGrid_MouseLeftButtonDown">
<!--resourceStyle 399行修改选中字体颜色--> <!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding orderCode}" Header="工单编号" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding orderCode}" Header="工单编号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="2*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="3*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</Border> </Border>
@ -173,7 +173,7 @@
</StackPanel>--> </StackPanel>-->
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center"> <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
<!--<Button Content="计划下达" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="white" Margin="20,0,50,0" Height="30" Width="80" />--> <!--<Button Content="计划下达" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="white" Margin="20,0,50,0" Height="30" Width="80" />-->
<Button Content="取 消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" Height="30" BorderBrush="#FF9900" Width="80" /> <Button Content="取 消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" FontSize="18" Height="40" BorderBrush="#FF9900" Width="80" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>

6
Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.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:Aucma.Scada.UI.Page.AssemblyPlan" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
mc:Ignorable="d" FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen" mc:Ignorable="d" FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen" Background="#1152AC"
Title="下达数量" Height="500" Width="700" Name="window" Background="White" Title="下达数量" Height="500" Width="700" Name="window"
ResizeMode="NoResize" > ResizeMode="NoResize" >
<Border Margin="5" Background="#1254AB" CornerRadius="10"> <Border Margin="5" Background="#1254AB" CornerRadius="10">
<Border.Effect> <Border.Effect>
@ -101,7 +101,7 @@
</Border> </Border>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Content="计划下达" FontSize="20" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0" Height="50" Width="100" /> <Button Content="计划下达" FontSize="20" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#4285DE" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0" Height="50" Width="100" />
<Button Content="取 消" FontSize="20" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" /> <Button Content="取 消" FontSize="20" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" />
</StackPanel> </StackPanel>
</Grid> </Grid>

4
Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
Unescape Escape View File

@ -6,7 +6,7 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InStoreInfo" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InStoreInfo"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo" xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
mc:Ignorable="d" Background="#1152AC" mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei"
d:DesignHeight="750" d:DesignWidth="1920" > d:DesignHeight="750" d:DesignWidth="1920" >
<UserControl.Resources> <UserControl.Resources>
@ -189,7 +189,7 @@
<Grid Margin="10,10"> <Grid Margin="10,10">
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}"> <lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}">
<lvc:CartesianChart.AxisX> <lvc:CartesianChart.AxisX>
<lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15"> <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="20">
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" > <lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
</lvc:Separator> </lvc:Separator>

6
Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
Unescape Escape View File

@ -8,12 +8,12 @@
d:DesignHeight="750" d:DesignWidth="1920" > d:DesignHeight="750" d:DesignWidth="1920" >
<Grid Margin="5,5"> <Grid Margin="5,5">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="1.2*"/>
<RowDefinition Height="14*"/> <RowDefinition Height="14*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0"> <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0">
<Button Content="箱壳库" x:Name="shellInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=shellInventory}" Style="{StaticResource BUTTON_AGREE}" FontSize="18" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/> <Button Content="箱壳库" x:Name="shellInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=shellInventory}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="40" FontSize="20" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
<Button Content="内胆库" x:Name="linerInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=linerInventory}" Style="{StaticResource BUTTON_AGREE}" FontSize="18" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/> <Button Content="内胆库" x:Name="linerInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=linerInventory}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="40" FontSize="20" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
</StackPanel> </StackPanel>
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="2,2"> <Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="2,2">

69
Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
Unescape Escape View File

@ -4,9 +4,72 @@
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:Aucma.Scada.UI.Page.InventoryInfo" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei" mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen"
Title="物料库存统计" Height="650" Width="1000" Name="window" Title="物料库存统计" Height="650" Width="1000" Name="window"
ResizeMode="NoResize" > ResizeMode="NoResize" >
<Window.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Foreground" Value="White"/>
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<!--<Setter Property="Foreground" Value="#dddddd"/>-->
</Trigger>
</Style.Triggers>
</Style>
</Window.Resources>
<Border Margin="5" Background="#1254AB" CornerRadius="10"> <Border Margin="5" Background="#1254AB" CornerRadius="10">
<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>
@ -131,8 +194,8 @@
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/> <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>--> </Border.Effect>-->
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0"> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0">
<Button Content="刷 新" Command="{Binding RefreshCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Width="80" Height="30" Margin="20,0,0,0"/> <Button Content="刷 新" Command="{Binding RefreshCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Width="80" Height="40" FontSize="20" Margin="20,0,0,0"/>
<Button Content="取 消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" Height="30" BorderBrush="#FF9900" Width="80" /> <Button Content="取 消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" Height="40" FontSize="20" BorderBrush="#FF9900" Width="80" />
</StackPanel> </StackPanel>
</Border> </Border>
</Grid> </Grid>

2
Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
Unescape Escape View File

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo" FontFamily="Microsoft YaHei" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo" FontFamily="Microsoft YaHei"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.ShellInventory" xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.ShellInventory"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" Background="#1152AC" > d:DesignHeight="450" d:DesignWidth="800" Background="#1152AC" >

12
Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
Unescape Escape View File

@ -103,12 +103,12 @@
Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}"> Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}">
<!--resourceStyle 399行修改选中字体颜色--> <!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialAmount}" Header="物料数量" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding materialAmount}" Header="物料数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="创建时间" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="创建时间" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</Border> </Border>

4
Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
Unescape Escape View File

@ -5,8 +5,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.OutStoreInfo" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.OutStoreInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo" xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
mc:Ignorable="d" FontFamily="Microsoft YaHei" mc:Ignorable="d" FontFamily="Microsoft YaHei" Background="#1152AC"
d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC" > d:DesignHeight="750" d:DesignWidth="1920" >
<UserControl.Resources> <UserControl.Resources>
<local1:TaskStatusConverter x:Key="TaskStatusConverter" /> <local1:TaskStatusConverter x:Key="TaskStatusConverter" />
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}"> <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">

8
Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
Unescape Escape View File

@ -5,8 +5,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.TaskInfo" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.TaskInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo" xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
mc:Ignorable="d" FontFamily="Microsoft YaHei" mc:Ignorable="d" FontFamily="Microsoft YaHei" Background="#1152AC"
d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC" > d:DesignHeight="750" d:DesignWidth="1920" >
<UserControl.Resources> <UserControl.Resources>
<local1:TaskStatusConverter x:Key="TaskStatusConverter" /> <local1:TaskStatusConverter x:Key="TaskStatusConverter" />
@ -80,8 +80,8 @@
<RowDefinition Height="14*"/> <RowDefinition Height="14*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0"> <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0">
<Button Content="入库任务" x:Name="inStore" Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=inStore}" Style="{StaticResource BUTTON_AGREE}" FontSize="20" Width="100" Height="42" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/> <Button Content="入库任务" x:Name="inStore" Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=inStore}" Style="{StaticResource BUTTON_AGREE}" FontSize="20" Width="100" Height="42" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
<Button Content="出库任务" x:Name="outStore" Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=outStore}" Style="{StaticResource BUTTON_AGREE}" FontSize="20" Width="100" Height="42" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/> <Button Content="出库任务" x:Name="outStore" Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=outStore}" Style="{StaticResource BUTTON_AGREE}" FontSize="20" Width="100" Height="42" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
</StackPanel> </StackPanel>
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2"> <Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2">

Write Preview
Loading…
Cancel
Save