From 281069d9434aad8e0245be45580402f7a9a798d0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 十一月 2024 15:50:32 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/insight/agv/AgvMain.jsx | 7 +++++--
zy-acs-flow/src/map/insight/agv/index.jsx | 8 ++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 4 ++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java | 2 ++
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/agv/AgvMain.jsx b/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
index 3e1880c..de26e28 100644
--- a/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
+++ b/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
@@ -92,7 +92,7 @@
}
useEffect(() => {
- if (info) {
+ if (curAgvNo) {
setLoading(true);
setTimeout(() => {
startThree(containerRef.current);
@@ -101,7 +101,7 @@
}, 200);
}
return endThree;
- }, [info]);
+ }, [curAgvNo]);
const handleRestoreAll = () => {
handleRestoreAgvAll({ agvNo: info.agvNo });
@@ -190,6 +190,9 @@
<KeyValuePair label={translate('table.field.agvDetail.backpack')} value={info?.backpack.filter(item => item.loaded === true).length} />
</Grid>
<Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.agvDetail.error')} value={info?.error} />
+ </Grid>
+ <Grid item xs={12}>
<KeyValuePair label={translate('table.field.agvDetail.task')} value={info?.taskIds?.join(',')} />
</Grid>
</Grid>
diff --git a/zy-acs-flow/src/map/insight/agv/index.jsx b/zy-acs-flow/src/map/insight/agv/index.jsx
index 43b8123..8cd484e 100644
--- a/zy-acs-flow/src/map/insight/agv/index.jsx
+++ b/zy-acs-flow/src/map/insight/agv/index.jsx
@@ -1,6 +1,7 @@
import React, { useState, useRef, useEffect } from 'react';
import { useTranslate } from "react-admin";
import { Box, Typography, Tabs, Tab, Stack, useTheme, Divider } from '@mui/material';
+import { CUSTOM_PAGES_DATA_INTERVAL } from '@/config/setting';
import AgvMain from './AgvMain';
import AgvControl from './AgvControl';
import JsonShow from '../../JsonShow';
@@ -24,16 +25,23 @@
}
useEffect(() => {
+ let intervalId;
if (sprite) {
const agvNo = sprite.data.no;
if (agvNo) {
fetchAgvInfo(agvNo);
+ intervalId = setInterval(() => {
+ fetchAgvInfo(agvNo);
+ }, CUSTOM_PAGES_DATA_INTERVAL);
}
}
return () => {
setTitle(null);
setCurAgvInfo(null);
+ if (intervalId) {
+ clearInterval(intervalId)
+ }
}
}, [sprite])
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index 29aa88f..90819c2 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -164,6 +164,10 @@
vo.setDirection(agvDetail.getAgvAngle());
vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
vo.setPatrol(patrolService.isPatrolling(agvNo));
+ String error = agvDetail.realError();
+ if (!Cools.isEmpty(error)) {
+ vo.setError(error);
+ }
}
List<Task> tasks = taskService.selectInSts(agv.getId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
if (!Cools.isEmpty(tasks)) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java
index b982081..76d3d08 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java
@@ -32,6 +32,8 @@
private Double direction = 0.0;
+ private String error = "-";
+
private List<BackpackDto> backpack = new ArrayList<>();
private List<Long> taskIds = new ArrayList<>();
--
Gitblit v1.9.1