From f60f7c6687df13cb179cd2a95206a10cca9b77d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 17 十月 2024 14:19:19 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/insight/index.jsx | 7 +++++--
zy-acs-flow/src/map/insight/agv/index.jsx | 12 +++++++++++-
zy-acs-flow/src/map/insight/shelf/index.jsx | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java | 22 ++++++++++++++++++++++
4 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/agv/index.jsx b/zy-acs-flow/src/map/insight/agv/index.jsx
index 8edcca9..916f6ff 100644
--- a/zy-acs-flow/src/map/insight/agv/index.jsx
+++ b/zy-acs-flow/src/map/insight/agv/index.jsx
@@ -5,7 +5,7 @@
import JsonShow from '../../JsonShow';
const AgvInsight = (props) => {
- const { sprite } = props;
+ const { sprite, setTitle } = props;
const theme = useTheme();
const themeMode = theme.palette.mode;
const translate = useTranslate();
@@ -17,6 +17,16 @@
setActiveTab(newValue);
};
+ useEffect(() => {
+ if (curAgvNo) {
+ setTitle(translate('page.map.devices.agv') + ' - ' + curAgvNo);
+ }
+
+ return () => {
+ setTitle(null);
+ }
+ }, [curAgvNo])
+
return (
<Box sx={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
<Tabs
diff --git a/zy-acs-flow/src/map/insight/index.jsx b/zy-acs-flow/src/map/insight/index.jsx
index ec213a8..830c08a 100644
--- a/zy-acs-flow/src/map/insight/index.jsx
+++ b/zy-acs-flow/src/map/insight/index.jsx
@@ -10,10 +10,11 @@
import AgvInsight from './agv';
const Insight = (props) => {
- const { open, onCancel, sprite, width = PAGE_DRAWER_WIDTH, title } = props;
+ const { open, onCancel, sprite, width = PAGE_DRAWER_WIDTH } = props;
const theme = useTheme();
const themeMode = theme.palette.mode;
const translate = useTranslate();
+ const [title, setTitle] = useState(null);
const deviceType = sprite?.data?.type;
@@ -22,7 +23,7 @@
}
useEffect(() => {
- }, [])
+ }, [sprite])
return (
<>
@@ -63,6 +64,7 @@
<>
<ShelfInsight
sprite={sprite}
+ setTitle={setTitle}
/>
</>
)}
@@ -71,6 +73,7 @@
<>
<AgvInsight
sprite={sprite}
+ setTitle={setTitle}
/>
</>
)}
diff --git a/zy-acs-flow/src/map/insight/shelf/index.jsx b/zy-acs-flow/src/map/insight/shelf/index.jsx
index b4e05b5..79eb244 100644
--- a/zy-acs-flow/src/map/insight/shelf/index.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/index.jsx
@@ -5,7 +5,7 @@
import JsonShow from '../../JsonShow';
const ShelfInsight = (props) => {
- const { sprite } = props;
+ const { sprite, setTitle } = props;
const theme = useTheme();
const themeMode = theme.palette.mode;
const translate = useTranslate();
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 9243e1c..895a84a 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
@@ -1,6 +1,10 @@
package com.zy.acs.manager.manager.controller.result;
+import com.zy.acs.manager.core.domain.BackpackDto;
import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* Created by vincent on 10/17/2024
@@ -10,4 +14,22 @@
private String agvNo;
+ private List<BackpackDto> backpack = new ArrayList<>();
+
+ private String agvStatus = "-";
+
+ private String vol = "-";
+
+ private String soc = "-";
+
+ private String pos = "-";
+
+ private String code = "-";
+
+ private Double direction = 0.0;
+
+ private Boolean online = Boolean.FALSE;
+
+ private List<Long> taskIds = new ArrayList<>();
+
}
--
Gitblit v1.9.1