From 84de229b2326081d2e00e3ffb6654baca72b7969 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 16 十二月 2024 10:03:33 +0800
Subject: [PATCH] 1. 添加配方列表对话框
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 4f29b69..d4c6c60 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -16,6 +16,8 @@
#include "UserManagerDlg.h"
#include "SystemLogManagerDlg.h"
+// 测试
+#include "RecipeLiseDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -229,6 +231,22 @@
catch (const std::exception& ex) {
CString errorMsg;
errorMsg.Format(_T("初始化系统日志模块失败：%s"), CString(ex.what()));
+ AfxMessageBox(errorMsg, MB_ICONERROR);
+ return FALSE;
+ }
+
+ // 初始化报警模块
+ AlarmManager& alarmManager = AlarmManager::getInstance();
+ alarmManager.setDatabase(db.get());
+ try {
+ if (!alarmManager.initializeAlarmTable()) {
+ AfxMessageBox("初始化报警模块失败！");
+ return FALSE;
+ }
+ }
+ catch (const std::exception& ex) {
+ CString errorMsg;
+ errorMsg.Format(_T("初始化报警模块失败：%s"), CString(ex.what()));
AfxMessageBox(errorMsg, MB_ICONERROR);
return FALSE;
}
@@ -522,8 +540,12 @@
void CBondEqDlg::OnMenuFileSettings()
{
- CSettingsDlg dlg;
+
+ CRecipeLiseDlg dlg;
dlg.DoModal();
+
+ //CSettingsDlg dlg;
+ //dlg.DoModal();
}
void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
--
Gitblit v1.9.3