From 9e2e9f912340b806e32593689a408f477e0a1516 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 07 四月 2024 09:49:43 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/device/shuttle/index.jsx | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-flow/src/pages/device/shuttle/index.jsx b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
index eff130e..13a5bb2 100644
--- a/zy-asrs-flow/src/pages/device/shuttle/index.jsx
+++ b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
@@ -130,6 +130,9 @@
>
<div style={{ display: 'flex', flexWrap: 'wrap', justifyContent: 'space-around' }}>
{deviceInfos.map(item => {
+ if(item == null) {
+ return;
+ }
let tmpTitle = item.shuttleNo + "鍙峰洓鍚戣溅"
let tmpData = [
{
@@ -170,7 +173,7 @@
{
key: '8',
label: '鍏呯數鐘舵��',
- children: 'N',
+ children: item.hasCharge ? 'Y' : 'N',
},
{
key: '9',
@@ -187,6 +190,11 @@
label: '杩愯鏂瑰悜',
children: item.runDirection,
},
+ {
+ key: '12',
+ label: '鏄惁鏈夋墭鐩�',
+ children: item.hasPallet ? 'Y' : 'N',
+ },
];
return <div key={item.id} style={{ width: '45%' }}>
<Descriptions size="small" title={tmpTitle} bordered items={tmpData} />
--
Gitblit v1.9.1