From fc1577100f0225220d7b08f33150e5c262758d74 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 四月 2024 15:33:35 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/components/BoolValueIcon.jsx | 21 +++++++
zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx | 104 ++++++++++++++--------------------
2 files changed, 65 insertions(+), 60 deletions(-)
diff --git a/zy-asrs-flow/src/components/BoolValueIcon.jsx b/zy-asrs-flow/src/components/BoolValueIcon.jsx
new file mode 100644
index 0000000..bd93850
--- /dev/null
+++ b/zy-asrs-flow/src/components/BoolValueIcon.jsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { CheckOutlined, StopOutlined, MinusOutlined } from '@ant-design/icons';
+
+const BoolValueIcon = ({ value }) => {
+ let icon;
+ if (value === undefined || value === null) {
+ icon = <MinusOutlined style={{ color: '#34495e', fontSize: '1.2em', fontWeight: 'bold' }} />;
+ } else if (value) {
+ icon = <CheckOutlined style={{ color: '#2980b9', fontSize: '1.2em', fontWeight: 'bold' }} />;
+ } else {
+ icon = <StopOutlined style={{ color: '#c0392b', fontSize: '1.2em', fontWeight: 'bold' }} />;
+ }
+
+ return (
+ <div style={{ display: 'flex', justifyContent: 'center' }}>
+ {icon}
+ </div>
+ );
+};
+
+export default BoolValueIcon;
\ No newline at end of file
diff --git a/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx b/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx
index 36903e6..11332b5 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx
@@ -4,6 +4,7 @@
import { createStyles } from 'antd-style';
import * as Utils from '../../utils'
import Http from '@/utils/http';
+import BoolValueIcon from '@/components/BoolValueIcon';
const useStyles = createStyles(({ token, css }) => {
return {
@@ -69,94 +70,77 @@
items={
[
{
- key: '1',
label: intl.formatMessage({ id: 'map.shuttle.no', defaultMessage: '绌挎杞︾紪鍙�' }),
children: info?.shuttleNo,
},
{
- key: '1',
label: intl.formatMessage({ id: 'map.task.no', defaultMessage: '浠诲姟鍙�' }),
children: info?.taskNo,
},
{
- key: '1',
label: intl.formatMessage({ id: 'map.device.status', defaultMessage: '璁惧鐘舵��' }),
- children: info?.status,
+ children: <Badge status="processing" text={info?.status} />,
},
{
- key: '1',
- label: intl.formatMessage({ id: 'map.origin.loc', defaultMessage: '璧峰搴撲綅' }),
- children: info?.originLocNo,
- },
- {
- key: '1',
- label: intl.formatMessage({ id: 'map.dest.loc', defaultMessage: '鐩爣搴撲綅' }),
- children: info?.destLocNo,
- },
- {
- key: '1',
label: intl.formatMessage({ id: 'map.shuttle.current.code', defaultMessage: '瀹氫綅鏉＄爜' }),
children: info?.currentCode,
},
{
- key: '1',
- label: intl.formatMessage({ id: 'map.shuttle.batter.power', defaultMessage: '鐢垫睜鐢甸噺' }),
- children: info?.batteryPower,
- },
- {
- key: '1',
- label: intl.formatMessage({ id: 'map.shuttle.batter.voltage', defaultMessage: '鐢垫睜鐢靛帇' }),
- children: info?.batteryVoltage,
- },
- {
- key: '1',
- label: intl.formatMessage({ id: 'map.shuttle.batter.temp', defaultMessage: '鐢垫睜娓╁害' }),
- children: info?.batteryTemp,
- },
- {
- key: '1',
- label: intl.formatMessage({ id: 'map.shuttle.has.lift', defaultMessage: '椤跺崌淇″彿' }),
- children: info?.hasLift,
- },
- {
- key: '1',
- label: intl.formatMessage({ id: 'map.shuttle.has.pallet', defaultMessage: '鎵樼洏淇″彿' }),
- children: info?.hasPallet,
- },
- {
- key: '1',
- label: intl.formatMessage({ id: 'map.shuttle.has.charge', defaultMessage: '鍏呯數淇″彿' }),
- children: info?.hasCharge,
- },
- {
- key: '1',
- label: intl.formatMessage({ id: 'map.error', defaultMessage: '寮傚父淇″彿' }),
- children: info?.errorCode,
- },
- {
- key: '1',
- label: intl.formatMessage({ id: 'map.pakmk', defaultMessage: '浣滀笟鏍囪' }),
- children: info?.pakMk,
- },
- {
- key: '1',
label: intl.formatMessage({ id: 'map.loc.no', defaultMessage: '搴撲綅鍙�' }),
children: <Badge status="processing" text="Running" />,
},
{
- key: '2',
label: intl.formatMessage({ id: 'map.pallet.barcode', defaultMessage: '鎵樼洏鏉＄爜' }),
children: '80000010',
},
{
- key: '3',
+ label: intl.formatMessage({ id: 'map.origin.loc', defaultMessage: '璧峰搴撲綅' }),
+ children: info?.originLocNo,
+ },
+ {
+ label: intl.formatMessage({ id: 'map.dest.loc', defaultMessage: '鐩爣搴撲綅' }),
+ children: info?.destLocNo,
+ },
+
+ {
+ label: intl.formatMessage({ id: 'map.shuttle.batter.power', defaultMessage: '鐢垫睜鐢甸噺' }),
+ children: info?.batteryPower,
+ },
+ {
+ label: intl.formatMessage({ id: 'map.shuttle.batter.voltage', defaultMessage: '鐢垫睜鐢靛帇' }),
+ children: info?.batteryVoltage,
+ },
+ {
+ label: intl.formatMessage({ id: 'map.shuttle.batter.temp', defaultMessage: '鐢垫睜娓╁害' }),
+ children: info?.batteryTemp,
+ },
+ {
+ label: intl.formatMessage({ id: 'map.error', defaultMessage: '寮傚父淇″彿' }),
+ children: info?.errorCode,
+ },
+ {
+ label: intl.formatMessage({ id: 'map.shuttle.has.lift', defaultMessage: '椤跺崌淇″彿' }),
+ children: <BoolValueIcon value={info?.hasLift} />,
+ },
+ {
+ label: intl.formatMessage({ id: 'map.shuttle.has.pallet', defaultMessage: '鎵樼洏淇″彿' }),
+ children: <BoolValueIcon value={info?.hasPallet} />,
+ },
+ {
+ label: intl.formatMessage({ id: 'map.shuttle.has.charge', defaultMessage: '鍏呯數淇″彿' }),
+ children: <BoolValueIcon value={info?.hasCharge} />,
+ },
+ {
+ label: intl.formatMessage({ id: 'map.pakmk', defaultMessage: '浣滀笟鏍囪' }),
+ children: <BoolValueIcon value={info?.pakMk} />,
+ },
+ {
label: intl.formatMessage({ id: 'map.is.enable', defaultMessage: '鏄惁鍚敤' }),
- span: 2,
children: 'Disabled',
},
{
- key: '4',
label: intl.formatMessage({ id: 'map.loc.operation', defaultMessage: '搴撲綅鎿嶄綔' }),
+ span: 3,
children: (
<>
<Button className={styles.tableButton} size='default' type="primary" danger>
--
Gitblit v1.9.1