fix(order): 修改设备状态显示问题
This commit is contained in:
+3
-3
@@ -28,9 +28,9 @@ trayPresent4=823
|
||||
trayPresent5=824
|
||||
trayPresent6=825
|
||||
safetyDoorClosed=826
|
||||
safetyDoor1Closed=827
|
||||
safetyDoor2Closed=828
|
||||
safetyDoor3Closed=829
|
||||
safetyDoor1Closed=837
|
||||
safetyDoor2Closed=838
|
||||
safetyDoor3Closed=839
|
||||
emergencyStop=830
|
||||
robotIdle=832
|
||||
robotRunning=833
|
||||
|
||||
@@ -15,9 +15,9 @@ struct ModbusAddressMap
|
||||
int trayPresent5 = 824;
|
||||
int trayPresent6 = 825;
|
||||
int safetyDoorClosed = 826;
|
||||
int safetyDoor1Closed = 827;
|
||||
int safetyDoor2Closed = 828;
|
||||
int safetyDoor3Closed = 829;
|
||||
int safetyDoor1Closed = 837;
|
||||
int safetyDoor2Closed = 838;
|
||||
int safetyDoor3Closed = 839;
|
||||
int emergencyStop = 830;
|
||||
int robotIdle = 832;
|
||||
int robotRunning = 833;
|
||||
|
||||
@@ -1155,9 +1155,7 @@ void DashboardPage::onDeviceStatusChanged(const DeviceStatus &status)
|
||||
deviceStatus = status;
|
||||
emit deviceStatusChanged(status);
|
||||
const bool offline = !status.statusValid || !status.plcConnected;
|
||||
const QString plcText = offline ? "离线"
|
||||
: status.plcRunning ? "运行中"
|
||||
: status.plcReady ? "就绪" : "未就绪";
|
||||
const QString plcText = offline ? "离线" : "就绪";
|
||||
const QString robotText = offline ? "离线"
|
||||
: status.emergencyStop ? "急停"
|
||||
: status.robotAlarm ? "报警"
|
||||
|
||||
+60
-49
@@ -1,6 +1,8 @@
|
||||
#include "devicepage.h"
|
||||
#include "ui_devicepage.h"
|
||||
#include "uihelpers.h"
|
||||
#include "../config/configmanager.h"
|
||||
#include "../services/visionservice.h"
|
||||
|
||||
#include <QAbstractItemView>
|
||||
#include <QDateTime>
|
||||
@@ -38,15 +40,45 @@ void DevicePage::setupTable()
|
||||
table->setAlternatingRowColors(true);
|
||||
|
||||
const QStringList names = QStringList()
|
||||
<< "PLC" << "上下料机器人" << "检测机" << "视觉引导系统"
|
||||
<< "总控柜" << "机器人控制柜" << "安全门 1" << "安全门 2"
|
||||
<< "安全门 3" << "急停" << "PLC 活动报警";
|
||||
<< "PLC" << "上下料机器人" << "安全门 1" << "安全门 2"
|
||||
<< "安全门 3" << "急停" << "PLC 活动报警"
|
||||
<< "视觉引导系统" << "检测机";
|
||||
table->setRowCount(names.size());
|
||||
for (int row = 0; row < names.size(); ++row) {
|
||||
QTableWidgetItem *item = new QTableWidgetItem(names.at(row));
|
||||
item->setTextAlignment(Qt::AlignCenter);
|
||||
table->setItem(row, 0, item);
|
||||
}
|
||||
|
||||
const QString now = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss");
|
||||
setRow(8, QStringList() << "检测机" << "未知" << "未知" << "未知" << now);
|
||||
}
|
||||
|
||||
void DevicePage::attachVisionService(VisionService *service)
|
||||
{
|
||||
if (!service) return;
|
||||
connect(service, &VisionService::availabilityChanged, this,
|
||||
[this](bool ready, bool, const QString &session) {
|
||||
updateVisionStatus(ready, session);
|
||||
});
|
||||
updateVisionStatus(service->isReady(), service->sessionId());
|
||||
}
|
||||
|
||||
void DevicePage::updateVisionStatus(bool ready, const QString &session)
|
||||
{
|
||||
const bool enabled = ConfigManager::instance().visionConfig().enabled;
|
||||
const QString now = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss");
|
||||
if (!enabled) {
|
||||
setRow(7, QStringList() << "视觉引导系统" << "未启用" << "未启用"
|
||||
<< "未启用" << now);
|
||||
} else if (session.isEmpty()) {
|
||||
setRow(7, QStringList() << "视觉引导系统" << "离线" << "离线"
|
||||
<< "离线" << now);
|
||||
} else {
|
||||
setRow(7, QStringList() << "视觉引导系统" << "在线"
|
||||
<< (ready ? "就绪" : "在线")
|
||||
<< "等待视觉任务" << now);
|
||||
}
|
||||
}
|
||||
|
||||
void DevicePage::setRow(int row, const QStringList &values)
|
||||
@@ -76,73 +108,52 @@ void DevicePage::updateStatus(const DeviceStatus &status)
|
||||
: "color: #d32f2f; padding: 4px 0;");
|
||||
|
||||
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
|
||||
? "未知" : status.visionReady ? "就绪" : "未就绪";
|
||||
const QString robotCabinetState = !status.statusValid
|
||||
? "未知" : status.robotControlCabinetReady ? "正常" : "未就绪";
|
||||
const QString mainCabinetState = !status.statusValid
|
||||
? "未知" : status.mainControlCabinetReady ? "正常" : "未就绪";
|
||||
const QString safetyDoor1State = !status.statusValid
|
||||
? "未知" : status.safetyDoor1Closed ? "关闭" : "打开";
|
||||
const QString safetyDoor2State = !status.statusValid
|
||||
? "未知" : status.safetyDoor2Closed ? "关闭" : "打开";
|
||||
const QString safetyDoor3State = !status.statusValid
|
||||
? "未知" : status.safetyDoor3Closed ? "关闭" : "打开";
|
||||
const QString emergencyState = !status.statusValid
|
||||
? "未知" : status.emergencyStop ? "已触发" : "未触发";
|
||||
const QString alarmState = !status.statusValid
|
||||
? "未知" : status.activeAlarm ? "有报警" : "无报警";
|
||||
const QString safetyDoor1State = offline ? "离线"
|
||||
: status.safetyDoor1Closed ? "关闭" : "打开";
|
||||
const QString safetyDoor2State = offline ? "离线"
|
||||
: status.safetyDoor2Closed ? "关闭" : "打开";
|
||||
const QString safetyDoor3State = offline ? "离线"
|
||||
: status.safetyDoor3Closed ? "关闭" : "打开";
|
||||
const QString emergencyState = offline ? "离线"
|
||||
: status.emergencyStop ? "已触发" : "未触发";
|
||||
const QString alarmState = offline ? "离线"
|
||||
: status.activeAlarm ? "有报警" : "无报警";
|
||||
const QString now = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
setRow(0, QStringList() << "PLC" << connection << plcState
|
||||
<< (offline ? "未知"
|
||||
: QString("PLC 步骤 %1").arg(status.currentStep)) << now);
|
||||
setRow(0, QStringList() << "PLC" << connection
|
||||
<< (offline ? "离线" : "就绪")
|
||||
<< (offline ? "离线" : "就绪") << now);
|
||||
setRow(1, QStringList() << "上下料机器人" << connection << robotState
|
||||
<< (offline ? "未知"
|
||||
<< (offline ? "离线"
|
||||
: status.emergencyStop ? "急停已触发"
|
||||
: status.robotAlarm ? "请处理机器人报警"
|
||||
: status.robotRunning ? "执行中"
|
||||
: status.robotIdle ? "等待动作" : "等待就绪") << now);
|
||||
setRow(2, QStringList() << "检测机" << connection
|
||||
<< inspectionState
|
||||
<< (!status.statusValid ? "未知" : "等待检测") << now);
|
||||
setRow(3, QStringList() << "视觉引导系统" << connection
|
||||
<< visionState
|
||||
<< (!status.statusValid ? "未知" : "等待拍照") << now);
|
||||
setRow(4, QStringList() << "总控柜" << connection << mainCabinetState
|
||||
<< (!status.statusValid ? "未知" : "PLC 状态正常") << now);
|
||||
setRow(5, QStringList() << "机器人控制柜" << connection
|
||||
<< robotCabinetState
|
||||
<< (!status.statusValid ? "未知" : "等待机器人状态") << now);
|
||||
setRow(6, QStringList() << "安全门 1" << connection << safetyDoor1State
|
||||
<< (!status.statusValid ? "未知"
|
||||
setRow(2, QStringList() << "安全门 1" << connection << safetyDoor1State
|
||||
<< (offline ? "离线"
|
||||
: status.safetyDoor1Closed ? "互锁正常" : "请关闭安全门") << now);
|
||||
setRow(7, QStringList() << "安全门 2" << connection << safetyDoor2State
|
||||
<< (!status.statusValid ? "未知"
|
||||
setRow(3, QStringList() << "安全门 2" << connection << safetyDoor2State
|
||||
<< (offline ? "离线"
|
||||
: status.safetyDoor2Closed ? "互锁正常" : "请关闭安全门") << now);
|
||||
setRow(8, QStringList() << "安全门 3" << connection << safetyDoor3State
|
||||
<< (!status.statusValid ? "未知"
|
||||
setRow(4, QStringList() << "安全门 3" << connection << safetyDoor3State
|
||||
<< (offline ? "离线"
|
||||
: status.safetyDoor3Closed ? "互锁正常" : "请关闭安全门") << now);
|
||||
setRow(9, QStringList() << "急停" << connection << emergencyState
|
||||
<< (!status.statusValid ? "未知"
|
||||
setRow(5, QStringList() << "急停" << connection << emergencyState
|
||||
<< (offline ? "离线"
|
||||
: status.emergencyStop ? "安全回路断开" : "安全回路正常") << now);
|
||||
setRow(10, QStringList() << "PLC 活动报警" << connection << alarmState
|
||||
<< (!status.statusValid ? "未知"
|
||||
setRow(6, QStringList() << "PLC 活动报警" << connection << alarmState
|
||||
<< (offline ? "离线"
|
||||
: status.activeAlarm ? "请处理 PLC 报警" : "无活动报警") << now);
|
||||
}
|
||||
|
||||
void DevicePage::handleCommunicationError(const QString &error)
|
||||
{
|
||||
updateStatus(DeviceStatus());
|
||||
communicationErrorLabel->setText("通信异常:" + error);
|
||||
communicationErrorLabel->setStyleSheet("color: #d32f2f; padding: 4px 0;");
|
||||
qWarning() << "Device communication error:" << error;
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
namespace Ui { class DevicePage; }
|
||||
class QLabel;
|
||||
class VisionService;
|
||||
|
||||
class DevicePage : public QWidget
|
||||
{
|
||||
@@ -15,6 +16,7 @@ class DevicePage : public QWidget
|
||||
public:
|
||||
explicit DevicePage(QWidget *parent = nullptr);
|
||||
~DevicePage();
|
||||
void attachVisionService(VisionService *service);
|
||||
|
||||
public slots:
|
||||
void updateStatus(const DeviceStatus &status);
|
||||
@@ -23,6 +25,7 @@ public slots:
|
||||
private:
|
||||
void setupTable();
|
||||
void setRow(int row, const QStringList &values);
|
||||
void updateVisionStatus(bool ready, const QString &session);
|
||||
|
||||
Ui::DevicePage *ui;
|
||||
QLabel *communicationErrorLabel;
|
||||
|
||||
+2
-3
@@ -144,6 +144,7 @@ void Widget::setupMainArea(QVBoxLayout *rootLayout)
|
||||
qualityPage = new QualityPage(this);
|
||||
visionService = new VisionService(ConfigManager::instance().visionConfig(), this);
|
||||
visionPage = new VisionPage(visionService, this);
|
||||
devicePage->attachVisionService(visionService);
|
||||
connect(dashboardPage, &DashboardPage::visionCycleChanged, visionPage, &VisionPage::updateCycle);
|
||||
dashboardPage->attachVisionService(visionService);
|
||||
|
||||
@@ -181,9 +182,7 @@ void Widget::setupMainArea(QVBoxLayout *rootLayout)
|
||||
connect(dashboardPage, &DashboardPage::deviceStatusChanged,
|
||||
this, [this](const DeviceStatus &status) {
|
||||
const bool offline = !status.statusValid || !status.plcConnected;
|
||||
const QString plc = offline ? "离线"
|
||||
: status.plcRunning ? "运行中"
|
||||
: status.plcReady ? "就绪" : "未就绪";
|
||||
const QString plc = offline ? "离线" : "就绪";
|
||||
const QString robot = offline ? "离线"
|
||||
: status.emergencyStop ? "急停"
|
||||
: status.robotAlarm ? "报警"
|
||||
|
||||
Reference in New Issue
Block a user