From d4b0141e5f04b6db457675da77dc691a2f5b073f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 九月 2024 16:48:59 +0800
Subject: [PATCH] #
---
zy-acs-flow/.env | 4 ++--
zy-acs-flow/src/page/agv/AgvCard.jsx | 4 ++--
zy-acs-flow/src/page/agv/AgvShow.jsx | 17 ++++++++++++++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 2 ++
4 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/zy-acs-flow/.env b/zy-acs-flow/.env
index 5ad1587..f3ded7f 100644
--- a/zy-acs-flow/.env
+++ b/zy-acs-flow/.env
@@ -1,5 +1,5 @@
-COOL_BASE_IP = '10.242.136.69'
+# COOL_BASE_IP = '10.242.136.69'
# COOL_BASE_IP = 'localhost'
-# COOL_BASE_IP = '192.168.4.36'
+COOL_BASE_IP = '192.168.4.36'
COOL_BASE_PORT = 9090
diff --git a/zy-acs-flow/src/page/agv/AgvCard.jsx b/zy-acs-flow/src/page/agv/AgvCard.jsx
index 43715b5..b96f4d2 100644
--- a/zy-acs-flow/src/page/agv/AgvCard.jsx
+++ b/zy-acs-flow/src/page/agv/AgvCard.jsx
@@ -38,8 +38,8 @@
justifyContent: 'space-between',
padding: '1em',
...(!record.online && {
- animation: 'pulse 2s infinite',
- '@keyframes pulse': {
+ animation: 'cardBorderPulse 2s infinite',
+ '@keyframes cardBorderPulse': {
'0%': {
boxShadow: '0 0 2px 1px rgba(255, 0, 0, 0.1)',
},
diff --git a/zy-acs-flow/src/page/agv/AgvShow.jsx b/zy-acs-flow/src/page/agv/AgvShow.jsx
index bca624a..85adc9a 100644
--- a/zy-acs-flow/src/page/agv/AgvShow.jsx
+++ b/zy-acs-flow/src/page/agv/AgvShow.jsx
@@ -47,7 +47,22 @@
return (
<>
<Box mt={2} display="flex">
- <Box flex="1">
+ <Box flex="1" sx={{
+ ...(!record.online && {
+ animation: 'showBorderPulse 2s infinite',
+ '@keyframes showBorderPulse': {
+ '0%': {
+ boxShadow: '0 0 2px 1px rgba(255, 0, 0, 0.1)',
+ },
+ '50%': {
+ boxShadow: '0 0 3px 2px rgba(255, 0, 0, 0.3)',
+ },
+ '100%': {
+ boxShadow: '0 0 2px 1px rgba(255, 0, 0, 0.1)',
+ },
+ },
+ })
+ }}>
<Card>
<CardContent sx={{ pt: 0 }}>
<Box display="flex" mb={1} sx={{
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
index 26d2215..316f116 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
@@ -61,6 +61,7 @@
PageResult<AgvResult> page = agvService.pageRel(pageParam);
for (AgvResult result : page.getRecords()) {
result.sync(agvDetailService.selectByAgvId(result.getId()), codeService, taskService, agvService);
+ if (result.getUuid().equals("2")) { result.setOnline(true); }
}
return R.ok().add(page);
}
@@ -83,6 +84,7 @@
Agv agv = agvService.getById(id);
if (null != agv) {
agv.setOnline(agvService.judgeOnline(agv.getId()));
+ if (agv.getUuid().equals("2")) { agv.setOnline(true); }
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (null != agvDetail) {
agv.setAgvDetail(agvDetail);
--
Gitblit v1.9.1