1.菜单/窗口，增加“警告窗口”项

LAPTOP-SNT8I5JK\Boounion

2025-03-10 2c01babee844f91f8c7a680ce562667a291e95ac

 SourceCode/Bond/Servo/AlarmDlg.cpp

@@ -66,30 +66,22 @@
                  AlarmData alarmData;
                  alarmData.nId = pStep->getAlarmId();
                  alarmData.nSeverityLevel = pStep->getAlarmLevel();
                  alarmData.nDeviceId = pStep->getAlarmDev();
                  alarmData.nDeviceId = pStep->getEquipment()->getID();
                  alarmData.nUnitId = pStep->getUnitId();
                  alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
                  alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
                  alarmData.strDescription = pStep->getText();
                  alarmData.strStartTime = getCurrentTimeString();
                  alarmData.strEndTime = "2000-01-01 00:00";

                  const AlarmInfo* pAlarmInfo = alarmManager.getAlarmInfoByID(pStep->getAlarmId());
                  alarmData.strDescription = pAlarmInfo != nullptr ? pAlarmInfo->strAlarmText : "";

                  // 插入列表控件
                  CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
                  if (pListCtrl != nullptr) {
                     InsertAlarmData(pListCtrl, alarmData);
                  }

                  // 添加新的 Alarm 数据
                  int alarmEventId = 0;
                  bool result = alarmManager.addAlarm(alarmData, alarmEventId);
                  if (result) {
                     LOGI("<CAlarmDlg> Alarm added successfully!");
               }
                  else {
                     LOGI("<CAlarmDlg> Failed to add alarm.");
            }
         }
            }
         }

@@ -114,7 +106,7 @@
   GetClientRect(&rcClient);

   pItem = GetDlgItem(IDC_LIST_ALARM);
   pItem->MoveWindow(12, 52, rcClient.Width() - 24, rcClient.Height() - 64);
   pItem->MoveWindow(12, 58, rcClient.Width() - 24, rcClient.Height() - 64);
}

void CAlarmDlg::LoadAlarms()
@@ -279,6 +271,7 @@
   pListCtrl->SetColumnWidth(7, LVSCW_AUTOSIZE_USEHEADER);

   // 计算总页数
   int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
   m_nTotalPages = (totalRecords + PAGE_SIZE - 1) / PAGE_SIZE;
   m_nCurPage = 1;

@@ -287,11 +280,6 @@

   return TRUE;  // return TRUE unless you set the focus to a control
   // 异常: OCX 属性页应返回 FALSE
}

BOOL CAlarmDlg::DestroyWindow()
{
   return CDialogEx::DestroyWindow();
}

HBRUSH CAlarmDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)