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
075df140
Commit
075df140
authored
Jan 22, 2026
by
wanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1 实时数据显示 最终标定结果 调整,及 一键解绑时 加上loading 处理效果。
parent
71e5140f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
3 deletions
+26
-3
PalletDeviceBindingServiceImpl.java
...g/system/service/impl/PalletDeviceBindingServiceImpl.java
+2
-0
AgingStageTwoProcessJob.java
.../java/com/zehong/system/task/AgingStageTwoProcessJob.java
+1
-0
RealTimeData.vue
...s-agecal-web/src/views/screen/components/RealTimeData.vue
+2
-1
TrayBinding.vue
zhmes-agecal-web/src/views/screen/components/TrayBinding.vue
+21
-2
No files found.
zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/PalletDeviceBindingServiceImpl.java
View file @
075df140
...
@@ -337,6 +337,8 @@ public class PalletDeviceBindingServiceImpl implements IPalletDeviceBindingServi
...
@@ -337,6 +337,8 @@ public class PalletDeviceBindingServiceImpl implements IPalletDeviceBindingServi
if
(
StringUtils
.
isNotBlank
(
data
))
{
if
(
StringUtils
.
isNotBlank
(
data
))
{
// 存失败记录
// 存失败记录
processPalletDeviceUploadFailure
(
palletDeviceBindings
,
data
);
processPalletDeviceUploadFailure
(
palletDeviceBindings
,
data
);
}
else
{
iPalletDeviceUploadFailureService
.
batchInsertRealTimeData
(
palletDeviceBindings
);
}
}
}
}
}
}
...
...
zhmes-agecal-system/src/main/java/com/zehong/system/task/AgingStageTwoProcessJob.java
View file @
075df140
...
@@ -175,6 +175,7 @@ public class AgingStageTwoProcessJob implements Job {
...
@@ -175,6 +175,7 @@ public class AgingStageTwoProcessJob implements Job {
/**
/**
* 处理单个设备(读取 + 条件写入)
* 处理单个设备(读取 + 条件写入)
*/
*/
private
CompletableFuture
<
Boolean
>
processDeviceWithWrite
(
String
ip
,
int
port
,
int
deviceId
,
AtomicInteger
errorCount
)
{
private
CompletableFuture
<
Boolean
>
processDeviceWithWrite
(
String
ip
,
int
port
,
int
deviceId
,
AtomicInteger
errorCount
)
{
return
CompletableFuture
.
supplyAsync
(()
->
{
return
CompletableFuture
.
supplyAsync
(()
->
{
...
...
zhmes-agecal-web/src/views/screen/components/RealTimeData.vue
View file @
075df140
...
@@ -88,7 +88,8 @@
...
@@ -88,7 +88,8 @@
<el-table-column
label=
"标检结果"
align=
"center"
width=
"120"
>
<el-table-column
label=
"标检结果"
align=
"center"
width=
"120"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.standardInspectResult === '1'"
class=
"write-success"
>
合格
</span>
<span
v-if=
"scope.row.standardInspectResult === '1'"
class=
"write-success"
>
合格
</span>
<span
v-else
class=
"write-failed"
>
不合格
</span>
<span
v-else-if=
"scope.row.standardInspectResult === '0'"
class=
"write-failed"
>
不合格
</span>
<span
v-else
class=
"write-unknown"
>
-
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"状态"
align=
"center"
width=
"120"
>
<el-table-column
label=
"状态"
align=
"center"
width=
"120"
>
...
...
zhmes-agecal-web/src/views/screen/components/TrayBinding.vue
View file @
075df140
...
@@ -632,13 +632,25 @@ export default {
...
@@ -632,13 +632,25 @@ export default {
},
},
// 一键解绑所有设备
// 一键解绑所有设备
// 一键解绑所有设备
unbindAll
()
{
unbindAll
()
{
this
.
$confirm
(
'确定要解绑当前托盘下所有设备吗?'
,
'警告'
,
{
this
.
$confirm
(
'确定要解绑当前托盘下所有设备吗?'
,
'警告'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'error'
type
:
'error'
}).
then
(()
=>
{
}).
then
(()
=>
{
// 创建loading实例
const
loadingInstance
=
this
.
$loading
({
lock
:
true
,
text
:
'正在解绑所有设备...'
,
spinner
:
'el-icon-loading'
,
background
:
'rgba(0, 0, 0, 0.7)'
});
unbindAllDevice
(
this
.
fTrayId
).
then
(
res
=>
{
unbindAllDevice
(
this
.
fTrayId
).
then
(
res
=>
{
// 关闭loading
loadingInstance
.
close
();
if
(
res
.
code
===
200
)
{
if
(
res
.
code
===
200
)
{
// 解绑成功后重置设备矩阵
// 解绑成功后重置设备矩阵
this
.
devices
=
this
.
devices
.
map
(
d
=>
({
this
.
devices
=
this
.
devices
.
map
(
d
=>
({
...
@@ -656,8 +668,15 @@ export default {
...
@@ -656,8 +668,15 @@ export default {
}
else
{
}
else
{
this
.
$message
.
error
(
"解绑失败"
);
this
.
$message
.
error
(
"解绑失败"
);
}
}
})
}).
catch
(
error
=>
{
}).
catch
(()
=>
{});
// 关闭loading
loadingInstance
.
close
();
this
.
$message
.
error
(
"解绑请求失败: "
+
error
.
message
);
console
.
error
(
"一键解绑失败:"
,
error
);
});
}).
catch
(()
=>
{
// 用户点击取消,不做任何操作
});
},
},
// 绑定托盘
// 绑定托盘
...
...
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