From 3dacfddd0abdfa0ae476cc49fbb2bf6d1094c717 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 三月 2024 12:06:00 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/deviceOperate/rgvOperate.html |   50 +++++++++++---------------------------------------
 1 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index 478fc0c..11086e2 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -125,63 +125,35 @@
 						</div>
 						<div v-else>
 							<el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
-								<el-descriptions-item label="鍫嗗灈鏈�">{{ tableData[currentIndex].crnNo }}
+								<el-descriptions-item label="鍫嗗灈鏈�">{{ tableData[currentIndex].rgvNo }}
 								</el-descriptions-item>
 								<el-descriptions-item label="宸ヤ綔鍙�">
-									{{ tableData[currentIndex].workNo }}
+									{{ tableData[currentIndex].workNo1 }}
 								</el-descriptions-item>
 								<el-descriptions-item label="妯″紡">
 									<el-tag>{{ tableData[currentIndex].statusType }}</el-tag>
 								</el-descriptions-item>
 								<el-descriptions-item label="浠诲姟鐘舵��">
 									<div v-if="tableData[currentIndex].wrkStatus == 0">
-										<el-tag>{{ tableData[currentIndex].wrkStatus$ }}</el-tag>
+										<el-tag>{{ tableData[currentIndex].status}}</el-tag>
 									</div>
 									<div v-else>
 										<el-tag type="success">{{ tableData[currentIndex].wrkStatus$ }}</el-tag>
 									</div>
 								</el-descriptions-item>
 								<el-descriptions-item label="璁惧鐘舵��">
-									<el-tag>{{ tableData[currentIndex].deviceStatus }}</el-tag>
+									<el-tag>{{ tableData[currentIndex].walkPos }}</el-tag>
 								</el-descriptions-item>
 								<el-descriptions-item label="鏈夌墿">
-									<el-tag>{{ tableData[currentIndex].loading }}</el-tag>
-								</el-descriptions-item>
-								<el-descriptions-item label="鍒�">{{ tableData[currentIndex].bay }}
-								</el-descriptions-item>
-								<el-descriptions-item label="灞�">{{ tableData[currentIndex].lev }}
+									<el-tag>{{ tableData[currentIndex].loading1 }}</el-tag>
 								</el-descriptions-item>
 								<el-descriptions-item label="鏁呴殰浠g爜">{{ tableData[currentIndex].warnCode }}
 								</el-descriptions-item>
-								<el-descriptions-item label="鏁呴殰鎻忚堪">{{ tableData[currentIndex].lev }}
+								<el-descriptions-item label="鏁呴殰鎻忚堪">{{ tableData[currentIndex].alarm }}
 								</el-descriptions-item>
 								<el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].sourceStaNo }}
 								</el-descriptions-item>
 								<el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }}
-								</el-descriptions-item>
-								<el-descriptions-item label="婧愬簱浣�">{{ tableData[currentIndex].sourceLocNo }}
-								</el-descriptions-item>
-								<el-descriptions-item label="鐩爣搴撲綅">{{ tableData[currentIndex].locNo }}
-								</el-descriptions-item>
-								<el-descriptions-item label="璐у弶瀹氫綅">{{ tableData[currentIndex].forkOffset }}
-								</el-descriptions-item>
-								<el-descriptions-item label="杞借揣鍙板畾浣�">{{ tableData[currentIndex].liftPos }}
-								</el-descriptions-item>
-								<el-descriptions-item label="璧拌鍦ㄥ畾浣�">{{ tableData[currentIndex].walkPos }}
-								</el-descriptions-item>
-								<el-descriptions-item label="璧拌閫熷害(m/min)">{{ tableData[currentIndex].xspeed }}
-								</el-descriptions-item>
-								<el-descriptions-item label="鍗囬檷閫熷害(m/min)">{{ tableData[currentIndex].yspeed }}
-								</el-descriptions-item>
-								<el-descriptions-item label="鍙夌墮閫熷害(m/min)">{{ tableData[currentIndex].zspeed }}
-								</el-descriptions-item>
-								<el-descriptions-item label="璧拌璺濈(Km)">{{ tableData[currentIndex].xdistance }}
-								</el-descriptions-item>
-								<el-descriptions-item label="鍗囬檷璺濈(Km)">{{ tableData[currentIndex].ydistance }}
-								</el-descriptions-item>
-								<el-descriptions-item label="璧拌鏃堕暱(H)">{{ tableData[currentIndex].xduration }}
-								</el-descriptions-item>
-								<el-descriptions-item label="鍗囬檷鏃堕暱(H)">{{ tableData[currentIndex].yduration }}
 								</el-descriptions-item>
 							</el-descriptions>
 						</div>
@@ -199,7 +171,7 @@
 				currentTitle: "鏈�夋嫨璁惧",
 				currentIndex: null,
 				formParam: {
-					crnNo: null,
+					rgvNo: null,
 					sourceStaNo: null,
 					sourceRow: 1,
 					sourceBay: 0,
@@ -243,8 +215,8 @@
 					const index = this.tableData.indexOf(row)
 					this.currentRow = row;
 					this.currentIndex = index
-					this.currentTitle = row.crnNo + "鍙峰爢鍨涙満"
-					this.formParam.crnNo = row.crnNo
+					this.currentTitle = row.rgvNo + "鍙峰爢鍨涙満"
+					this.formParam.rgvNo = row.rgvNo
 					this.enableIn = row.inEnable == "Y" ? true : false
 					this.enableOut = row.outEnable == "Y" ? true : false
 				},
@@ -301,12 +273,12 @@
 					if (type == "in") {
 						param = {
 							inEnable: this.enableIn ? "Y" : "N",
-							crnNo: this.formParam.crnNo
+							rgvNo: this.formParam.rgvNo
 						}
 					} else {
 						param = {
 							outEnable: this.enableOut ? "Y" : "N",
-							crnNo: this.formParam.crnNo
+							rgvNo: this.formParam.rgvNo
 						}
 					}
 

--
Gitblit v1.9.1