liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add-一线下线扫描登录界面

Browse Source
main
liuwf 10 months ago
parent fcea2a9e9d
commit 99c5042f03
22 changed files with 654 additions and 320 deletions
Show Stats Download Patch File Download Diff File

54
Admin.Core.Common/Helper/OSKHelper.cs
Unescape Escape View File

@ -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.ProductOffLine.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
}
}

2
Aucma.Core.ProductOffLine/ViewModels/LoginPageViewModel.cs
Unescape Escape View File

@ -20,7 +20,7 @@ using Aucma.Core.ProductOffLine;
using Aucma.Core.ProductOffLine.Models;
using Aucma.Core.ProductOffLine.Views;
namespace Aucma.Core.PrintTo.ViewModels
namespace Aucma.Core.ProductOffLine.ViewModels
{
public partial class LoginPageViewModel : ObservableObject
{

28
Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs
Unescape Escape View File

@ -46,7 +46,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels
// 箱壳扫码器ip
private static string ShellScannerIp = allScanners.First(x => x.Name == "外侧扫码器2").Ip;
ISysUserInfoServices _sysUserInfoServices;
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel));
private IndexPageView firstPage = new IndexPageView();//首页
@ -72,26 +72,26 @@ namespace Aucma.Core.ProductOffLine.ViewModels
{
UserContent = firstPage;
_sysUserInfoServices = App.ServiceProvider.GetService<ISysUserInfoServices>();
//Task.Run(async () =>
//{
// await RefreshTeamTime();//班组时间
//});
InitUserInfo();
TouchSocketService.RefreshStateEvent += RefreshScanner;
MesDbState(true);
PlcState(false);
Scanner1State(false);
Scanner2State(false);
InitHikRobotAndGun();
init();
});
}
private void InitUserInfo()
{
TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account} 条码系统: {appConfig.BarCodeAccount}";
}
#region 初始化班组刷新定时任务
public void init()
{
TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account}";
TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account} 条码系统: {appConfig.BarCodeAccount}";
// 设备状态刷新定时器
System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);

2
Aucma.Core.ProductOffLine/Views/LoginPageView.xaml.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using Admin.Core.Model.Model_New;
using Aucma.Core.PrintTo.Common;
using Aucma.Core.PrintTo.ViewModels;
using Aucma.Core.ProductOffLine.Common;
using Aucma.Core.ProductOffLine.Config;
using Aucma.Core.ProductOffLine.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;

11
Aucma.Core.ProductOffLineCX1/App.xaml
Unescape Escape View File

@ -22,8 +22,15 @@
<SolidColorBrush x:Key="PrimaryHueMidBrush" Color="#0288d1" />
<!--字体颜色设置-->
<SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="#DDFFFFFF" />
<SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#0288d1" />
<SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="#0288d1" />
<SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#DDFFFFFF" />
<SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="#DDFFFFFF" />
<!--字体大小设置-->
<Style TargetType="TextBlock">
<Setter Property="FontSize" Value="18"/>
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/>
</Style>
</ResourceDictionary>
</Application.Resources>
</Application>

23
Aucma.Core.ProductOffLineCX1/App.xaml.cs
Unescape Escape View File

@ -25,10 +25,29 @@ namespace Aucma.Core.ProductOffLineCX1
var host = CreateHostBuilder(e.Args).Build();//生成宿主。
ServiceProvider = host.Services;
host.Services.GetRequiredService<MainWindow>()?.Show();
await host.StartAsync();
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
/// </summary>

BIN
Aucma.Core.ProductOffLineCX1/Assets/Images/login-background.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 MiB

4
Aucma.Core.ProductOffLineCX1/Aucma.Core.ProductOffLineCX1.csproj
Unescape Escape View File

@ -28,6 +28,7 @@
<None Remove="Assets\Images\background.jpg" />
<None Remove="Assets\Images\Green.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" />
@ -53,6 +54,9 @@
<ItemGroup>
<Resource Include="Assets\Images\background.jpg" />
<Resource Include="Assets\Images\Icon.png" />
<Resource Include="Assets\Images\login-background.png">
<CopyToOutputDirectory></CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\Images\Newlog.png" />
</ItemGroup>

2
Aucma.Core.ProductOffLineCX1/Business/offLineBusiness.cs
Unescape Escape View File

