~chenluhua/Bond2.git

			@@ -28,6 +28,7 @@
			#include "CPageCollectionEvent.h"
			#include "CControlJobDlg.h"
			#include "InputDialog.h"
			#include "CControlJobManagerDlg.h"


			#ifdef _DEBUG
			@@ -218,6 +219,7 @@
			m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
			m_pMyStatusbar->setRunTimeText("启动失败.");
			m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(TRUE);
			KillTimer(TIMER_ID_UPDATE_RUMTIME);
			}
			else if (state == SERVO::MASTERSTATE::ATHERERROR) {
			m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
			@@ -231,6 +233,7 @@
			AfxMessageBox(_T("AOI检测失败，请操作员介入解决问题！"));
			}
			m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(TRUE);
			KillTimer(TIMER_ID_UPDATE_RUMTIME);
			}
			else if (state == SERVO::MASTERSTATE::RUNNING \|\| state == SERVO::MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER
			\|\| state == SERVO::MASTERSTATE::RUNNING_BATCH) {
			@@ -987,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("当前用户并非管理员！！！"));
			@@ -1050,9 +1039,15 @@
			}
			}
			else if (id == IDC_BUTTON_JOBS) {
			CControlJobDlg dlg;
			dlg.SetControlJob(theApp.m_model.m_master.getControlJob());
			dlg.DoModal();
			static int i = 0; i++;
			if (i % 2 == 0) {
			CControlJobManagerDlg dlg;
			dlg.DoModal();
			}
			else {
			CControlJobDlg dlg;
			dlg.DoModal();
			}
			}
			else if (id == IDC_BUTTON_PORT_CONFIG) {
			CPortConfigurationDlg dlg;