From 5d0f7a5aa4ee994782f3f3bcc66e23653a6ac40a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 19 七月 2024 10:07:46 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/deviceOperate/rgvOperate.html |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index b57746d..8c3d4a9 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -64,7 +64,8 @@
 								<el-form-item label="鍚姩">
 									<el-button @click="initiateD(1)" type="warning">鍙栬揣</el-button>
 									<el-button @click="initiateD(2)" type="warning">鏀捐揣</el-button>
-									<el-button @click="initiateD(3)" type="warning">XY绉诲姩</el-button>
+									<el-button @click="initiateD(3)" type="warning">X绉诲姩</el-button>
+									<el-button @click="initiateD(4)" type="warning">鎼繍</el-button>
 								</el-form-item>
 							</el-form>
 						</div>
@@ -76,10 +77,6 @@
 							<el-button v-if="rgvMode === 1 " type="warning">鎵嬪姩</el-button>
 						</div>
 						<div  v-if="demo === 'N' ">
-							<div style="margin: 10px auto 10px auto">
-								<el-button v-if="demo === 'N' " @click="demos('true')" type="info">婕旂ず</el-button>
-								<el-button v-if="demo === 'Y' " @click="demos('false')" type="info">鍙栨秷婕旂ず</el-button>
-							</div>
 							<div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
 								<el-button v-if="rgvMode !== 3 " @click="rgvStatus(15)" type="primary">鑱旀満</el-button>
 								<el-button v-if="rgvMode !== 2 " @click="rgvStatus(14)" type="primary">鍗曟満</el-button>
@@ -93,11 +90,19 @@
 							<div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
 								<el-button @click="rgvStatus(7)" type="warning">鎶ヨ娑堥煶</el-button>
 								<el-button v-if="rgvMode === 1 " @click="rgvStatus(13)" type="warning">鎵嬪姩瀹氫綅</el-button>
+								<el-button v-if="rgvMode === 3 " @click="rgvStatus(17)" type="warning">鎭㈠鑱旀満浠诲姟</el-button>
 							</div>
 							<div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
 								<el-button :style="" @click="rgvStatus(5)" type="danger">寮哄埗鍚姩</el-button>
 								<el-button @click="rgvStatus(10)" type="danger">鎬ュ仠</el-button>
 								<el-button @click="rgvStatus(16)" type="danger">璐у弶瀹氫綅鍥炰腑</el-button>
+								<el-button @click="rgvStatus(18)" type="danger">娓呴櫎浠诲姟</el-button>
+							</div>
+						</div>
+						<div>
+							<div style="margin: 10px auto 10px auto">
+								<el-button v-if="demo === 'N' " @click="demos('true')" type="info">婕旂ず</el-button>
+								<el-button v-if="demo === 'Y' " @click="demos('false')" type="info">鍙栨秷婕旂ず</el-button>
 							</div>
 							<div style="margin-top: 5px" v-if="demo === 'Y'">
 								<el-button  @click="staTova(2,1)" type="warning">杈撻��-缃崲1</el-button>
@@ -186,7 +191,7 @@
 					emptyContainer:null
 				},
 				formParamD: {
-					rgvNo: null,
+					rgvNo: 1,
 					sourceStaNo: null,
 					sourceRow: 1,
 					sourceBay: 0,
@@ -345,6 +350,8 @@
 						urlS = "/rgv/operator/single/step/two/put";
 					}else if (method === 3){
 						urlS = "/rgv/operator/single/step/three/put";
+					}else if (method === 4){
+						urlS = "/rgv/operator/single/step/four/put";
 					}
 					let that = this
 					that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
@@ -357,7 +364,7 @@
 							headers: {
 								'token': localStorage.getItem('token')
 							},
-							data: this.formParam,
+							data: this.formParamD,
 							method: 'POST',
 							success: function (res) {
 								if (res.code == 200) {

--
Gitblit v1.9.1