bpa
/
BPASmartClient
2
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

1

样式分支
fyf 2 years ago
parent
e6f6f77714
commit
028c89c5f7
2 changed files with 59 additions and 22 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      BPASmartClient.MaxWokControl/BPASmartClient.MaxWokControl.csproj
  2. +58
    -21
      BPASmartClient.ScreenLib/炒锅/MaxWokMonitorControl.xaml

+ 1
- 1
BPASmartClient.MaxWokControl/BPASmartClient.MaxWokControl.csproj View File

@@ -5,7 +5,7 @@
<TargetFramework>net6.0-windows</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyName>海科大炒操作台</AssemblyName>
<AssemblyName>海科食堂大炒控制终端</AssemblyName>
</PropertyGroup> </PropertyGroup>


<ItemGroup> <ItemGroup>


+ 58
- 21
BPASmartClient.ScreenLib/炒锅/MaxWokMonitorControl.xaml View File

@@ -19,12 +19,12 @@
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<GroupBox Margin="0,0,10,0" Header="状态监控" Style="{DynamicResource from}" Tag="Start"> <GroupBox Margin="0,0,10,0" Header="状态监控" Style="{DynamicResource from}" Tag="Start">
<Image Source="/BPASmartClient.ScreenLib;component/炒锅.png" Margin="-100,-100,0,0" ></Image>
<Image Source="/BPASmartClient.ScreenLib;component/炒锅.png" ></Image>
</GroupBox> </GroupBox>
<Grid Margin="0,0,0,0" Grid.Column="1" > <Grid Margin="0,0,0,0" Grid.Column="1" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="2*"/> <RowDefinition Height="2*"/>
<RowDefinition Height="0.8*"/>
<RowDefinition Height="0.7*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<GroupBox Margin="0,0,0,10" Header="设备调试" Style="{DynamicResource from}" Tag="Start"> <GroupBox Margin="0,0,0,10" Header="设备调试" Style="{DynamicResource from}" Tag="Start">
<Grid Margin="10"> <Grid Margin="10">
@@ -51,7 +51,7 @@
<WrapPanel Grid.Row="1" Margin="0,0,0,10"> <WrapPanel Grid.Row="1" Margin="0,0,0,10">


<TextBlock Margin="20,10,0,0" FontSize="14" >设定加热档位:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >设定加热档位:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="85">
<ComboBox Margin="20,10,0,0" Width="85" FontSize="14">
<ComboBoxItem>1挡</ComboBoxItem> <ComboBoxItem>1挡</ComboBoxItem>
<ComboBoxItem>2挡</ComboBoxItem> <ComboBoxItem>2挡</ComboBoxItem>
<ComboBoxItem>3挡</ComboBoxItem> <ComboBoxItem>3挡</ComboBoxItem>
@@ -61,7 +61,7 @@
<Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >搅拌频率设定:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >搅拌频率设定:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="85">
<ComboBox Margin="20,10,0,0" Width="85" FontSize="14">
<ComboBoxItem>1挡</ComboBoxItem> <ComboBoxItem>1挡</ComboBoxItem>
<ComboBoxItem>2挡</ComboBoxItem> <ComboBoxItem>2挡</ComboBoxItem>
<ComboBoxItem>3挡</ComboBoxItem> <ComboBoxItem>3挡</ComboBoxItem>
@@ -71,11 +71,11 @@
<Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >翻转频率设定:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >翻转频率设定:</TextBlock>
<TextBox Margin="20,10,0,0" Width="85" Text="100"/>
<TextBox Margin="20,10,0,0" Width="85" FontSize="14" Text="100"/>
<Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >炒锅角度设定:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >炒锅角度设定:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="85">
<ComboBox Margin="20,10,0,0" Width="85" FontSize="14">
<ComboBoxItem>1挡</ComboBoxItem> <ComboBoxItem>1挡</ComboBoxItem>
<ComboBoxItem>2挡</ComboBoxItem> <ComboBoxItem>2挡</ComboBoxItem>
<ComboBoxItem>3挡</ComboBoxItem> <ComboBoxItem>3挡</ComboBoxItem>
@@ -84,7 +84,7 @@
<Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >通道出料控制:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >通道出料控制:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="85">
<ComboBox Margin="20,10,0,0" Width="85" FontSize="14">
<ComboBoxItem>通道1</ComboBoxItem> <ComboBoxItem>通道1</ComboBoxItem>
<ComboBoxItem>通道2</ComboBoxItem> <ComboBoxItem>通道2</ComboBoxItem>
<ComboBoxItem>通道3</ComboBoxItem> <ComboBoxItem>通道3</ComboBoxItem>
@@ -117,7 +117,7 @@
<WrapPanel Grid.Row="1" Margin="0,0,0,10"> <WrapPanel Grid.Row="1" Margin="0,0,0,10">


<TextBlock Margin="20,10,0,0" FontSize="14" >设定加热档位:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >设定加热档位:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="85">
<ComboBox Margin="20,10,0,0" Width="85" FontSize="14">
<ComboBoxItem>1挡</ComboBoxItem> <ComboBoxItem>1挡</ComboBoxItem>
<ComboBoxItem>2挡</ComboBoxItem> <ComboBoxItem>2挡</ComboBoxItem>
<ComboBoxItem>3挡</ComboBoxItem> <ComboBoxItem>3挡</ComboBoxItem>
@@ -127,7 +127,7 @@
<Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >搅拌频率设定:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >搅拌频率设定:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="85">
<ComboBox Margin="20,10,0,0" Width="85" FontSize="14">
<ComboBoxItem>1挡</ComboBoxItem> <ComboBoxItem>1挡</ComboBoxItem>
<ComboBoxItem>2挡</ComboBoxItem> <ComboBoxItem>2挡</ComboBoxItem>
<ComboBoxItem>3挡</ComboBoxItem> <ComboBoxItem>3挡</ComboBoxItem>
@@ -137,11 +137,11 @@
<Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >翻转频率设定:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >翻转频率设定:</TextBlock>
<TextBox Margin="20,10,0,0" Width="85" Text="100"/>
<TextBox Margin="20,10,0,0" Width="85" FontSize="14" Text="100"/>
<Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >炒锅角度设定:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >炒锅角度设定:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="85">
<ComboBox Margin="20,10,0,0" Width="85" FontSize="14">
<ComboBoxItem>1挡</ComboBoxItem> <ComboBoxItem>1挡</ComboBoxItem>
<ComboBoxItem>2挡</ComboBoxItem> <ComboBoxItem>2挡</ComboBoxItem>
<ComboBoxItem>3挡</ComboBoxItem> <ComboBoxItem>3挡</ComboBoxItem>
@@ -150,7 +150,7 @@
<Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >通道出料控制:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >通道出料控制:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="85">
<ComboBox Margin="20,10,0,0" Width="85" FontSize="14">
<ComboBoxItem>通道1</ComboBoxItem> <ComboBoxItem>通道1</ComboBoxItem>
<ComboBoxItem>通道2</ComboBoxItem> <ComboBoxItem>通道2</ComboBoxItem>
<ComboBoxItem>通道3</ComboBoxItem> <ComboBoxItem>通道3</ComboBoxItem>
@@ -176,11 +176,20 @@
</GroupBox> </GroupBox>
</GroupBox> </GroupBox>


<GroupBox Header="机器人炒制任务控制" Grid.Row="1">
<GroupBox Header="机器人模拟调试" Grid.Row="1">
<WrapPanel Grid.Row="1" Margin="0,0,0,10"> <WrapPanel Grid.Row="1" Margin="0,0,0,10">
<TextBlock Margin="20,10,0,0" FontSize="14" >设模式:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="105" FontSize="14">
<ComboBoxItem>无任务</ComboBoxItem>
<ComboBoxItem>机器人炒制任务</ComboBoxItem>
<ComboBoxItem>机器人补料任务</ComboBoxItem>
</ComboBox>
<Button Margin="20,10,0,0" Content="设置" Width="60" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >取菜盆:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="105">
<TextBlock Margin="40,10,0,0" FontSize="14" >取菜盆:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="105" FontSize="14">
<ComboBoxItem>无任务</ComboBoxItem>
<ComboBoxItem>1号</ComboBoxItem> <ComboBoxItem>1号</ComboBoxItem>
<ComboBoxItem>2号</ComboBoxItem> <ComboBoxItem>2号</ComboBoxItem>
<ComboBoxItem>3号</ComboBoxItem> <ComboBoxItem>3号</ComboBoxItem>
@@ -194,7 +203,8 @@
<Button Margin="20,10,0,0" Content="取菜盆" Width="60" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="取菜盆" Width="60" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >取调料:</TextBlock> <TextBlock Margin="20,10,0,0" FontSize="14" >取调料:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="105">
<ComboBox Margin="20,10,0,0" Width="105" FontSize="14">
<ComboBoxItem>无任务</ComboBoxItem>
<ComboBoxItem>1号</ComboBoxItem> <ComboBoxItem>1号</ComboBoxItem>
<ComboBoxItem>2号</ComboBoxItem> <ComboBoxItem>2号</ComboBoxItem>
<ComboBoxItem>3号</ComboBoxItem> <ComboBoxItem>3号</ComboBoxItem>
@@ -204,20 +214,49 @@
</ComboBox> </ComboBox>
<Button Margin="20,10,0,0" Content="取调料" Width="60" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="取调料" Width="60" Height="24" FontSize="14"></Button>


<TextBlock Margin="20,10,0,0" FontSize="14" >取空盆:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="105">
<TextBlock Margin="40,10,0,0" FontSize="14" >取空盆:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="105" FontSize="14">
<ComboBoxItem>无任务</ComboBoxItem>
<ComboBoxItem>1号</ComboBoxItem> <ComboBoxItem>1号</ComboBoxItem>
<ComboBoxItem>2号</ComboBoxItem> <ComboBoxItem>2号</ComboBoxItem>
<ComboBoxItem>3号</ComboBoxItem> <ComboBoxItem>3号</ComboBoxItem>
<ComboBoxItem>4号</ComboBoxItem> <ComboBoxItem>4号</ComboBoxItem>
</ComboBox> </ComboBox>
<Button Margin="20,10,0,0" Content="取空盆" Width="60" Height="24" FontSize="14"></Button> <Button Margin="20,10,0,0" Content="取空盆" Width="60" Height="24" FontSize="14"></Button>

<TextBlock Margin="20,10,0,0" FontSize="14" >到--料:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="105" FontSize="14">
<ComboBoxItem>无任务</ComboBoxItem>
<ComboBoxItem>倒料至一号锅</ComboBoxItem>
<ComboBoxItem>倒料至二号销</ComboBoxItem>
</ComboBox>
<Button Margin="20,10,0,0" Content="运行" Width="60" Height="24" FontSize="14"></Button>


<TextBlock Margin="40,10,0,0" FontSize="14" >放菜盆:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="105" FontSize="14">
<ComboBoxItem>无任务</ComboBoxItem>
<ComboBoxItem>放菜盆至1号库位</ComboBoxItem>
<ComboBoxItem>放菜盆至2号库位</ComboBoxItem>
<ComboBoxItem>放菜盆至3号库位</ComboBoxItem>
<ComboBoxItem>放菜盆至4号库位</ComboBoxItem>
<ComboBoxItem>放菜盆至5号库位</ComboBoxItem>
<ComboBoxItem>放菜盆至6号库位</ComboBoxItem>
<ComboBoxItem>放菜盆至7号库位</ComboBoxItem>
</ComboBox>
<Button Margin="20,10,0,0" Content="运行" Width="60" Height="24" FontSize="14"></Button>


<Button Margin="35,20,0,0" Content="机器人上使能" Width="100" Height="40" FontSize="14"></Button>
<Button Margin="35,20,0,0" Content="机器人复位" Width="100" Height="40" FontSize="14"></Button>
<Button Margin="35,20,0,0" Content="机器人启动" Width="100" Height="40" FontSize="14"></Button>
<Button Margin="35,20,0,0" Content="机器人停止" Width="100" Height="40" FontSize="14"></Button>

</WrapPanel> </WrapPanel>
</GroupBox> </GroupBox>
</Grid> </Grid>
</GroupBox> </GroupBox>



<GroupBox Header="订单控制" Grid.Row="1" Style="{DynamicResource from}" Tag="Start"> <GroupBox Header="订单控制" Grid.Row="1" Style="{DynamicResource from}" Tag="Start">
<WrapPanel Margin="20,10,0,0"> <WrapPanel Margin="20,10,0,0">
<Button Margin="20,10,0,0" Content="青椒炒肉" Width="120" Height="40"></Button> <Button Margin="20,10,0,0" Content="青椒炒肉" Width="120" Height="40"></Button>
@@ -235,7 +274,5 @@
</WrapPanel> </WrapPanel>
</GroupBox> </GroupBox>
</Grid> </Grid>

</Grid> </Grid>
</UserControl> </UserControl>

Write Preview
Loading…
Cancel
Save