From 53cf72e8cc6c1cfa600ca5c4c31507e360eedd81 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 25 三月 2024 13:29:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 11 +++--------
src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java | 4 ++++
src/main/webapp/views/deviceOperate/rgvOperate.html | 7 ++-----
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 0e53b0a..8a28213 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -168,17 +168,12 @@
vo.setStatusType(rgvProtocol.modeType.desc); // 妯″紡鐘舵��
vo.setStatus(rgvProtocol.getStatusType().desc); // 鐘舵��
vo.setWorkNo1(rgvProtocol.getTaskNo1()); // 宸ヤ綅1浠诲姟鍙�
-// vo.setStatus1(rgvProtocol.getStatusType1().desc); // 宸ヤ綅1鐘舵��
-// vo.setLoading1(rgvProtocol.getLoaded1()==1?"鏈夌墿":"鏃犵墿"); // 宸ヤ綅1鏈夌墿
vo.setRgvPos(rgvProtocol.getRgvPos());
-// vo.setRgvPos1(rgvProtocol.getRgvPosI());
-// vo.setWalkPos(rgvProtocol.getWalkPos()==1?"鍦ㄥ畾浣�":"涓嶅湪瀹氫綅");
vo.setPakMk(rgvThread.isPakMk()?"鏃犻攣":"閿佸畾");
-// vo.setWorkNo2(rgvProtocol.getTaskNo2()); // 宸ヤ綅2浠诲姟鍙�
-// vo.setStatus2(rgvProtocol.getStatusType2().desc); // 宸ヤ綅2鐘舵��
-// vo.setLoading2(rgvProtocol.getLoaded2()==1?"鏈夌墿":"鏃犵墿"); // 宸ヤ綅2鏈夌墿
-
+ vo.setWalkPos(rgvProtocol.getAlarm() == 0?"姝ｅ父":"鎶ヨ");
vo.setWarnCode(String.valueOf(rgvProtocol.getAlarm()));
+ vo.setStaNo(rgvProtocol.getSouSta().intValue());
+ vo.setSourceStaNo(rgvProtocol.getEndSta().intValue());
if (rgvProtocol.getAlarm() > 0) {
BasRgvErr rgvErr = basRgvErrMapper.selectById(rgvProtocol.getAlarm());
vo.setAlarm(rgvErr==null?"鏈煡寮傚父":rgvErr.getErrName());
diff --git a/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
index 127d51d..6da98a3 100644
--- a/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
@@ -43,6 +43,10 @@
//寮傚父
private String warnCode;
+ //婧愮珯
+ private Integer staNo;
+ //鐩爣绔�
+ private Integer sourceStaNo;
// 寮傚父鐮佹弿杩�
private String alarm = "-";
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index 3d95020..646013c 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -94,16 +94,13 @@
<el-descriptions-item label="璁惧鐘舵��">
<el-tag>{{ tableData[currentIndex].walkPos }}</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鏈夌墿">
- <el-tag>{{ tableData[currentIndex].loading1 }}</el-tag>
- </el-descriptions-item>
<el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].warnCode }}
</el-descriptions-item>
<el-descriptions-item label="鏁呴殰鎻忚堪">{{ tableData[currentIndex].alarm }}
</el-descriptions-item>
- <el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].sourceStaNo }}
+ <el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].staNo }}
</el-descriptions-item>
- <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }}
+ <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].sourceStaNo }}
</el-descriptions-item>
</el-descriptions>
</div>
--
Gitblit v1.9.1