save debuged code version

backendapimanager.h

@@ -23,7 +23,7 @@ class backendAPIManager : public QObject {
     static bool uploadBlastEquipments(const QJsonObject &regDetsData);
     static QJsonArray getSysUsers();
     static QJsonArray getHAddresses();
-    static QJsonObject getBlastRecords(int page, int pageSize);
+    static QJsonObject getBlastRecords(int page, int pageSize, QJsonObject params);
 
    signals:
     void uploadFinished(const QJsonDocument &response);

blastProject/blastprojectpage.cpp

@@ -187,6 +187,7 @@ void BlastProjectPage::parseJsonString(const QJsonDocument &jsonDoc) {
 
 void BlastProjectPage::on_pushButton_clicked() {
     dialog->setModal(false);
+    dialog->clearFormData();
     dialog->setOperationStatus(0);
     int ref = dialog->exec();
     if (ref == QDialog::Accepted) {};

blastProject/projectdialog.cpp

@@ -217,6 +217,7 @@ void ProjectDialog::setOperationStatus(int newOperationStatus) { operationStatus
 
 void ProjectDialog::setFormData(const HProject &Project) {
     try {
+        clearFormData();  // 清除表单数据
         // hide the accept button
         ui->buttonBox->button(QDialogButtonBox::Ok)->setVisible(false);
 

blastRecord/blastrecord.cpp

@@ -19,7 +19,8 @@ BlastRecord::BlastRecord(QWidget* parent)
 
 void BlastRecord::loadAndRefreshData() {
     LoadingWidget::showLoading(this, "正在加载数据，请稍候...");
-    QJsonObject blastData = backendAPIManager::getBlastRecords(m_currentPage, m_pageSize);
+    QJsonObject params;
+    QJsonObject blastData = backendAPIManager::getBlastRecords(m_currentPage, m_pageSize, params);
     LoadingWidget::hideLoading();
     m_currentPage = blastData["pageIndex"].toInt();
     m_pageSize = blastData["pageSize"].toInt();

blastopepage.cpp

@@ -460,6 +460,7 @@ void BlastOpePage::updateProgressBar(int firingStage, int row) {
                 break;
             case FiringStages::NetChargingFinished:
                 // 充电完成
+                progressBar2->setRange(0, 100);  // 设置范围为0到100
                 progressBar2->setValue(100);
                 break;
             case FiringStages::Blasting:
@@ -469,6 +470,7 @@ void BlastOpePage::updateProgressBar(int firingStage, int row) {
                 break;
             case FiringStages::BlastFinished:
                 // 充电完成
+                progressBar3->setRange(0, 100);  // 设置范围为0到100
                 progressBar3->setValue(100);
                 break;
             default:
@@ -672,7 +674,7 @@ void BlastOpePage::destroyFiringWidget(const QString &uuid, int row) {
         widget->disconnect();             // 断开信号连接
         firingWidgetByUuid.remove(uuid);  // 从映射中移除
     }
-    handleUpdateOpButton(FiringStages::CancelConfirmed, row);
+    RefreshData();
 }
 
 // 槽函数，当 item 状态改变时触发
@@ -826,7 +828,6 @@ void BlastOpePage::destroyBatchFiringWidget(const QString &uuid, int row) {
         widget->deleteLater();
         uuidWidgetSMap.remove(uuid);
     }
-    handleUpdateOpButton(FiringStages::CancelConfirmed, row);
     // reset the table's row by row index
 
     for (int row = 0; row < model->rowCount(); ++row) {
@@ -838,4 +839,6 @@ void BlastOpePage::destroyBatchFiringWidget(const QString &uuid, int row) {
             item->setFlags(flags);
         }
     }
+
+    RefreshData();
 }

fireWidget/firingwidget.cpp

@@ -229,6 +229,7 @@ void firingWidget::handleProjectFiringMqttMessage(const QMqttMessage &message) {
                         case FiringStages::QuickTestFinished:
                             // 起爆检测测试检查报错雷管数量，如果有错误，提示用户确认是否继续
                             if (relayInfo["errorCount"].toInt() > 0) {
+                                m_connectionCheckTimer->stop();
                                 QMessageBox msgBox;
                                 msgBox.setWindowTitle("起爆检测测试错误");
                                 msgBox.setText(QString("起爆检测测试发现 %1 个报错雷管，是否继续起爆？")
@@ -246,6 +247,7 @@ void firingWidget::handleProjectFiringMqttMessage(const QMqttMessage &message) {
                                     sendCancelFiringMsg();
                                     return;
                                 }
+                                m_connectionCheckTimer->start();
                             }
 
                             ui->pushButton_2->setEnabled(true);
@@ -264,10 +266,10 @@ void firingWidget::handleProjectFiringMqttMessage(const QMqttMessage &message) {
                             break;
                         case FiringStages::NetChargingFinished:
                             ui->pushButton_2->setEnabled(true);
-                            emit progressChanged(FiringStages::NetChargingFinished, m_row);
-                            emit updateBlastStatus(FiringStages::NetChargingFinished, m_row);
                             ui->pushButton_2->setText("起爆");
                             navProgress->setState(FiringStages::NetChargingFinished);
+                            emit progressChanged(FiringStages::NetChargingFinished, m_row);
+                            emit updateBlastStatus(FiringStages::NetChargingFinished, m_row);
                             break;
                         case FiringStages::Blasting:
                             ui->pushButton_2->setEnabled(false);

mainwindow.cpp

@@ -167,10 +167,12 @@ void MainWindow::handleMqttProjectsMessage(const QMqttMessage &message) {
                     dao.updateBlastStatusByUuid(uuid, BlastStatus::Registered);
                 }
             }
+            // emit refreshPage();
         } else if (jsonObj.contains("msgType") && jsonObj["msgType"].toString() == "blastSuccess") {
             // 爆破成功, 更新状态; 尤其是离线爆破的; 服务器收到爆破记录后发布
             HProjectDao dao = HProjectDao(DatabaseManager::getInstance().getDatabase());
             dao.updateBlastStatusByUuid(jsonObj["projectUuid"].toString(), BlastStatus::Blasted);
+            // emit refreshPage();
         } else if (jsonObj.contains("msgType") && jsonObj["msgType"].toString() == "safeCheck") {
             // 处理安全验证消息
             if (jsonObj["status"] != "ok") {