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

1

样式分支
fyf 1 year ago
parent
97fa6cc66b
commit
e6f6f77714
14 changed files with 451 additions and 2 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +13
    -0
      BPASmartClient.MaxWokControl/App.config
  2. +8
    -0
      BPASmartClient.MaxWokControl/App.xaml
  3. +27
    -0
      BPASmartClient.MaxWokControl/App.xaml.cs
  4. +10
    -0
      BPASmartClient.MaxWokControl/AssemblyInfo.cs
  5. +20
    -0
      BPASmartClient.MaxWokControl/BPASmartClient - Backup.MaxWokControl.csproj
  6. +21
    -0
      BPASmartClient.MaxWokControl/BPASmartClient.MaxWokControl.csproj
  7. +12
    -0
      BPASmartClient.MaxWokControl/MainWindow.xaml
  8. +28
    -0
      BPASmartClient.MaxWokControl/MainWindow.xaml.cs
  9. +9
    -1
      BPASmartClient.ScreenLib/AppMain.cs
  10. +7
    -0
      BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj
  11. BIN
     
  12. +241
    -0
      BPASmartClient.ScreenLib/炒锅/MaxWokMonitorControl.xaml
  13. +28
    -0
      BPASmartClient.ScreenLib/炒锅/MaxWokMonitorControl.xaml.cs
  14. +27
    -1
      SmartClient.sln

+ 13
- 0
BPASmartClient.MaxWokControl/App.config View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
<!--MQTT配置-->
<add key="MQTTConnection" value="171.221.208.23,11883,admin,public1"/>
<!--订阅主题设置：大炒,小炒,分餐机,煮面机-->
<add key="DeviceMC" value="大炒"/>
<add key="GgAdder" value="https://stream7.iqilu.com/10339/upload_transcode/202002/18/20200218114723HDu3hhxqIT.mp4"/>
<add key="SaasRoute" value="https://witt.black-pa.com/kitchen/api/StoreHelper/GeBasisGateList?StoreId=0c32b2e2-0dc9-4941-b73d-3dc91f7268ab"/>
<!--显示窗体：0 广告 1 地球-->
<add key="ShowForm" value="1"/>
</appSettings>
</configuration>

+ 8
- 0
BPASmartClient.MaxWokControl/App.xaml View File

@@ -0,0 +1,8 @@
<Application x:Class="BPASmartClient.MaxWokControl.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:BPASmartClient.MaxWokControl">
<Application.Resources>
</Application.Resources>
</Application>

+ 27
- 0
BPASmartClient.MaxWokControl/App.xaml.cs View File

@@ -0,0 +1,27 @@
using BPASmartClient.ScreenLib;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;

namespace BPASmartClient.MaxWokControl
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
protected override void OnStartup(StartupEventArgs e)
{
base.OnStartup(e);
AppMain appMain = new AppMain(MainWindow, this.GetType());
}
protected override void OnExit(ExitEventArgs e)
{
base.OnExit(e);
}
}
}

+ 10
- 0
BPASmartClient.MaxWokControl/AssemblyInfo.cs View File

@@ -0,0 +1,10 @@
using System.Windows;

[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]

+ 20
- 0
BPASmartClient.MaxWokControl/BPASmartClient - Backup.MaxWokControl.csproj View File

@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\BPASmartClient.ScreenLib\BPASmartClient.ScreenLib.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="App.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>

+ 21
- 0
BPASmartClient.MaxWokControl/BPASmartClient.MaxWokControl.csproj View File

@@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
<AssemblyName>海科大炒操作台</AssemblyName>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\BPASmartClient.ScreenLib\BPASmartClient.ScreenLib.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="App.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>

+ 12
- 0
BPASmartClient.MaxWokControl/MainWindow.xaml View File

@@ -0,0 +1,12 @@
<Window x:Class="BPASmartClient.MaxWokControl.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:BPASmartClient.MaxWokControl"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
<Grid>

</Grid>
</Window>

+ 28
- 0
BPASmartClient.MaxWokControl/MainWindow.xaml.cs View File

@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;

namespace BPASmartClient.MaxWokControl
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
}
}
}

+ 9
- 1
BPASmartClient.ScreenLib/AppMain.cs View File

