From 10761f3c66b5a5ebb1a852d2f9f4379bf29dfde3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 20 九月 2024 13:45:38 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/agv/AgvAvatar.jsx | 2 ++
zy-acs-flow/src/page/components/PulseSignal.jsx | 5 +++--
zy-acs-flow/src/page/agv/AgvCard.jsx | 15 +++------------
zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml | 1 +
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 2 +-
5 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/zy-acs-flow/src/page/agv/AgvAvatar.jsx b/zy-acs-flow/src/page/agv/AgvAvatar.jsx
index fc80e06..22cc5fb 100644
--- a/zy-acs-flow/src/page/agv/AgvAvatar.jsx
+++ b/zy-acs-flow/src/page/agv/AgvAvatar.jsx
@@ -1,6 +1,7 @@
import * as React from 'react';
import { Avatar } from '@mui/material';
import { useRecordContext } from 'react-admin';
+import { blueGrey } from '@mui/material/colors';
export const AgvAvatar = (props) => {
const { width = 40, height = 40 } = props;
@@ -15,6 +16,7 @@
width,
height,
fontSize: height !== 40 ? '0.6rem' : undefined,
+ bgcolor: blueGrey[500]
}}
>
{record.uuid}
diff --git a/zy-acs-flow/src/page/agv/AgvCard.jsx b/zy-acs-flow/src/page/agv/AgvCard.jsx
index e86aae0..20a1c55 100644
--- a/zy-acs-flow/src/page/agv/AgvCard.jsx
+++ b/zy-acs-flow/src/page/agv/AgvCard.jsx
@@ -49,18 +49,9 @@
<PulseSignal
flag={true}
/>
- <Box display="flex" alignItems="center">
- <BatteryCharging90Icon
- sx={{
- width: 12,
- height: 12,
- color: record.vol > 50 ? 'green' : record.vol > 20 ? 'orange' : 'red',
- }}
- />
- <Typography variant="body2">
- {record.vol}
- </Typography>
- </Box>
+ <Typography variant="caption">
+ vol: {record.vol}
+ </Typography>
</Box>
<Box display="flex" flexDirection="column" alignItems="center">
<AgvAvatar />
diff --git a/zy-acs-flow/src/page/components/PulseSignal.jsx b/zy-acs-flow/src/page/components/PulseSignal.jsx
index b4a0750..1b98d49 100644
--- a/zy-acs-flow/src/page/components/PulseSignal.jsx
+++ b/zy-acs-flow/src/page/components/PulseSignal.jsx
@@ -1,5 +1,6 @@
import * as React from 'react';
import { Paper, Typography, Box, Chip, Avatar } from '@mui/material';
+import { teal } from '@mui/material/colors';
const PulseSignal = (props) => {
const { flag = true, width = 8, ...rest } = props;
@@ -12,9 +13,9 @@
width: width,
height: width,
borderRadius: '50%',
- backgroundColor: flag ? '#3f51b5' : '#f44336',
+ backgroundColor: flag ? `${teal[400]}` : '#f44336',
display: 'inline-block',
- animation: 'pulse 1.5s infinite',
+ animation: 'pulse 1.2s infinite',
'@keyframes pulse': {
'0%': {
transform: 'scale(1)',
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
index 804cd5b..3a60f28 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -49,7 +49,7 @@
@Override
public PageResult<AgvResult> pageRel(PageParam<Agv, BaseParam> pageParam) {
- return new PageResult<AgvResult>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal());
+ return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal());
}
@Override
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
index 4e86772..9ddbe77 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
@@ -42,6 +42,7 @@
from man_agv ma
left join man_agv_detail mad on ma.id = mad.agv_id
where 1=1
+ order by ma.uuid asc
</select>
</mapper>
--
Gitblit v1.9.1