From c1ef2d1fc4c0dae2bc8452924dcd77a0ff3a1ef5 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 15:02:52 +0800
Subject: [PATCH] #改造

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

diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index 6eeaa92..fe04738 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -28,7 +28,9 @@
 				</el-table-column>
 				<el-table-column property="rgvPosDestination" label="鐩爣瀹氫綅缃�">
 				</el-table-column>
-				<el-table-column property="loaded" label="鏈夌墿">
+				<el-table-column property="loaded" label="鎺㈢墿">
+				</el-table-column>
+				<el-table-column property="errorRgv" label="鎻愮ず">
 				</el-table-column>
 			</el-table>
 		</div>
@@ -41,20 +43,23 @@
 					</div>
 					<div>
 						<el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
-							<el-form-item label="宸ヤ綔鍙�">
-								<el-input v-model="formParam.taskNo" placeholder="宸ヤ綔鍙�"></el-input>
-							</el-form-item>
 							<el-form-item label="鐩爣瀹氫綅缃�">
 								<el-input v-model="formParam.rgvPosDestination" placeholder="鐩爣瀹氫綅缃�"></el-input>
 							</el-form-item>
+							<el-form-item label="鍙栬揣绔欑偣">
+								<el-input v-model="formParam.rgvStaNoTake" placeholder="鐩爣绔欑偣"></el-input>
+							</el-form-item>
 							<el-form-item label="鐩爣绔欑偣">
-								<el-input v-model="formParam.rgvStaNo" placeholder="鐩爣绔欑偣"></el-input>
+								<el-input v-model="formParam.rgvStaNoPut" placeholder="鐩爣绔欑偣"></el-input>
 							</el-form-item>
 						</el-form>
 						<div>
 							<el-button @click="requestOperate('take')" type="primary">鍙栬揣</el-button>
 							<el-button @click="requestOperate('put')" type="primary">鏀捐揣</el-button>
+							<el-button @click="requestOperate('TakeAndPut')" type="primary">鍙栨斁璐�</el-button>
 							<el-button @click="requestOperate('walk')" type="warning">琛岃蛋</el-button>
+							<el-button @click="requestOperate('del')" type="warning">浠诲姟娓呯┖</el-button>
+							<el-button @click="requestOperate('delRgvTask')" type="warning">灏忚溅寮哄埗澶嶄綅锛堣繍琛屾椂涓嶈鎿嶄綔,闇�瑕侀厤鍚堟寜閽級</el-button>
 						</div>
 					</div>
 				</el-card>
@@ -62,7 +67,7 @@
 			<div style="width: 45%;">
 				<el-card class="box-card">
 					<div slot="header" class="clearfix">
-						<span>璁惧鐘舵��</span>
+						<span>璁惧褰撳墠浠诲姟</span>
 					</div>
 					<div>
 						<div v-if="currentIndex == null">
@@ -81,7 +86,7 @@
 								</el-table-column>
 								<el-table-column property="targetPosition" label="鐩爣瀹氫綅缃�">
 								</el-table-column>
-								<el-table-column property="direction" label="鏀惧悜">
+								<el-table-column property="direction" label="鏂瑰悜">
 								</el-table-column>
 							</el-table>
 						</div>
@@ -101,8 +106,8 @@
 				currentIndex: null,
 				formParam: {
 					rgvNo: 0,
-					taskNo: 0,
-					rgvStaNo: 0,
+					rgvStaNoTake: 0,
+					rgvStaNoPut: 0,
 					rgvPosDestination: 0
 				}
 			},
@@ -127,8 +132,8 @@
 					this.currentTitle = row.rgvNo + "灏忚溅"
 					
 					this.formParam.rgvNo = row.rgvNo
-					this.formParam.taskNo = row.taskNo
-					this.formParam.rgvStaNo = row.rgvStaNo
+					this.formParam.rgvStaNoTake = row.rgvStaNoTake
+					this.formParam.rgvStaNoPut = row.rgvStaNoPut
 					this.formParam.rgvPosDestination = row.rgvPosDestination
 
 					this.getTaskAllData(index+1)

--
Gitblit v1.9.1