Commit 6b26eb9d authored by wanghao's avatar wanghao

1 解绑错误数据显示调整

parent 7627aef8
...@@ -57,11 +57,7 @@ ...@@ -57,11 +57,7 @@
:class="{ :class="{
'active': activeCell === index, 'active': activeCell === index,
'empty': !device.deviceCode, 'empty': !device.deviceCode,
'error': device.deviceCode && (device.status === '0' 'error': isDeviceError(device), // 使用新的判断方法
|| device.status === '5' || (device.realTimeStatus !== null && device.realTimeStatus === '0')
|| (device.calibrationConcentrationStatus !== null && device.calibrationConcentrationStatus !== '4')
|| (device.writeTimeStatus != null && device.writeTimeStatus === '0')
|| (device.runTimeStatus !== null && device.runTimeStatus === '0')),
'duplicate': device.isDuplicate 'duplicate': device.isDuplicate
}" }"
@click="setActiveCell(index)" @click="setActiveCell(index)"
...@@ -269,6 +265,25 @@ export default { ...@@ -269,6 +265,25 @@ export default {
} }
}, },
methods: { methods: {
// 在 methods 中添加一个专门判断设备是否异常的方法
isDeviceError(device) {
if (!device.deviceCode) return false;
// 只有在标定完成状态下才进行详细状态检查
if (this.trayStatus === '3') {
// 标定完成状态下的完整异常检查
return device.status === '0' ||
device.status === '5' ||
(device.realTimeStatus != null && device.realTimeStatus === '0') ||
(device.calibrationConcentrationStatus != null && device.calibrationConcentrationStatus !== '4') ||
(device.writeTimeStatus != null && device.writeTimeStatus === '0') ||
(device.runTimeStatus != null && device.runTimeStatus === '0');
} else {
// 非标定完成状态(0,4,1,2等),只检查设备状态是否为 0 或 5
// 其他状态字段在绑定阶段可能为 null,不应该视为错误
return device.status === '0' || device.status === '5';
}
},
getAllBindingData(trayId) { getAllBindingData(trayId) {
this.devices = []; this.devices = [];
getAllExcludeUnbindingTimeByTrayId(trayId).then(res => { getAllExcludeUnbindingTimeByTrayId(trayId).then(res => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment