From 3b010a80cfec8da203dfca3d0c5f0f11ef5957b3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 27 九月 2024 16:33:22 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/mission/MissionColumn.jsx | 11 ++++-
zy-acs-flow/src/i18n/en.js | 13 ++++++
zy-acs-flow/src/page/mission/MissionCard.jsx | 26 +++++++++---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java | 2 +
zy-acs-flow/src/i18n/zh.js | 13 ++++++
5 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 127411e..1b47d7c 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -594,6 +594,19 @@
},
},
},
+ mission: {
+ enums: {
+ posType: {
+ MOVE: 'Move',
+ ORI_LOC: 'Pick Loc',
+ ORI_STA: 'Pick Sta',
+ DEST_LOC: 'Drop Loc',
+ DEST_STA: 'Drop Sta',
+ TO_CHARGE: 'Go To Charge',
+ TO_STANDBY: 'Return To Standby',
+ }
+ }
+ },
}
};
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 51c99d2..fe9e5f0 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -593,6 +593,19 @@
},
},
},
+ mission: {
+ enums: {
+ posType: {
+ MOVE: '璧拌',
+ ORI_LOC: '璐ф灦鍙栬揣',
+ ORI_STA: '绔欑偣鍙栬揣',
+ DEST_LOC: '璐ф灦鏀捐揣',
+ DEST_STA: '绔欑偣鏀捐揣',
+ TO_CHARGE: '鍘诲厖鐢�',
+ TO_STANDBY: '鍥炲緟鏈虹偣',
+ }
+ }
+ },
}
};
diff --git a/zy-acs-flow/src/page/mission/MissionCard.jsx b/zy-acs-flow/src/page/mission/MissionCard.jsx
index 45cad08..3bdfed3 100644
--- a/zy-acs-flow/src/page/mission/MissionCard.jsx
+++ b/zy-acs-flow/src/page/mission/MissionCard.jsx
@@ -2,6 +2,7 @@
import { Box, Card, Typography, Avatar, Divider, Stack, Slider } from '@mui/material';
import { ReferenceField, useRedirect } from 'react-admin';
import { blueGrey } from '@mui/material/colors';
+import { styled } from '@mui/material/styles';
export const MissionCard = ({ mission, index }) => {
if (!mission) return null;
@@ -52,18 +53,18 @@
sx={{
width: 30,
height: 30,
- // bgcolor: blueGrey[500],
+ bgcolor: blueGrey[500],
}}
>
{mission.agv}
</Avatar>
<Divider orientation="vertical" flexItem sx={{ margin: '0 8px' }} />
- <Typography variant="h6" noWrap>
+ <Typography variant="body1" noWrap>
{mission.groupNo}
</Typography>
</Box>
- <Box sx={{}}>
- <Stack direction="row" justifyContent="space-between">
+ <Box>
+ <Stack direction="row" justifyContent="space-between" mb={1}>
<Typography variant="caption" color="textSecondary">
Backpack: {mission.backpack}
</Typography>
@@ -71,13 +72,24 @@
Code: {mission.destCode}
</Typography>
</Stack>
- <Stack direction="row" justifyContent="space-between">
+
+ <Stack direction="row" justifyContent="space-between" mb={1}>
<Typography variant="overline">
Task: [{mission.taskNos.join(',')}]
</Typography>
</Stack>
- <Stack direction="row">
- <Slider />
+
+ <Stack pl={1} pr={1} direction="row" spacing={1} alignItems="center">
+ <Slider
+ aria-label="Temperature"
+ defaultValue={mission.progress}
+ getAriaValueText={(value) => {
+ return `${value}掳C`;
+ }}
+ color="secondary"
+ size="small"
+ marks
+ />
</Stack>
</Box>
</Box>
diff --git a/zy-acs-flow/src/page/mission/MissionColumn.jsx b/zy-acs-flow/src/page/mission/MissionColumn.jsx
index 702bafb..7bae8fb 100644
--- a/zy-acs-flow/src/page/mission/MissionColumn.jsx
+++ b/zy-acs-flow/src/page/mission/MissionColumn.jsx
@@ -1,9 +1,12 @@
import { Droppable } from '@hello-pangea/dnd';
import { Box, Stack, Typography } from '@mui/material';
-
+import {
+ useTranslate,
+} from 'react-admin';
import { MissionCard } from './MissionCard';
export const MissionColumn = ({ stage, missions, }) => {
+ const translate = useTranslate();
return (
<Box
@@ -23,8 +26,10 @@
}}
>
<Stack alignItems="center">
- <Typography variant="subtitle1">
- {stage}
+ <Typography variant="body1" sx={{
+ // fontWeight: 'bold'
+ }}>
+ {translate(`page.mission.enums.posType.${stage}`)}
</Typography>
<Typography
variant="subtitle1"
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
index 439cb8f..c0966d8 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
@@ -25,4 +25,6 @@
private String destCode;
+ private String progress = "50";
+
}
--
Gitblit v1.9.1