222

BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj

@@ -93,6 +93,8 @@
     <None Remove="Image\圆角矩形 30 拷贝.png" />
     <None Remove="Image\圆角矩形 4.png" />
     <None Remove="Image\圆角矩形.png" />
+    <None Remove="Image\工艺流程.jpg" />
+    <None Remove="Image\工艺流程.png" />
     <None Remove="Image\底部背景.png" />
     <None Remove="Image\搜索按钮.png" />
     <None Remove="Image\搜索框.png" />
@@ -173,6 +175,7 @@
     <None Remove="Image\顶部切图\Top_L.png" />
     <None Remove="Image\顶部切图\窗体背景.png" />
     <None Remove="Image\顶部切图\窗体背景2.png" />
+    <None Remove="Image\顶部切图\自动化产线上位机控制系统.png" />
     <None Remove="Image\顶部切图\返回按钮1.png" />
     <None Remove="Image\顶部切图\返回按钮2.png" />
     <None Remove="Image\顶部切图\返回按钮图标.png" />
@@ -203,6 +206,8 @@
     <Resource Include="Image\告警\无告警.png" />
     <Resource Include="Image\告警\无告警1.png" />
     <Resource Include="Image\告警\轻微告警.png" />
+    <Resource Include="Image\工艺流程.jpg" />
+    <Resource Include="Image\工艺流程.png" />
     <Resource Include="Image\界面2.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
@@ -221,6 +226,7 @@
     <Resource Include="Image\顶部切图\Top_L.png" />
     <Resource Include="Image\顶部切图\窗体背景.png" />
     <Resource Include="Image\顶部切图\窗体背景2.png" />
+    <Resource Include="Image\顶部切图\自动化产线上位机控制系统.png" />
     <Resource Include="Image\顶部切图\返回按钮1.png" />
     <Resource Include="Image\顶部切图\返回按钮2.png" />
     <Resource Include="Image\顶部切图\返回按钮图标.png" />

BPASmartClient.CustomResource/Themes/MyStyle.xaml

@@ -181,6 +181,14 @@
         </Style.Setters>
     </Style>
 
+    <Style x:Key="imagetop_工艺流程" TargetType="Image">
+        <Style.Setters>
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/工艺流程.png" />
+        </Style.Setters>
+    </Style>
+    
     <Style x:Key="imagetop_维护" TargetType="Image">
         <Style.Setters>
             <Setter Property="Width" Value="20" />
@@ -225,7 +233,7 @@
             <Setter Property="Width" Value="250" />
             <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/黑菠萝智慧餐饮管理系统.png" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/自动化产线上位机控制系统.png" />
         </Style.Setters>
     </Style>
 

BPASmartClient/Control/GYLCControl.xaml

@@ -0,0 +1,23 @@
+<UserControl x:Class="BPASmartClient.Control.GYLCControl"
+             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.Control"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <ScrollViewer>
+        <Image Style="{DynamicResource imagetop_工艺流程}"  ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+
+        </Image>
+    </ScrollViewer>
+    
+</UserControl>

BPASmartClient/Control/GYLCControl.xaml.cs

@@ -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.Control
+{
+    /// <summary>
+    /// GYLCControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class GYLCControl : UserControl
+    {
+        public GYLCControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

BPASmartClient/MainWindow.xaml

@@ -152,6 +152,12 @@
                                 Header="IOT监视"
                                 Tag="IOTView" />
                             <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="工艺流程"
+                                Tag="GYLCControl" />
+                            <Separator />
                         </MenuItem>
                         <MenuItem Header="综合查询">
                             <MenuItem

DosingSystem/DosingSystem.csproj

@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.39" />
+    <PackageReference Include="BPA.Message" Version="1.0.45" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

DosingSystem/View/NewRecipeView.xaml

@@ -139,7 +139,7 @@
                                                     <ColumnDefinition Width="0.5*" />
                                                 </Grid.ColumnDefinitions>
 
-                                                <ComboBox
+                                                <!--<ComboBox
                                                     Name="cb"
                                                     Grid.Column="0"
                                                     Margin="3,1"
@@ -153,8 +153,19 @@
                                                     ItemsSource="{Binding DataContext.RawMaterialNames, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
                                                     SelectedIndex="0"
                                                     Style="{StaticResource ComboBoxStyle}"
-                                                    Text="{Binding RawMaterialName}" />
+                                                    Text="{Binding RawMaterialName}" />-->
 
+                                                <TextBox
+                                                    Name="cb"
+                                                    Grid.Column="0"
+                                                    Margin="3,1"
+                                                    VerticalAlignment="Center"
+                                                    BorderBrush="#FF074B92"
+                                                    BorderThickness="1"
+                                                    FontFamily="楷体"
+                                                    FontSize="20"
+                                                    Foreground="#FF2AB2E7"
+                                                    Text="{Binding RawMaterialName}" />
                                                 <StackPanel
                                                     Grid.Column="1"
                                                     VerticalAlignment="Center"