@ -414,7 +414,7 @@ namespace Aucma.Core.ProductOffLineCX1.Business
// 产线
info11.ProductLineCode = appConfig.ProductlineCode.ToString();
info11.SaveRetuenInfo = TempOffLineInfo.MsgInfo;
info11.LoginTeam = appConfig.LoginTeam;
info11.LoginTeam = appConfig.TeamName;
info11.PlcResult = 1;
// 查询本地数据库是否有数据
OffLineInfo offLineInfo = _offLineInfoServices.FirstAsync(x => x.ProductSNCode == TempOffLineInfo.ProductSNCode).Result;

54
Aucma.Core.ProductOffLineCX1/Common/OSKHelper.cs
Unescape Escape View File

@ -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.ProductOffLineCX1.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
}
}

38
Aucma.Core.ProductOffLineCX1/Config/AppConfig.cs
Unescape Escape View File

@ -48,15 +48,7 @@ namespace Aucma.Core.ProductOffLineCX1.Config
set { iniHelper.IniWriteValue("system", "ProductlineCode", value); }
}
/// <summary>
/// 当前登录班组
/// </summary>
public string LoginTeam
{
get { return iniHelper.IniReadValue("system", "LoginTeam"); }
set { iniHelper.IniWriteValue("system", "LoginTeam", value); }
}
/// <summary>
/// 扫码枪放行方向，0外侧，1内侧，-1都未选中
/// </summary>
@ -115,5 +107,33 @@ namespace Aucma.Core.ProductOffLineCX1.Config
}
/// <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); }
}
}
}

27
Aucma.Core.ProductOffLineCX1/Models/Result.cs
Unescape Escape View File

@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Core.ProductOffLineCX1.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; }
}
}

23
Aucma.Core.ProductOffLineCX1/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -62,18 +62,31 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
public IndexPageViewModel()
{
_offLineInfoServices = App.ServiceProvider.GetService<IOffLineInfoServices>();
_baseBomInfoServices = App.ServiceProvider.GetService<IBaseBomInfoServices>();
OffLineBusiness.RefreshScanMateriaCodeEvent += ModelToPage;
OffLineBusiness.RefreshChartsEvent += RefreshCharts;
MainWindowViewModel.RefreshFirstPageChartsEvent += RefreshCharts;
_offLineInfoServices = App.ServiceProvider.GetService<IOffLineInfoServices>();
_baseBomInfoServices = App.ServiceProvider.GetService<IBaseBomInfoServices>();
RefreshCharts();
listTime = _baseBomInfoServices.getWorkTime().Result;
InitializeAsync();
}
private async void InitializeAsync()
{
await Task.Run(() =>
{
RefreshCharts();
listTime = _baseBomInfoServices.getWorkTime().Result;
});
}
/// <summary>
/// 刷新页面展示图表
/// </summary>

139
Aucma.Core.ProductOffLineCX1/ViewModels/LoginPageViewModel.cs
Unescape Escape View File

@ -0,0 +1,139 @@
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.ProductOffLineCX1.Config;
using Aucma.Core.ProductOffLineCX1;
using Aucma.Core.ProductOffLineCX1.Models;
using Aucma.Core.ProductOffLineCX1.Views;
namespace Aucma.Core.ProductOffLineCX1.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 barCode,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;
appConfig.BarCodeAccount = barCode;
//跳转
var window = parameter as LoginPageView;
if (window == null) return;
window.Hide();
MainWindow mainPage = new MainWindow();
mainPage.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.Contains("CX_02")).Result;
if (baseTeamMembersList == null) return;
foreach (var item in baseTeamMembersList)
{
TeamMembersList.Add(item);
}
}
#endregion
}
}

118
Aucma.Core.ProductOffLineCX1/ViewModels/LoginViewModel.cs
Unescape Escape View File

