From b17d444a0da9cabf775f90be04d14fac113bb9fb Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 13 九月 2025 17:56:36 +0800
Subject: [PATCH] 1.优化代码； 2.增加CControlJobManagerDlg对话框， 准备处理批任务。
---
SourceCode/Bond/Servo/ServoDlg.cpp | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 74f8607..4158bae 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -28,6 +28,7 @@
#include "CPageCollectionEvent.h"
#include "CControlJobDlg.h"
#include "InputDialog.h"
+#include "CControlJobManagerDlg.h"
#ifdef _DEBUG
@@ -989,20 +990,6 @@
{
int id = (int)lParam;
if (id == IDC_BUTTON_RUN || id == IDC_BUTTON_STOP) {
- //CInputDialog inputDialog(_T("验证用户"), _T("请输入用户密码："));
- //if (inputDialog.DoModal() != IDOK) {
- // AfxMessageBox(_T("取消验证！"));
- // return 0;
- //}
-
- //CString inputText = inputDialog.GetInputText();
- //std::string strPass = UserManager::getInstance().getCurrentPass();
- //if (inputText.Compare(strPass.c_str()) != 0) {
- // AfxMessageBox(_T("密码错误！"));
- // SystemLogManager::getInstance().log(SystemLogManager::LogType::Info, _T("验证时，密码错误！"));
- // return 0;
- //}
-
UserRole emRole = UserManager::getInstance().getCurrentUserRole();
if (emRole != UserRole::SuperAdmin) {
AfxMessageBox(_T("当前用户并非管理员！！！"));
@@ -1052,9 +1039,14 @@
}
}
else if (id == IDC_BUTTON_JOBS) {
+ CControlJobManagerDlg dlg;
+ dlg.DoModal();
+
+ /*
CControlJobDlg dlg;
dlg.SetControlJob(theApp.m_model.m_master.getControlJob());
dlg.DoModal();
+ */
}
else if (id == IDC_BUTTON_PORT_CONFIG) {
CPortConfigurationDlg dlg;
--
Gitblit v1.9.3