add-门体发泡登录界面

Aucma.Core.DoorFoam/App.xaml

@@ -20,13 +20,11 @@
             <SolidColorBrush x:Key="PrimaryHueLightBrush" Color="#4285DE" />
             <SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="#4285DE"  />
             <SolidColorBrush x:Key="PrimaryHueMidBrush" Color="#4285DE"  />
-            
-            <SolidColorBrush x:Key="SecondaryAccentBrush" Color="#4285DE"  />
-            <SolidColorBrush x:Key="SecondaryAccentForegroundBrush" Color="#4285DE"  />
             <!--字体颜色设置-->
-            <SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="White"  />
+            <SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="#DDFFFFFF"  />
-            <SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="White"  />
+            <SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#DDFFFFFF"  />
-            <SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="White"  />
+            <SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="#DDFFFFFF"  />
+
             <!--字体大小设置-->
             <Style TargetType="TextBlock">
                 <Setter Property="FontSize" Value="18"/>

Aucma.Core.DoorFoam/App.xaml.cs

@@ -25,9 +25,28 @@ namespace Aucma.Core.DoorFoam
             var host = CreateHostBuilder(e.Args).Build();//生成宿主。
 
             ServiceProvider = host.Services;
-            host.Services.GetRequiredService<MainWindow>()?.Show();
+
+            try
+            {
+                var loginWindow = host.Services.GetRequiredService<LoginPageView>();
+                if (loginWindow != null && !loginWindow.IsActive)
+                {
+                    loginWindow.Show();
                     await host.StartAsync();
                 }
+                else
+                {
+                    // 处理窗口已关闭的情况
+                    // 可以选择重新创建主窗口或者退出应用程序
+                    Application.Current.Shutdown();
+                }
+            }
+            catch (Exception ex)
+            {
+                Application.Current.Shutdown();
+            }
+        }
+
 
         /// <summary>
         /// CreateHostBuilder

Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
@@ -26,6 +26,7 @@
     <None Remove="Assets\Images\headbg.jpg" />
     <None Remove="Assets\Images\headbg.png" />
     <None Remove="Assets\Images\Icon.png" />
+    <None Remove="Assets\Images\login-background.png" />
     <None Remove="Assets\Images\logo.png" />
     <None Remove="Assets\Images\Newlog.png" />
     <None Remove="Assets\Images\Red.png" />
@@ -50,6 +51,9 @@
     <Resource Include="Assets\Images\headbg.jpg" />
     <Resource Include="Assets\Images\headbg.png" />
     <Resource Include="Assets\Images\Icon.png" />
+    <Resource Include="Assets\Images\login-background.png">
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Assets\Images\Newlog.png" />
   </ItemGroup>
 

Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj.user

@@ -18,6 +18,9 @@
     <Page Update="Views\IndexPageView.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="Views\LoginPageView.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Views\MainWindow.xaml">
       <SubType>Designer</SubType>
     </Page>

Aucma.Core.DoorFoam/Common/OSKHelper.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Core.DoorFoam.Common
+{
+    public  class OSKHelper
+    {
+        #region 打开软盘
+        /// <summary>
+        /// 打开软盘
+        /// </summary>
+        public static void OpenOsk()
+        {
+            try
+            {
+                Process proc = new Process();
+                proc.StartInfo.FileName = @"C:\Windows\System32\osk.exe";
+                proc.StartInfo.UseShellExecute = true;
+                proc.StartInfo.Verb = "runas";
+                proc.Start();
+            }
+            catch 
+            {
+            }
+        }
+        #endregion
+
+
+        #region 关闭软盘
+        /// <summary>
+        /// 关闭软盘
+        /// </summary>
+        public static void CloseOsk()
+        {
+            try
+            {
+                // 查找并关闭 osk.exe 进程
+                foreach (Process proc in Process.GetProcessesByName("osk"))
+                {
+                    proc.Kill();
+                }
+            }
+            catch
+            {
+                // 可以在这里处理异常情况
+            }
+        }
+        #endregion
+    }
+}

Aucma.Core.DoorFoam/Config/AppConfig.cs

@@ -0,0 +1,79 @@
+using Admin.Core.Common.Config;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Core.DoorFoam.Config
+{
+    public sealed class AppConfig
+    {
+        private static IniHelper iniHelper = new IniHelper(System.Environment.CurrentDirectory + "/config/App.InI");
+
+
+        private static readonly Lazy<AppConfig> lazy = new Lazy<AppConfig>(() => new AppConfig());
+        public static AppConfig Instance
+        {
+            get
+            {
+                return lazy.Value;
+            }
+        }
+
+
+        public AppConfig()
+        {
+          
+        }
+
+
+        /// <summary>
+        /// 产线编号
+        /// </summary>
+        public string ProductlineCode
+        {
+            get { return iniHelper.IniReadValue("system", "ProductlineCode"); }
+            set { iniHelper.IniWriteValue("system", "ProductlineCode", value); }
+        }
+
+
+        /// <summary>
+        /// 工位编号
+        /// </summary>
+        public string StationCode
+        {
+            get { return iniHelper.IniReadValue("system", "StationCode"); }
+            set { iniHelper.IniWriteValue("system", "StationCode", value); }
+        }
+        /// <summary>
+        /// 班组代码
+        /// </summary>
+        public string TeamCode
+        {
+            get { return iniHelper.IniReadValue("system", "TeamCode"); }
+            set { iniHelper.IniWriteValue("system", "TeamCode", value); }
+        }
+
+        /// <summary>
+        /// 班组名称
+        /// </summary>
+        public string TeamName
+        {
+            get { return iniHelper.IniReadValue("system", "TeamName"); }
+            set { iniHelper.IniWriteValue("system", "TeamName", value); }
+        }
+
+        /// <summary>
+        /// 用户名
+        /// </summary>
+        public string Account
+        {
+            get { return iniHelper.IniReadValue("system", "Account"); }
+            set { iniHelper.IniWriteValue("system", "Account", value); }
+        }
+        
+      
+
+    }
+}

Aucma.Core.DoorFoam/Models/Result.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Core.DoorFoam.Models
+{
+    /**
+     * 登录返回结果
+     * */
+    public class Result
+    {
+        /// <summary>
+        /// 返回结果
+        /// </summary>
+        public string msg { get; set; }
+        /// <summary>
+        /// 返回状态
+        /// </summary>
+        public int code { get; set; }
+        /// <summary>
+        /// 返回令牌
+        /// </summary>
+        public string token { get; set; }
+    }
+}

Aucma.Core.DoorFoam/ViewModels/LoginPageViewModel.cs

@@ -0,0 +1,135 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using log4net;
+using System.Windows;
+using Admin.Core.Common;
+using Admin.Core.IService;
+using Admin.Core.Service;
+using Microsoft.Extensions.DependencyInjection;
+using System.Collections.ObjectModel;
+using Admin.Core.Model.Model_New;
+using StackExchange.Profiling.Internal;
+using System;
+using System.Text.Json;
+using System.Windows.Input;
+using MaterialDesignThemes.Wpf;
+using NPOI.Util.Collections;
+using Aucma.Core.DoorFoam.Config;
+using Aucma.Core.DoorFoam.Models;
+using Aucma.Core.DoorFoam.Views;
+
+namespace Aucma.Core.DoorFoam.ViewModels
+{
+    public partial class LoginPageViewModel : ObservableObject
+    {
+        private static readonly log4net.ILog log = LogManager.GetLogger(typeof(LoginPageViewModel));
+        protected readonly IBaseTeamMembersServices _baseTeamMembersServices;
+        private AppConfig appConfig = AppConfig.Instance;
+        public LoginPageViewModel() {
+            _baseTeamMembersServices = App.ServiceProvider.GetService<IBaseTeamMembersServices>();
+            AddTeamData();
+        }
+
+        #region 登录
+        /// <summary>
+        /// 登录
+        /// </summary>
+        /// <param name="team">选择的班组信息</param>
+        /// <param name="userName">用户名</param>
+        /// <param name="passWord">密码</param>
+        public  void Login(BaseTeamMembers team, string userName, string passWord,object parameter)
+        {
+            try
+            {
+                //获取Token
+                string url = $"http://10.100.72.10:8080/login";
+                var content = new
+                {
+                    username = userName,
+                    password = passWord
+                };
+
+                var loginResult = HttpHelper.Post(url, content.ToJson());//发送用户名密码给API
+                Result result = JsonSerializer.Deserialize<Result>(loginResult);
+                if (result == null)
+                {
+                    MessageBox.Show("登录失败！", "系统提醒");
+                    return;
+                }
+                if (result.code == 200)
+                {
+                    // 存储账号信息
+                    appConfig.TeamCode = team.TeamCode;
+                    appConfig.TeamName = team.TeamName;
+                    appConfig.Account = userName;
+                    //跳转
+                    var window = parameter as LoginPageView;
+                   
+                    if (window == null) return;
+                    window.Hide();
+                    MainWindow indexPage = new MainWindow();
+                    indexPage.Show();
+                    
+                    window.Close();
+                }
+                else
+                {
+                    MessageBox.Show($"登录失败！{result.msg}", "系统提醒");
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                log.Error($"登录异常:{ex.Message}");
+            }
+        } 
+        #endregion
+
+        #region 关闭当前界面
+        /// <summary>
+        /// 关闭当前界面
+        /// </summary>
+        /// <param name="parameter"></param>
+ 
+        public void CloseWindow(object parameter)
+        {
+            var window = parameter as Window;
+            if (window == null) return;
+
+            window.Close();
+        }
+
+        #endregion
+
+        #region 班组数据
+        /// <summary>
+        /// 班组数据
+        /// </summary>
+        private ObservableCollection<BaseTeamMembers> _teamMembersList = new ObservableCollection<BaseTeamMembers>();
+        public ObservableCollection<BaseTeamMembers> TeamMembersList
+        {
+            get
+            {
+                return this._teamMembersList;
+            }
+            set
+            {
+                SetProperty(ref _teamMembersList, value);
+            }
+        }
+        #endregion
+
+        #region 班组添加到集合中
+        public void AddTeamData()
+        {
+            var baseTeamMembersList = _baseTeamMembersServices.QueryAsync(d => d.ProductLineCode==appConfig.ProductlineCode).Result;
+            if (baseTeamMembersList == null) return;
+            foreach (var item in baseTeamMembersList)
+            {
+                TeamMembersList.Add(item);
+            }
+        }
+
+        #endregion
+    }
+}

Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs

@@ -18,6 +18,7 @@ using System.Collections;
 using Admin.Core.Socket;
 using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
 using Admin.Core.Common;
+using Aucma.Core.DoorFoam.Config;
 
 namespace Aucma.Core.DoorFoam.ViewModels
 {
@@ -31,7 +32,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
 
         private DoorCollection doorCollection = new DoorCollection();
         private CollectionFoamMachine collectionFoam = new CollectionFoamMachine();
-
+        private AppConfig appConfig = AppConfig.Instance;
         public MainWindowViewModel()
         {
             UserContent = firstPage;
@@ -45,6 +46,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
 
         public void init()
         {
+            TeamName = $"班组:{appConfig.TeamName}  用户:{appConfig.Account}";
             // 设备状态刷新定时器
             System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
             timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);
@@ -164,15 +166,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
                 string controlType = obj as string;
                 switch (controlType)
                 {
-                    // 关闭当前窗口
-                    case "Exit":
-                        if (System.Windows.MessageBox.Show("确定要退出系统吗？", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
-                        {
-                            Application.Current.Shutdown();
-                            Environment.Exit(0);
-                        }
                   
-                        break;
                     // 打开软盘
                     case "TabTip":
 
@@ -192,10 +186,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
                         }
                         break;
 
-                    // 最小化当前窗口
+                  
-                    case "Minimized":
-                        Application.Current.MainWindow.WindowState = WindowState.Minimized;
-                        break;
                     default:
                         break;
                 }
@@ -206,6 +197,50 @@ namespace Aucma.Core.DoorFoam.ViewModels
             }
 
         }
+
+        #region 最小化界面
+        /// <summary>
+        /// 关闭当前界面
+        /// </summary>
+        /// <param name="parameter"></param>
+        [RelayCommand]
+        public void MinWindow(object parameter)
+        {
+            var window = parameter as Window;
+            if (window == null) return;
+            window.WindowState = WindowState.Minimized;
+
+        }
+
+        #endregion
+
+
+        #region 关闭当前界面
+        /// <summary>
+        /// 关闭当前界面
+        /// </summary>
+        /// <param name="parameter"></param>
+        [RelayCommand]
+        public void CloseWindow(object parameter)
+        {
+            var window = parameter as Window;
+            if (window == null) return;
+
+            if (MessageBox.Show("确定要退出系统吗？", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
+            {
+                appConfig.TeamCode = "";
+                appConfig.TeamName = "";
+                appConfig.Account = "";
+
+                window.Hide();
+                //跳转到登录页
+                LoginPageView login = new LoginPageView();
+                login.Show();
+                window.Close();
+            }
+        }
+
+        #endregion
         #endregion
 
         #region 打开软盘
@@ -455,6 +490,18 @@ namespace Aucma.Core.DoorFoam.ViewModels
         }
         #endregion
 
+        #region 班组信息
+        /// <summary>
+        /// 班组信息
+        /// </summary>
+        public string _teamName;
+        public string TeamName
+        {
+            get => _teamName;
+            set => SetProperty(ref _teamName, value);
+        }
+        #endregion
+
 
 
         private ObservableCollection<DoorFoamMachine> dataGridItemLeft = new ObservableCollection<DoorFoamMachine>();

Aucma.Core.DoorFoam/Views/LoginPageView.xaml

@@ -0,0 +1,82 @@
+<Window x:Class="Aucma.Core.DoorFoam.Views.LoginPageView"
+        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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+      
+        mc:Ignorable="d"
+        Title="登录"
+        x:Name="MainWindow"
+        FontFamily="Microsoft YaHei"
+        WindowStartupLocation="CenterScreen"    
+         WindowState="Maximized"  d:DesignWidth="1200" d:DesignHeight="900"
+       >
+    <Window.Background>
+        <ImageBrush ImageSource="/Assets/Images/login-background.png" />
+    </Window.Background>
+    <Border Margin="5" Background="Transparent">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="2*"/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <UniformGrid Grid.Row="0">
+                <StackPanel  HorizontalAlignment="Left">
+                    <Image Source="/Assets/Images/Newlog.png" Width="100" />
+                </StackPanel>
+            </UniformGrid>
+            <UniformGrid Grid.Row="1" Margin="0 10">
+                <Border  BorderThickness="4"  CornerRadius="5" x:Name="DialogHost" Width="400" Height="350"  VerticalAlignment="Center" HorizontalAlignment="Center"  >
+                    <StackPanel Background="White">
+
+                        <ComboBox Margin="0 50 0 0"
+                             x:Name="selectTeamComboBox"
+                             Width="300"
+                             BorderThickness="1"
+                             BorderBrush="{StaticResource MaterialDesignDivider}"
+                             materialDesign:HintAssist.Hint="班组"
+                             SelectedValuePath="TeamCode"
+                             DisplayMemberPath="TeamName"
+                             ItemsSource="{Binding TeamMembersList}"
+                             Style="{StaticResource MaterialDesignOutlinedComboBox}" />
+
+                        <TextBox Margin="0 10 0 0" 
+                                 x:Name="txtUserName"
+                                 Width="300"
+                                 FontSize="18" 
+                                 materialDesign:HintAssist.Hint="用户名"
+                                 BorderThickness="1"
+                                 BorderBrush="{StaticResource MaterialDesignDivider}"
+                                 Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                                 GotFocus="TextBox_GotFocus"
+                                 LostFocus="TextBox_LostFocus"/>
+                        <PasswordBox 
+                            Margin="0 10 0 0"
+                            x:Name="txtPassword"
+                            Width="300"
+                            FontSize="12"
+                            materialDesign:HintAssist.Hint="密码"
+                            BorderThickness="1"
+                            BorderBrush="{StaticResource MaterialDesignDivider}"
+                            Style="{StaticResource MaterialDesignOutlinedPasswordBox}"
+                            GotFocus="TextBox_GotFocus"
+                                 LostFocus="TextBox_LostFocus"/>
+                        <Button Margin="0 20 0 0" 
+             x:Name="loginBtn"
+             Style="{StaticResource MaterialDesignFlatMidBgButton}"
+             Width="300"
+             Height="53"
+                                Command="{Binding LoginCommand}"
+             materialDesign:ButtonAssist.CornerRadius="10"
+             Content="登录" Click="loginBtn_Click"/>
+                    </StackPanel>
+                </Border>
+            </UniformGrid>
+            <UniformGrid Grid.Row="2">
+                
+            </UniformGrid>
+        </Grid>
+    </Border>
+</Window>

Aucma.Core.DoorFoam/Views/LoginPageView.xaml.cs

@@ -0,0 +1,72 @@
+using Admin.Core.Model.Model_New;
+using Aucma.Core.DoorFoam.Common;
+using Aucma.Core.DoorFoam.ViewModels;
+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.Shapes;
+
+namespace Aucma.Core.DoorFoam.Views
+{
+    /// <summary>
+    /// LoginPageView.xaml 的交互逻辑
+    /// </summary>
+    public partial class LoginPageView : Window
+    {
+        LoginPageViewModel loginViewModel = new LoginPageViewModel();
+        public LoginPageView()
+        {
+            InitializeComponent();
+            this.DataContext = loginViewModel;
+        }
+
+        private void loginBtn_Click(object sender, RoutedEventArgs e)
+        {
+            string userName = txtUserName.Text;
+            string passWord = txtPassword.Password;
+            BaseTeamMembers teamMembers = (BaseTeamMembers)this.selectTeamComboBox.SelectedItem;
+            if (teamMembers==null)
+            {
+                MessageBox.Show("请选择班组！","系统提醒");
+                return;
+            }
+            // 非空校验,账号密码正则校验
+            if (string.IsNullOrWhiteSpace(userName))
+            {
+                MessageBox.Show("用户名不可为空！", "系统提醒");
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(passWord))
+            {
+                MessageBox.Show("密码不可为空！", "系统提醒");
+                return;
+            }
+            // 登录校验
+
+            loginViewModel.Login(teamMembers,userName, passWord,this);
+        }
+
+
+        private void TextBox_GotFocus(object sender, RoutedEventArgs e)
+        {
+            // 弹出系统键盘
+            OSKHelper.OpenOsk();
+        }
+
+        private void TextBox_LostFocus(object sender, RoutedEventArgs e)
+        {
+            // 隐藏系统键盘
+           OSKHelper.CloseOsk();
+        }
+
+    }
+}

Aucma.Core.DoorFoam/Views/MainWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        mc:Ignorable="d"
+        mc:Ignorable="d" Name="window"
         Title="澳柯玛门体发泡系统"
         d:DesignHeight="1080"
         d:DesignWidth="1920" 
@@ -31,28 +31,23 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="2*"/>
                         <ColumnDefinition Width="7*"/>
-                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="3*"/>
                     </Grid.ColumnDefinitions>
 
                     <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
                         <TextBlock Text="澳柯玛门体发泡系统" FontSize="45" Foreground="White" FontWeight="Bold"/>
                     </StackPanel>
 
-                    <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
+                    <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 20 0 0" >
                         <Grid>
-                            <!--<Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                            </Grid.ColumnDefinitions>-->
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="*"/>
+                                <RowDefinition/>
-                                <RowDefinition Height="*"/>
+                                <RowDefinition/>
                             </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Text="{Binding ShiftStr}" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
+                            <StackPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" >
-                            <TextBlock Grid.Row="1" Text="{Binding CurrentDateTime}" FontSize="20" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
+                                <TextBlock Grid.Column="0" Text="{Binding TeamName}" FontSize="25" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                            <!--<TextBlock Grid.Column="1" Text="|" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
+                                <TextBlock Grid.Column="1" Text="{Binding CurrentDateTime}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Grid.Column="2" Text="SCADA" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,10,0"/>-->
+                            </StackPanel>
                         </Grid>
                     </StackPanel>
                 </Grid>
@@ -73,8 +68,9 @@
                             <Button Content="发泡机监控" x:Name="FoamMachinesPage" Margin="5 0" Command="{Binding SwitchPagesCommand}"  CommandParameter="{Binding Name,ElementName=FoamMachinesPage}" />
                             <Button Content="生产统计" x:Name="RealTimePage" Margin="5 0" Command="{Binding SwitchPagesCommand}"  CommandParameter="{Binding Name,ElementName=RealTimePage}" />
                             <Button Content="键    盘" x:Name="TabTip" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=TabTip}"  />
-                            <Button Content="最小化" x:Name="Minimized" Margin="5 0" Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Minimized}"   Width="100"  Background="#FF9900" BorderBrush="#FF9900" />
+                            <Button Content="最小化"  x:Name="Minimized" Height="40" Margin="5 0"  Command="{Binding MinWindowCommand}"  CommandParameter="{Binding ElementName=window}"   Width="100"  Background="#FF9900" BorderBrush="#FF9900" />
-                            <Button Content="退    出" x:Name="Exit" Margin="5 0" Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Exit}"  Width="100"  Background="#FF0033" BorderBrush="#FF0033" />
+                            <Button Content="退  出"  x:Name="Exit" Height="40" Margin="5 0"  Command="{Binding CloseWindowCommand}"  CommandParameter="{Binding ElementName=window}"  Width="100"  Background="#FF0033" BorderBrush="#FF0033" />
+
                         </StackPanel>
                         <StackPanel   Height="50" Orientation="Horizontal"   HorizontalAlignment="Right">
                             <Border Width="30" Height="30" CornerRadius="15">

Aucma.Core.DoorFoam/appsettings.json

@@ -210,7 +210,7 @@
       "PlcType": "Siemens",
       "Enabled": true,
       "IP": "10.10.92.180",
-      //"10.10.92.180": null,
+   //   "IP": "127.0.0.1",
       "Port": 102
     },
     {
@@ -219,6 +219,7 @@
       "PlcType": "Siemens",
       "Enabled": true,
       "IP": "10.10.92.150",
+     // "IP": "127.0.0.1",
       "Port": 102
     }
   ],