@ -1,118 +0,0 @@
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Service;
using Aucma.Core.ProductOffLineCX1.Config;
using Aucma.Core.ProductOffLineCX1.Models;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
namespace Aucma.Core.ProductOffLineCX1.ViewModels
{
public partial class LoginViewModel : ObservableObject
{
private AppConfig appConfig = AppConfig.Instance;
public RelayCommand<object> CloseWindowCommand { get; set; }
public RelayCommand SaveCommand { get; set; }
public LoginViewModel()
{
_barcodeAccount = appConfig.BarCodeAccount;
// SelectedMaterialType.Content = appConfig.LoginTeam;
CloseWindowCommand = new RelayCommand<object>(t => CloseWindow(t));
SaveCommand = new RelayCommand(Login);
}
//关闭窗口
private void CloseWindow(object parameter)
{
var window = parameter as Window;
if (window != null)
{
window.Close();
}
}
private async void Login()
{
if (SelectedMaterialType == null)
{
MessageBox.Show("未选择班组");
return;
}
if (_barcodeAccount =="")
{
MessageBox.Show("未设置条码系统账号");
return;
}
else
{
MessageBoxResult result = MessageBox.Show("确认登录吗？", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
if (result == MessageBoxResult.Yes)
{
appConfig.BarCodeAccount = _barcodeAccount;
appConfig.LoginTeam = SelectedMaterialType.Content.ToString();
MessageBox.Show("登录成功");
// CloseWindow();
}
}
}
/// <summary>
/// 班组,二线白班，二线夜班
/// </summary>
/// private string _selectedMaterialType;
private ComboBoxItem _selectedMaterialType;
public ComboBoxItem SelectedMaterialType
{
get { return _selectedMaterialType; }
set
{
if (_selectedMaterialType != value)
{
_selectedMaterialType = value;
OnPropertyChanged(nameof(SelectedMaterialType));
}
}
}
#region 条码系统账号
private string _barcodeAccount;
public string BarcodeAccount
{
get { return _barcodeAccount; }
set
{
_barcodeAccount = value;
OnPropertyChanged(nameof(BarcodeAccount));
}
}
#endregion
}
}

143
Aucma.Core.ProductOffLineCX1/ViewModels/MainWindowViewModel.cs
Unescape Escape View File

@ -18,6 +18,8 @@ using Aucma.Core.ProductOffLineCX1.Config;
using Admin.Core.Socket;
using Aucma.Core.Scanner;
using System.Collections.Generic;
using Admin.Core.IService;
using Microsoft.Extensions.DependencyInjection;
namespace Aucma.Core.ProductOffLineCX1.ViewModels
{
@ -44,8 +46,7 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
// 箱壳扫码器ip
private static string ShellScannerIp = allScanners.First(x => x.Name == "外侧扫码器2").Ip;
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel));
private IndexPageView firstPage = new IndexPageView();//首页
private StatisticsPageView recordPage = new StatisticsPageView(); // 统计页面
@ -53,28 +54,50 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
public MainWindowViewModel()
{
UserContent = firstPage;
// 创建一个DispatcherTimer对象
InitializeAsync();
DispatcherTimer timer = new DispatcherTimer();
timer.Interval = TimeSpan.FromSeconds(1);
timer.Tick += Timer_Tick;
timer.Interval = new TimeSpan(0, 0, 1); //间隔1秒
timer.Tick += new EventHandler(timer_Tick);
timer.Start();
// MvCodeHelper.RefreshStateEvent += RefreshScanner;
TouchSocketService.RefreshStateEvent += RefreshScanner;
MesDbState(true);
PlcState(false);
//PlcState(true);
Scanner1State(false);
Scanner2State(false);
}
private async void InitializeAsync()
{
await Task.Run(() =>
{
UserContent = firstPage;
// Job_AllState_Quartz.RefreshStateEvent += RefreshStatus;
InitHikRobotAndGun();
init();
TouchSocketService.RefreshStateEvent += RefreshScanner;
MesDbState(true);
PlcState(false);
Scanner1State(false);
Scanner2State(false);
InitHikRobotAndGun();
init();
});
}
#region 定时刷新时间
void timer_Tick(object sender, EventArgs e)
{
System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
{
CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}));
}
#endregion
#region 初始化班组刷新定时任务
public void init()
{
TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account} 条码系统: {appConfig.BarCodeAccount}";
// 设备状态刷新定时器
System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
timer.Elapsed += new System.Timers.ElapsedEventHandler(RefreshStatus);
@ -240,15 +263,7 @@ namespace Aucma.Core.ProductOffLineCX1.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":
@ -284,6 +299,35 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
}
#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
#region 打开软盘
/// <summary>
/// 打开软盘
@ -548,44 +592,39 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
}
public string _currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
#region 刷新时间
public string _currentDateTime;
public string CurrentDateTime
{
get => _currentDateTime;
set => SetProperty(ref _currentDateTime, value);
}
#endregion
public string _shiftStr = string.Empty;
public string ShiftStr
#region 班组信息
/// <summary>
/// 班组信息
/// </summary>
public string _teamName;
public string TeamName
{
get => _shiftStr;
set => SetProperty(ref _shiftStr, value);
get => _teamName;
set => SetProperty(ref _teamName, value);
}
#endregion
private void Timer_Tick(object sender, EventArgs e)
#region 登陆人信息
/// <summary>
/// 班组信息
/// </summary>
public string account;
public string Account
{
DateTime now = DateTime.Now;
if (appConfig.LoginTeam == "")
{
ShiftStr = $"未登录";
}
else
{
ShiftStr = appConfig.LoginTeam;
}
// 判断当前是否是白班时间段
//if (now.Hour >= 8 && now.Hour < 20)
//{
// ShiftStr = $"白班 08点-20点";
//}
//else
//{
// ShiftStr = $"夜班 20点-08点";
//}
CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
get => account;
set => SetProperty(ref account, value);
}
#endregion

