From aedb3b85fed48cb2cf0abb5fafa8e7591644c9f4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 02 十二月 2024 08:53:06 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/View/LoginDlg.cpp | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/LoginDlg.cpp b/SourceCode/Bond/BondEq/View/LoginDlg.cpp
index 9dae4f8..edacdb8 100644
--- a/SourceCode/Bond/BondEq/View/LoginDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/LoginDlg.cpp
@@ -5,7 +5,6 @@
#include "BondEq.h"
#include "afxdialogex.h"
#include "LoginDlg.h"
-#include "UserManager.h"
#include "ChangePasswordDlg.h"
@@ -24,11 +23,11 @@
void CLoginDlg::DoDataExchange(CDataExchange* pDX)
{
- CDialogEx::DoDataExchange(pDX);
- DDX_Control(pDX, IDC_EDIT_USERNAME, m_editUsername);
- DDX_Control(pDX, IDC_EDIT_PASSWORD, m_editPassword);
- DDX_Control(pDX, IDC_COMBO_ROLE, m_comboRole);
- DDX_Control(pDX, IDC_CHECK_REMEMBER_PASSWORD, m_checkRememberPassword);
+ CDialogEx::DoDataExchange(pDX);
+ DDX_Control(pDX, IDC_STATIC_IMAGE, m_staticImage);
+ DDX_Control(pDX, IDC_EDIT_USERNAME, m_editUsername);
+ DDX_Control(pDX, IDC_EDIT_PASSWORD, m_editPassword);
+ DDX_Control(pDX, IDC_CHECK_REMEMBER_PASSWORD, m_checkRememberPassword);
}
@@ -47,10 +46,24 @@
// 璁剧疆绐楀彛鏍囬鍜屽垵濮嬪��
SetWindowText(_T("鐧诲綍"));
- m_comboRole.AddString(_T("绠＄悊鍛�"));
- m_comboRole.AddString(_T("宸ョ▼甯�"));
- m_comboRole.AddString(_T("鎿嶄綔鍛�"));
- m_comboRole.SetCurSel(0);
+
+ CString strIconPath;
+ strIconPath.Format(_T("%s\\Res\\Operator_High_32.ico"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+
+ // 鍔犺浇鍥炬爣
+ HICON hIcon = (HICON)::LoadImage(
+ nullptr,
+ strIconPath,
+ IMAGE_ICON,
+ 32, // 鍥炬爣瀹藉害
+ 32, // 鍥炬爣楂樺害
+ LR_LOADFROMFILE);
+
+ if (hIcon) {
+ // 璁剧疆 CStatic 鎺т欢涓哄浘鏍囨牱寮�
+ m_staticImage.ModifyStyle(0xF, SS_ICON);
+ m_staticImage.SetIcon(hIcon);
+ }
// 娣诲姞SS_NOTIFY鏍峰紡
CStatic* pStatic = (CStatic*)GetDlgItem(IDC_STATIC_CHANGE_PASSWORD);
@@ -60,11 +73,6 @@
UserManager& userManager = UserManager::getInstance();
if (userManager.isLoggedIn()) {
- int nRole = (int)userManager.getCurrentUserRole();
- if (nRole <= m_comboRole.GetCount()) {
- m_comboRole.SetCurSel(nRole);
- }
-
if (userManager.isRememberMe()) {
m_checkRememberPassword.SetCheck(BST_CHECKED);
}
@@ -82,7 +90,6 @@
CString username, password, role;
m_editUsername.GetWindowText(username);
m_editPassword.GetWindowText(password);
- m_comboRole.GetLBText(m_comboRole.GetCurSel(), role);
if (username.IsEmpty() || password.IsEmpty()) {
AfxMessageBox(_T("璇疯緭鍏ョ敤鎴峰悕鍜屽瘑鐮併��"));
@@ -98,12 +105,14 @@
#endif
UserManager& userManager = UserManager::getInstance();
+ SystemLogManager& logManager = SystemLogManager::getInstance();
if (!userManager.login(strUsername, strPassword, (m_checkRememberPassword.GetCheck() == BST_CHECKED))) {
AfxMessageBox(_T("鐧诲綍澶辫触銆�"));
return;
}
EndDialog(IDOK);
+ logManager.log(SystemLogManager::LogType::Info, _T("鐧诲綍鎴愬姛..."));
}
void CLoginDlg::OnBnClickedChangePassword()
--
Gitblit v1.9.3