fix(dashboard): 显示问题修改

-PLC-未采集、机器人-未采集、安全回路-未采集 问题修改
-生成工件,成功后添加弹出提示生成成功
This commit is contained in:
lidg
2026-11-09 17:25:14 +08:00
parent 089d91f323
commit a8b2b31ce7
11 changed files with 173 additions and 113 deletions
+19 -11
View File
@@ -1153,20 +1153,25 @@ void DashboardPage::updateCurrentProcessDuration(int elapsedMs)
void DashboardPage::onDeviceStatusChanged(const DeviceStatus &status)
{
emit deviceStatusChanged(status);
const QString plcText = boolStatus(status.statusValid,
status.plcReady, "就绪", "未就绪");
const QString robotText = boolStatus(status.statusValid,
status.robotReady, "就绪", "未就绪");
const QString safetyText = !status.statusValid ? "未采集"
const bool offline = !status.statusValid || !status.plcConnected;
const QString plcText = offline ? "离线"
: status.plcRunning ? "运行中"
: status.plcReady ? "就绪" : "未就绪";
const QString robotText = offline ? "离线"
: status.emergencyStop ? "急停"
: status.robotAlarm ? "报警"
: status.robotRunning ? "运行中"
: status.robotIdle ? "空闲" : "未就绪";
const QString safetyText = offline ? "离线"
: status.safetyDoorClosed ? "正常" : "异常";
const QString emergencyText = offline ? "离线"
: status.emergencyStop ? "已触发" : "正常";
deviceStatusLabel->setText(
QString("PLC:%1 | 机器人:%2 | 安全回路:%3 | 急停:%4")
.arg(!status.statusValid ? "未采集"
: status.plcConnected ? "在线" : "离线")
.arg(plcText)
.arg(robotText)
.arg(safetyText)
.arg(boolStatus(status.statusValid, status.emergencyStop,
"已触发", "正常")));
.arg(emergencyText));
updateStatusCell(inspectionMachineCell,
QString("检测机\n%1").arg(boolStatus(
@@ -1176,8 +1181,11 @@ void DashboardPage::onDeviceStatusChanged(const DeviceStatus &status)
: status.inspectionMachineReady ? "#2e7d32" : "#d32f2f");
updateStatusCell(robotCell,
QString("机器人\n%1").arg(robotText),
!status.statusValid ? "#607d8b"
: status.robotReady ? "#2e7d32" : "#d32f2f");
offline ? "#607d8b"
: status.emergencyStop || status.robotAlarm
? "#d32f2f"
: status.robotRunning || status.robotIdle
? "#2e7d32" : "#d32f2f");
updateStatusCell(robotControlCabinetCell,
QString("机器人控制柜\n%1").arg(boolStatus(
status.statusValid, status.robotControlCabinetReady,
+20 -12
View File
@@ -67,19 +67,23 @@ void DevicePage::setRow(int row, const QStringList &values)
void DevicePage::updateStatus(const DeviceStatus &status)
{
communicationErrorLabel->setText(status.statusValid
const bool offline = !status.statusValid || !status.plcConnected;
communicationErrorLabel->setText(!offline
? "通信状态:PLC 在线"
: "通信状态:PLC 状态未采集");
communicationErrorLabel->setStyleSheet(status.statusValid
: "通信状态:PLC 离线");
communicationErrorLabel->setStyleSheet(!offline
? "color: #2e7d32; padding: 4px 0;"
: "color: #d32f2f; padding: 4px 0;");
const QString connection = !status.statusValid
? "未采集" : status.plcConnected ? "在线" : "离线";
const QString plcState = !status.statusValid
? "未知" : status.plcReady ? "就绪" : "未就绪";
const QString robotState = !status.statusValid
? "未知" : status.robotReady ? "就绪" : "未就绪";
const QString connection = offline ? "离线" : "在线";
const QString plcState = offline ? "离线"
: status.plcRunning ? "运行中"
: status.plcReady ? "就绪" : "未就绪";
const QString robotState = offline ? "离线"
: status.emergencyStop ? "急停"
: status.robotAlarm ? "报警"
: status.robotRunning ? "运行中"
: status.robotIdle ? "空闲" : "未就绪";
const QString inspectionState = !status.statusValid
? "未知" : status.inspectionMachineReady ? "就绪" : "未就绪";
const QString visionState = !status.statusValid
@@ -101,10 +105,14 @@ void DevicePage::updateStatus(const DeviceStatus &status)
const QString now = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss");
setRow(0, QStringList() << "PLC" << connection << plcState
<< QString("PLC 步骤 %1").arg(status.currentStep) << now);
<< (offline ? "未知"
: QString("PLC 步骤 %1").arg(status.currentStep)) << now);
setRow(1, QStringList() << "上下料机器人" << connection << robotState
<< (!status.statusValid ? "未知"
: status.robotReady ? "等待动作" : "等待就绪") << now);
<< (offline ? "未知"
: status.emergencyStop ? "急停已触发"
: status.robotAlarm ? "请处理机器人报警"
: status.robotRunning ? "执行中"
: status.robotIdle ? "等待动作" : "等待就绪") << now);
setRow(2, QStringList() << "检测机" << connection
<< inspectionState
<< (!status.statusValid ? "未知" : "等待检测") << now);
+1
View File
@@ -286,6 +286,7 @@ void OrderPage::generateSelectedWorkpieces()
emit productionDataChanged();
emit logRequested("操作日志", "订单管理", "生成工件",
"生成并分配订单 " + orderNo + " 的工件", "成功");
QMessageBox::information(this, "生成工件", "生成成功");
}
void OrderPage::deleteSelectedOrder()