58
Aucma.Core.ProductOffLineCX1/Views/Login.xaml
Unescape Escape View File

@ -1,58 +0,0 @@
<Window x:Class="Aucma.Core.ProductOffLineCX1.Views.Login"
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:Aucma.Core.ProductOffLineCX1.Views"
mc:Ignorable="d" WindowStartupLocation="CenterScreen"
Title="登录" Height="500" Width="500" Name="window" Background="White"
ResizeMode="NoResize" Topmost="True">
<Border Margin="5" Background="#1254AB" CornerRadius="10">
<Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="#1254AB" BorderThickness="3" CornerRadius="5" Background="Transparent" Margin="5,5">
<Border.Effect>
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text=" 选择班组:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0" Width="129"/>
<ComboBox SelectedItem="{Binding SelectedMaterialType}" Width="150" Margin="5 0 0 0" VerticalAlignment="Center" FontSize="30" Foreground="White">
<ComboBoxItem Content="一线白班" Foreground="Blue"/>
<ComboBoxItem Content="一线夜班" Foreground="Blue" />
</ComboBox>
</StackPanel>
<StackPanel Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="条码系统账号:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox FontSize="20" Text="{Binding BarcodeAccount}" Foreground="#FFFFFF" Width="150" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Content="登 录" FontSize="20" Command="{Binding SaveCommand}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0" Height="50" Width="100" Click="Button_Click" />
<Button Content="取 消" FontSize="20" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" />
</StackPanel>
</Grid>
</Border>
</Grid>
</Border>
</Window>

34
Aucma.Core.ProductOffLineCX1/Views/Login.xaml.cs
Unescape Escape View File

@ -1,34 +0,0 @@
using Aucma.Core.ProductOffLineCX1.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.ProductOffLineCX1.Views
{
/// <summary>
/// Login.xaml 的交互逻辑
/// </summary>
public partial class Login : Window
{
public Login()
{
InitializeComponent();
this.DataContext = new LoginViewModel();
}
private void Button_Click(object sender, RoutedEventArgs e)
{
}
}
}

89
Aucma.Core.ProductOffLineCX1/Views/LoginPageView.xaml
Unescape Escape View File

@ -0,0 +1,89 @@
<Window x:Class="Aucma.Core.ProductOffLineCX1.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="420" 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="txtBarCode"
Width="300" FontSize="18"
materialDesign:HintAssist.Hint="条码系统账号"
BorderThickness="1"
BorderBrush="{StaticResource MaterialDesignDivider}"
Style="{StaticResource MaterialDesignOutlinedTextBox}"
GotFocus="TextBox_GotFocus"
LostFocus="TextBox_LostFocus"/>
<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>

90
Aucma.Core.ProductOffLineCX1/Views/LoginPageView.xaml.cs
Unescape Escape View File

