From 2fcef5de22b0ab7bf1076bd3d740c803db22ed41 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 20 九月 2024 14:59:17 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/agv/AgvCard.jsx | 26 +++++++++++++++-----------
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java | 3 ---
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/zy-acs-flow/src/page/agv/AgvCard.jsx b/zy-acs-flow/src/page/agv/AgvCard.jsx
index 53e4a00..7af6f3b 100644
--- a/zy-acs-flow/src/page/agv/AgvCard.jsx
+++ b/zy-acs-flow/src/page/agv/AgvCard.jsx
@@ -1,11 +1,8 @@
import * as React from 'react';
import { useState } from 'react';
import { Paper, Typography, Box, AvatarGroup, Avatar } from '@mui/material';
-import ContactsIcon from '@mui/icons-material/AccountCircle';
-import DealIcon from '@mui/icons-material/MonetizationOn';
import {
useCreatePath,
- SelectField,
useRecordContext,
Link,
useResourceContext,
@@ -13,7 +10,7 @@
} from 'react-admin';
import PulseSignal from '../components/PulseSignal';
import { AgvAvatar } from './AgvAvatar';
-import { red } from '@mui/material/colors';
+import { red, blue } from '@mui/material/colors';
export const AgvCard = (props) => {
const resource = useResourceContext();
@@ -108,14 +105,21 @@
},
}}
>
- {data.map((record) => (
- <Avatar
- key={record.id}
- title={`${record.seqNum}`}
- >
- {record.seqNum}
+ {data.length > 0 ? (
+ data.map((record) => (
+ <Avatar
+ key={record.id}
+ title={`${record.seqNum}`}
+ sx={{ bgcolor: blue[300] }}
+ >
+ {record.seqNum.slice(0, 4)}
+ </Avatar>
+ ))
+ ) : (
+ <Avatar title="No tasks" >
+ N/A
</Avatar>
- ))}
+ )}
</AvatarGroup>
);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
index e129094..85d817e 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
@@ -48,9 +48,6 @@
List<Task> tasks = taskService.selectInSts(agvDetail.getAgvId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
if (!Cools.isEmpty(tasks)) {
this.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
- this.getTaskIds().add(6441L);
- this.getTaskIds().add(6442L);
- this.getTaskIds().add(6443L);
}
}
}
--
Gitblit v1.9.1