@@ -1,4 +1,5 @@
using BPA.CustomResource.UserControls; using BPA.CustomResource.UserControls;
using BPASmartClient.ScreenLib.炒锅;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -15,7 +16,6 @@ namespace BPASmartClient.ScreenLib
public AppMain(Window window, Type type) public AppMain(Window window, Type type)
{ {
//启动Redis数据读取 //启动Redis数据读取
Main.GetInstance.Start();
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
//FSystemHelper.GetInstance.CreateDesktopShortcut(); //FSystemHelper.GetInstance.CreateDesktopShortcut();
// FSystemHelper.GetInstance.AutoStart(true); // FSystemHelper.GetInstance.AutoStart(true);
@@ -28,15 +28,19 @@ namespace BPASmartClient.ScreenLib
{ {
case "BPASmartClient.ScreenALL.App": case "BPASmartClient.ScreenALL.App":
windowLarge.Init(TitleName, new ScreenALLControl()); windowLarge.Show(); windowLarge.Init(TitleName, new ScreenALLControl()); windowLarge.Show();
Main.GetInstance.Start();
break; break;
case "BPASmartClient.ScreenMaxWok.App": case "BPASmartClient.ScreenMaxWok.App":
windowLarge.Init(TitleName, new ScreenMaxWokControl()); windowLarge.Show(); windowLarge.Init(TitleName, new ScreenMaxWokControl()); windowLarge.Show();
Main.GetInstance.Start();
break; break;
case "BPASmartClient.ScreenMinWok.App": case "BPASmartClient.ScreenMinWok.App":
windowLarge.Init(TitleName, new ScreenMinWokControl()); windowLarge.Show(); windowLarge.Init(TitleName, new ScreenMinWokControl()); windowLarge.Show();
Main.GetInstance.Start();
break; break;
case "BPASmartClient.ScreenMorks.App": case "BPASmartClient.ScreenMorks.App":
windowLarge.Init(TitleName, new ScreenMorksControl()); windowLarge.Show(); windowLarge.Init(TitleName, new ScreenMorksControl()); windowLarge.Show();
Main.GetInstance.Start();
break; break;
case "BPASmartClient.ScreenSplitMeals.App": case "BPASmartClient.ScreenSplitMeals.App":
ScreenSplitMealsControl1 ScreenSplit = new ScreenSplitMealsControl1(); ScreenSplitMealsControl1 ScreenSplit = new ScreenSplitMealsControl1();
@@ -141,6 +145,10 @@ namespace BPASmartClient.ScreenLib
//} //}
#endregion #endregion
windowLarge.Show();windowLarge2.Show(); windowLarge3.Show(); windowLarge.Show();windowLarge2.Show(); windowLarge3.Show();
Main.GetInstance.Start();
break;
case "BPASmartClient.MaxWokControl.App":
windowLarge.Init(TitleName, new MaxWokMonitorControl()); windowLarge.Show();
break; break;
} }
#endregion #endregion


+ 7
- 0
BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj View File

@@ -5,6 +5,10 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
</PropertyGroup> </PropertyGroup>

<ItemGroup>
<None Remove="炒锅.png" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<COMReference Include="IWshRuntimeLibrary"> <COMReference Include="IWshRuntimeLibrary">
@@ -22,5 +26,8 @@
<PackageReference Include="BPA.CustomResource" Version="1.0.23" /> <PackageReference Include="BPA.CustomResource" Version="1.0.23" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1418.22" /> <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1418.22" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="炒锅.png" />
</ItemGroup>


</Project> </Project>

BIN
View File


+ 241
- 0
BPASmartClient.ScreenLib/炒锅/MaxWokMonitorControl.xaml View File

@@ -0,0 +1,241 @@
<UserControl x:Class="BPASmartClient.ScreenLib.炒锅.MaxWokMonitorControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BPASmartClient.ScreenLib.炒锅"
mc:Ignorable="d"
d:DesignHeight="1080" d:DesignWidth="1920">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/BPA.CustomResource;component/Themes/ProlineStyle.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid Margin="10,10,10,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<GroupBox Margin="0,0,10,0" Header="状态监控" Style="{DynamicResource from}" Tag="Start">
<Image Source="/BPASmartClient.ScreenLib;component/炒锅.png" Margin="-100,-100,0,0" ></Image>
</GroupBox>
<Grid Margin="0,0,0,0" Grid.Column="1" >
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="0.8*"/>
</Grid.RowDefinitions>
<GroupBox Margin="0,0,0,10" Header="设备调试" Style="{DynamicResource from}" Tag="Start">
<Grid Margin="10">
<Grid.RowDefinitions>
<RowDefinition Height="1.8*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<GroupBox Header="炒锅模拟调试">
<GroupBox Margin="0,10,0,0" Style="{DynamicResource fromNoTitle}" HorizontalAlignment="Stretch" >
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Width="2"></Border>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock>一号炒锅控制</TextBlock>
<Border Style="{DynamicResource borderSplider}" VerticalAlignment="Bottom" Height="2" Margin="10,0,10,0"></Border>
<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="85">
<ComboBoxItem>1挡</ComboBoxItem>
<ComboBoxItem>2挡</ComboBoxItem>
<ComboBoxItem>3挡</ComboBoxItem>
<ComboBoxItem>4挡</ComboBoxItem>
<ComboBoxItem>5挡</ComboBoxItem>
</ComboBox>
<Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button>

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

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

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

<TextBlock Margin="20,10,0,0" FontSize="14" >通道出料控制:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="85">
<ComboBoxItem>通道1</ComboBoxItem>
<ComboBoxItem>通道2</ComboBoxItem>
<ComboBoxItem>通道3</ComboBoxItem>
<ComboBoxItem>通道4</ComboBoxItem>
<ComboBoxItem>通道5</ComboBoxItem>
<ComboBoxItem>通道6</ComboBoxItem>
<ComboBoxItem>通道7</ComboBoxItem>
<ComboBoxItem>通道8</ComboBoxItem>
</ComboBox>
<Button Margin="20,10,0,0" Content="出料" Width="40" Height="24" FontSize="14"></Button>

<Button Margin="30,10,0,0" Content="加热启动" Width="100" Height="24" FontSize="14"></Button>
<Button Margin="30,10,0,0" Content="搅拌启动" Width="100" Height="24" FontSize="14"></Button>
<Button Margin="30,10,0,0" Content="炒锅回原点" Width="100" Height="24" FontSize="14"></Button>
<Button Margin="30,10,0,0" Content="出餐启动" Width="100" Height="24" FontSize="14"></Button>
<Button Margin="30,10,0,0" Content="炒锅清洗" Width="100" Height="24" FontSize="14"></Button>
<Button Margin="30,10,0,0" Content="抽洗锅水启动" Width="100" Height="24" FontSize="14"></Button>
</WrapPanel>
</Grid>

<Grid Grid.Column="1">
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock>二号炒锅控制</TextBlock>
<Border Style="{DynamicResource borderSplider}" VerticalAlignment="Bottom" Height="2" Margin="10,0,10,0"></Border>
<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="85">
<ComboBoxItem>1挡</ComboBoxItem>
<ComboBoxItem>2挡</ComboBoxItem>
<ComboBoxItem>3挡</ComboBoxItem>
<ComboBoxItem>4挡</ComboBoxItem>
<ComboBoxItem>5挡</ComboBoxItem>
</ComboBox>
<Button Margin="20,10,0,0" Content="设置" Width="40" Height="24" FontSize="14"></Button>

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

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

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

<TextBlock Margin="20,10,0,0" FontSize="14" >通道出料控制:</TextBlock>
<ComboBox Margin="20,10,0,0" Width="85">
<ComboBoxItem>通道1</ComboBoxItem>
<ComboBoxItem>通道2</ComboBoxItem>
<ComboBoxItem>通道3</ComboBoxItem>
<ComboBoxItem>通道4</ComboBoxItem>
<ComboBoxItem>通道5</ComboBoxItem>
<ComboBoxItem>通道6</ComboBoxItem>
<ComboBoxItem>通道7</ComboBoxItem>
<ComboBoxItem>通道8</ComboBoxItem>
</ComboBox>
<Button Margin="20,10,0,0" Content="出料" Width="40" Height="24" FontSize="14"></Button>


<Button Margin="30,10,0,0" Content="加热启动" Width="100" Height="24" FontSize="14"></Button>
<Button Margin="30,10,0,0" Content="搅拌启动" Width="100" Height="24" FontSize="14"></Button>
<Button Margin="30,10,0,0" Content="炒锅回原点" Width="100" Height="24" FontSize="14"></Button>
<Button Margin="30,10,0,0" Content="出餐启动" Width="100" Height="24" FontSize="14"></Button>
<Button Margin="30,10,0,0" Content="炒锅清洗" Width="100" Height="24" FontSize="14"></Button>
<Button Margin="30,10,0,0" Content="抽洗锅水启动" Width="100" Height="24" FontSize="14"></Button>

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

<GroupBox Header="机器人炒制任务控制" Grid.Row="1">
<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">
<ComboBoxItem>1号</ComboBoxItem>
<ComboBoxItem>2号</ComboBoxItem>
<ComboBoxItem>3号</ComboBoxItem>
<ComboBoxItem>4号</ComboBoxItem>
<ComboBoxItem>5号</ComboBoxItem>
<ComboBoxItem>6号</ComboBoxItem>
<ComboBoxItem>7号</ComboBoxItem>
<ComboBoxItem>8号</ComboBoxItem>
<ComboBoxItem>9号</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">
<ComboBoxItem>1号</ComboBoxItem>
<ComboBoxItem>2号</ComboBoxItem>
<ComboBoxItem>3号</ComboBoxItem>
<ComboBoxItem>4号</ComboBoxItem>
<ComboBoxItem>5号</ComboBoxItem>
<ComboBoxItem>6号</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">
<ComboBoxItem>1号</ComboBoxItem>
<ComboBoxItem>2号</ComboBoxItem>
<ComboBoxItem>3号</ComboBoxItem>
<ComboBoxItem>4号</ComboBoxItem>
</ComboBox>
<Button Margin="20,10,0,0" Content="取空盆" Width="60" Height="24" FontSize="14"></Button>
</WrapPanel>
</GroupBox>
</Grid>
</GroupBox>


<GroupBox Header="订单控制" Grid.Row="1" Style="{DynamicResource from}" Tag="Start">
<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>
<Button Margin="20,10,0,0" Content="木耳肉片" Width="120" Height="40"></Button>
<Button Margin="20,10,0,0" Content="香炒菜脯" Width="120" Height="40"></Button>
<Button Margin="20,10,0,0" Content="培根炒菜豆" Width="120" Height="40"></Button>
<Button Margin="20,10,0,0" Content="蒜蓉炒菜芯" Width="120" Height="40"></Button>
<Button Margin="20,10,0,0" Content="腊肠炒菜椒" Width="120" Height="40"></Button>
<Button Margin="20,10,0,0" Content="茄子炒菜豆" Width="120" Height="40"></Button>
<Button Margin="20,10,0,0" Content="大酱炒菜梗" Width="120" Height="40"></Button>
<Button Margin="20,10,0,0" Content="芹菜炒菜脯" Width="120" Height="40"></Button>
<Button Margin="20,10,0,0" Content="蒜炒菜豆" Width="120" Height="40"></Button>
<Button Margin="20,10,0,0" Content="酸辣莴笋" Width="120" Height="40"></Button>
</WrapPanel>
</GroupBox>
</Grid>

</Grid>
</UserControl>

+ 28
- 0
BPASmartClient.ScreenLib/炒锅/MaxWokMonitorControl.xaml.cs View File

@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;

namespace BPASmartClient.ScreenLib.炒锅
{
/// <summary>
/// MaxWokMonitorControl.xaml 的交互逻辑
/// </summary>
public partial class MaxWokMonitorControl : UserControl
{
public MaxWokMonitorControl()
{
InitializeComponent();
}
}
}

+ 27
- 1
SmartClient.sln View File

@@ -198,7 +198,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfApp1", "WpfApp1\WpfApp1.
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkMW", "BPASmartClient.MorkMW\BPASmartClient.MorkMW.csproj", "{C763BF70-2416-4A64-9011-8EF8549473FD}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkMW", "BPASmartClient.MorkMW\BPASmartClient.MorkMW.csproj", "{C763BF70-2416-4A64-9011-8EF8549473FD}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.DosingSystemSingle", "BPASmartClient.DosingSystemSingle\BPASmartClient.DosingSystemSingle.csproj", "{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.DosingSystemSingle", "BPASmartClient.DosingSystemSingle\BPASmartClient.DosingSystemSingle.csproj", "{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "设备监控", "设备监控", "{106E84C1-CAC5-4F14-9E31-201D3202C9FD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MaxWokControl", "BPASmartClient.MaxWokControl\BPASmartClient.MaxWokControl.csproj", "{888382C0-6750-4E81-BED3-0F38775DCCCB}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1874,6 +1878,26 @@ Global
{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|x64.Build.0 = Release|Any CPU {B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|x64.Build.0 = Release|Any CPU
{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|x86.ActiveCfg = Release|Any CPU {B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|x86.ActiveCfg = Release|Any CPU
{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|x86.Build.0 = Release|Any CPU {B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|x86.Build.0 = Release|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|ARM.ActiveCfg = Debug|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|ARM.Build.0 = Debug|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|ARM64.Build.0 = Debug|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|x64.ActiveCfg = Debug|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|x64.Build.0 = Debug|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|x86.ActiveCfg = Debug|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|x86.Build.0 = Debug|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|Any CPU.Build.0 = Release|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|ARM.ActiveCfg = Release|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|ARM.Build.0 = Release|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|ARM64.ActiveCfg = Release|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|ARM64.Build.0 = Release|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|x64.ActiveCfg = Release|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|x64.Build.0 = Release|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|x86.ActiveCfg = Release|Any CPU
{888382C0-6750-4E81-BED3-0F38775DCCCB}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -1966,6 +1990,8 @@ Global
{81D03688-7361-45B8-A3EB-9B0A9222A338} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} {81D03688-7361-45B8-A3EB-9B0A9222A338} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
{C763BF70-2416-4A64-9011-8EF8549473FD} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F} {C763BF70-2416-4A64-9011-8EF8549473FD} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
{B79914B9-3A81-426B-88FF-8ABAF5C92AB5} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} {B79914B9-3A81-426B-88FF-8ABAF5C92AB5} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
{106E84C1-CAC5-4F14-9E31-201D3202C9FD} = {7BE13E55-D8B1-4232-AE63-8BF122633297}
{888382C0-6750-4E81-BED3-0F38775DCCCB} = {106E84C1-CAC5-4F14-9E31-201D3202C9FD}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC} SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}


Write Preview
Loading…
Cancel
Save