Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Z
zhmes-agecal
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
耿迪迪
zhmes-agecal
Commits
6b26eb9d
Commit
6b26eb9d
authored
Dec 03, 2025
by
wanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1 解绑错误数据显示调整
parent
7627aef8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
5 deletions
+20
-5
TrayBinding.vue
zhmes-agecal-web/src/views/screen/components/TrayBinding.vue
+20
-5
No files found.
zhmes-agecal-web/src/views/screen/components/TrayBinding.vue
View file @
6b26eb9d
...
@@ -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
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment