bpa
/
BPASmartClient
2
0
Fork 0
Código Incidencias 0 Pull Requests 0 Lanzamientos 0 Wiki Actividad
Explorar el Código

增加样式

样式分支
fyf hace 2 años
padre
1b13e6760b
commit
bc176782bf
Se han modificado 8 ficheros con 38 adiciones y 26 borrados
Dividir vista
Opciones de diferencias
Mostrar estadísticas Descargar archivo de parche Descargar archivo de diferencias
  1. +1
    -1
      BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj
  2. +6
    -2
      BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
  3. +6
    -2
      BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml
  4. +6
    -2
      BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml
  5. +6
    -18
      BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml
  6. +6
    -0
      BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
  7. +6
    -0
      BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
  8. +1
    -1
      BPASmartClient.ScreenSplitMeals/App.config

+ 1
- 1
BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj Ver fichero

@@ -19,7 +19,7 @@
</COMReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="BPA.CustomResource" Version="1.0.13" />
<PackageReference Include="BPA.CustomResource" Version="1.0.14" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1418.22" />
</ItemGroup>



+ 6
- 2
BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml Ver fichero

@@ -76,7 +76,9 @@
<ListBox.ItemTemplate>
<DataTemplate>
<WrapPanel>
<Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
<Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
<TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
</Border>
</WrapPanel>
</DataTemplate>
</ListBox.ItemTemplate>
@@ -172,7 +174,9 @@
<ListBox.ItemTemplate>
<DataTemplate>
<WrapPanel>
<Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
<Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
<TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
</Border>
</WrapPanel>
</DataTemplate>
</ListBox.ItemTemplate>


+ 6
- 2
BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml Ver fichero

@@ -76,7 +76,9 @@
<ListBox.ItemTemplate>
<DataTemplate>
<WrapPanel>
<Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
<Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
<TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
</Border>
</WrapPanel>
</DataTemplate>
</ListBox.ItemTemplate>
@@ -172,7 +174,9 @@
<ListBox.ItemTemplate>
<DataTemplate>
<WrapPanel>
<Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
<Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
<TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
</Border>
</WrapPanel>
</DataTemplate>
</ListBox.ItemTemplate>


+ 6
- 2
BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml Ver fichero

@@ -76,7 +76,9 @@
<ListBox.ItemTemplate>
<DataTemplate>
<WrapPanel>
<Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
<Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
<TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
</Border>
</WrapPanel>
</DataTemplate>
</ListBox.ItemTemplate>
@@ -172,7 +174,9 @@
<ListBox.ItemTemplate>
<DataTemplate>
<WrapPanel>
<Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding .}"/>
<Border Style="{DynamicResource border顶部背景}" Width="370" Height="100" Margin="20,20,0,0" >
<TextBlock HorizontalAlignment="Center" Foreground="{DynamicResource foreground}" VerticalAlignment="Center" Text="{Binding .}" FontSize="60"></TextBlock>
</Border>
</WrapPanel>
</DataTemplate>
</ListBox.ItemTemplate>


+ 6
- 18
BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml Ver fichero

@@ -59,6 +59,9 @@
<Trigger Property="Text" Value="故障">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
<Trigger Property="Text" Value="停止">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
@@ -77,24 +80,6 @@
</GroupBox>
<GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前流程" Style="{DynamicResource from}" Tag="Start">
<Grid>

<!--<Grid Margin="0,10,0,0" Height="100" Width="130" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="30"/>
</Grid.ColumnDefinitions>
<Border Background="{DynamicResource 椭圆}" >
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock x:Name="wb" FontSize="32" Text="{Binding Name}"></TextBlock>
<TextBlock x:Name="xs" Style="{DynamicResource 数码管Text}" FontSize="24" Margin="0,0,0,0" Text="{Binding Id}"></TextBlock>
</StackPanel>
</Border>
<Border Background="Red" Margin="10">

</Border>
<Image x:Name="image" Grid.Column="1" Style="{DynamicResource image右1}" Cursor="Hand" ></Image>
</Grid>-->
<ListBox x:Name="PageList" BorderThickness="0" Margin="0,-20,0,0" Height="270" HorizontalAlignment="Stretch" VerticalAlignment="Top"
ItemsSource="{Binding ProcessModel1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Background="Transparent" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" >
@@ -281,6 +266,9 @@
<Trigger Property="Text" Value="故障">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
<Trigger Property="Text" Value="停止">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
</Style.Triggers>
</Style>
</TextBlock.Style>


+ 6
- 0
BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml Ver fichero

@@ -59,6 +59,9 @@
<Trigger Property="Text" Value="故障">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
<Trigger Property="Text" Value="停止">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
@@ -263,6 +266,9 @@
<Trigger Property="Text" Value="故障">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
<Trigger Property="Text" Value="停止">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
</Style.Triggers>
</Style>
</TextBlock.Style>


+ 6
- 0
BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml Ver fichero

@@ -57,6 +57,9 @@
<Trigger Property="Text" Value="故障">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
<Trigger Property="Text" Value="停止">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
@@ -172,6 +175,9 @@
<Trigger Property="Text" Value="故障">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
<Trigger Property="Text" Value="停止">
<Setter Property="Foreground" Value="Red"/>
</Trigger>
</Style.Triggers>
</Style>
</TextBlock.Style>


+ 1
- 1
BPASmartClient.ScreenSplitMeals/App.config Ver fichero

@@ -7,7 +7,7 @@
<add key="DeviceMC" value="大炒,小炒,分餐机,煮面机"/>
<add key="GgAdder" value="https://stream7.iqilu.com/10339/upload_transcode/202002/18/20200218114723HDu3hhxqIT.mp4"/>

<add key="一号屏" value="1"/>
<add key="一号屏" value="0"/>
<add key="二号屏" value="0"/>
<add key="三号屏" value="0"/>
</appSettings>

Escribir Vista previa
Cargando…
Cancelar
Guardar