@ -0,0 +1,90 @@
using Admin.Core.Model.Model_New;
using Aucma.Core.ProductOffLineCX1.Common;
using Aucma.Core.ProductOffLineCX1.Config;
using Aucma.Core.ProductOffLineCX1.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.ProductOffLineCX1.Views
{
/// <summary>
/// LoginPageView.xaml 的交互逻辑
/// </summary>
public partial class LoginPageView : Window
{
private AppConfig appConfig = AppConfig.Instance;
LoginPageViewModel loginViewModel = new LoginPageViewModel();
public LoginPageView()
{
InitializeComponent();
txtBarCode.Text = appConfig.BarCodeAccount;
this.DataContext = loginViewModel;
}
private void loginBtn_Click(object sender, RoutedEventArgs e)
{
string barCode = txtBarCode.Text;
string userName = txtUserName.Text;
string passWord = txtPassword.Password;
BaseTeamMembers teamMembers = (BaseTeamMembers)this.selectTeamComboBox.SelectedItem;
if (teamMembers==null)
{
MessageBox.Show("请选择班组！","系统提醒");
return;
}
// 非空校验,账号密码正则校验
if (string.IsNullOrWhiteSpace(barCode))
{
MessageBox.Show("条码系统账号不可为空！", "系统提醒");
return;
}
if (string.IsNullOrWhiteSpace(userName))
{
MessageBox.Show("用户名不可为空！", "系统提醒");
return;
}
if (string.IsNullOrWhiteSpace(passWord))
{
MessageBox.Show("密码不可为空！", "系统提醒");
return;
}
// 登录校验
if (appConfig.BarCodeAccount != barCode)
{
MessageBoxResult result = MessageBox.Show($"条码系统上传账号发生变化,历史:{appConfig.BarCodeAccount},当前{barCode},确认更改并登录吗？", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
if (result != MessageBoxResult.Yes)
{
return;
}
}
loginViewModel.Login(teamMembers, barCode,userName, passWord, this);
}
private void TextBox_GotFocus(object sender, RoutedEventArgs e)
{
// 弹出系统键盘
OSKHelper.OpenOsk();
}
private void TextBox_LostFocus(object sender, RoutedEventArgs e)
{
// 隐藏系统键盘
OSKHelper.CloseOsk();
}
}
}

29
Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml
Unescape Escape View File

@ -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="SCADA" Height="1080" Width="1920" Icon="/Assets/images/Icon.png" FontFamily="Microsoft YaHei"
WindowStartupLocation="CenterScreen"
WindowState="Maximized" WindowStyle="SingleBorderWindow" ResizeMode="CanResize">
@ -28,9 +28,9 @@
<Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2,2,2" Height="100" Grid.ColumnSpan="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2.3*"/>
<ColumnDefinition Width="7*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="7*"/>
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions>
<DockPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
@ -38,23 +38,16 @@
<TextBlock Text="澳柯玛成品下线系统" Margin="0" Foreground="White" FontWeight="Bold" FontSize="42" HorizontalAlignment="Center" VerticalAlignment="Center" />
</StackPanel>
</DockPanel>
<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 Height="*"/>
<RowDefinition Height="2*"/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Text="{Binding ShiftStr}" FontSize="20" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
<TextBlock Grid.Row="1" Text="{Binding CurrentDateTime}" FontSize="20" Foreground="White" FontWeight="Bold" Margin="0,0,30,10"/>
<!--<TextBlock Grid.Column="1" Text="|" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
<TextBlock Grid.Column="2" Text="SCADA" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,10,0"/>-->
<Button Grid.Row="2" Content="登录" Width="120" FontSize="20" Foreground="White" Click="Button_Click" />
<StackPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Grid.Column="0" Text="{Binding TeamName}" FontSize="20" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<TextBlock Grid.Column="1" Text="{Binding CurrentDateTime}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Right"/>
</StackPanel>
</Grid>
</StackPanel>
</Grid>
@ -75,7 +68,7 @@
<Button Content="质检分垛" x:Name="QualityPage" Margin="5 0" Height="40" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=QualityPage}" />
<Button Content="键盘" x:Name="TabTip" Margin="5 0" Height="40" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TabTip}" />
<Button Content="最小化" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Width="100" Margin="5 0" Height="40" Background="#FF9900" BorderBrush="#FF9900" />
<Button Content="退 出" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Width="100" Margin="5 0" Height="40" Background="#FF0033" BorderBrush="#FF0033"/>
<Button Content="退 出" x:Name="Exit" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Width="100" Margin="5 0" Height="40" Background="#FF0033" BorderBrush="#FF0033"/>
</StackPanel>
<StackPanel Height="50" Orientation="Horizontal" HorizontalAlignment="Right">
<Border Width="30" Height="30" CornerRadius="15">

6
Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml.cs
Unescape Escape View File

@ -14,11 +14,7 @@ namespace Aucma.Core.ProductOffLineCX1.Views
this.DataContext = new MainWindowViewModel();
}
private void Button_Click(object sender, RoutedEventArgs e)
{
Login login = new Login();
login.ShowDialog();
}
private void Minimized_Click(object sender, RoutedEventArgs e)
{

Write Preview
Loading…
Cancel
Save