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/crnOperate.html |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index f606a22..8406daf 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -18,6 +18,8 @@
 				max-height="350" style="width: 100%">
 				<el-table-column property="crnNo" label="鍫嗗灈鏈�">
 				</el-table-column>
+				<el-table-column property="laneNo" label="宸烽亾鍙�">
+				</el-table-column>
 				<el-table-column property="workNo" label="宸ヤ綔鍙�">
 				</el-table-column>
 				<el-table-column property="statusType" label="妯″紡">
@@ -25,6 +27,8 @@
 				<el-table-column property="wrkStatus$" label="浠诲姟鐘舵��">
 				</el-table-column>
 				<el-table-column property="deviceStatus" label="璁惧鐘舵��">
+				</el-table-column>
+				<el-table-column property="errorCrn" label="寮傚父鎻愮ず">
 				</el-table-column>
 			</el-table>
 		</div>
@@ -73,24 +77,24 @@
 							</el-form-item>
 						</el-form>
 						<div>
-							<el-button @click="requestOperate('put')" type="primary">鍏ュ簱</el-button>
-							<el-button @click="requestOperate('take')" type="primary">鍑哄簱</el-button>
-							<el-button @click="requestOperate('stockMove')" type="primary">搴撲綅杞Щ</el-button>
-							<el-button @click="requestOperate('siteMove')" type="primary">绔欏埌绔�</el-button>
-							<el-button @click="requestOperate('taskComplete')" type="primary">浠诲姟瀹屾垚</el-button>
-							<el-button @click="requestOperate('clearCommand')" type="primary">娓呴櫎鍛戒护</el-button>
-							<el-button @click="requestOperate('reset')" type="primary">澶嶄綅</el-button>
+<!--							<el-button @click="requestOperate('put')" type="primary">鍏ュ簱</el-button>-->
+<!--							<el-button @click="requestOperate('take')" type="primary">鍑哄簱</el-button>-->
+<!--							<el-button @click="requestOperate('stockMove')" type="primary">搴撲綅杞Щ</el-button>-->
+<!--							<el-button @click="requestOperate('siteMove')" type="primary">绔欏埌绔�</el-button>-->
+<!--							<el-button @click="requestOperate('taskComplete')" type="primary">浠诲姟瀹屾垚</el-button>-->
+<!--							<el-button @click="requestOperate('clearCommand')" type="primary">娓呴櫎鍛戒护</el-button>-->
+<!--							<el-button @click="requestOperate('reset')" type="primary">澶嶄綅</el-button>-->
 							<br/>
 							<br/>
-							<el-button @click="requestOperate('auto')" type="warning">鑱旀満</el-button>
-							<el-button @click="requestOperate('semiAutomatic')" type="warning">鍗婅嚜鍔�</el-button>
-							<el-button @click="requestOperate('hand')" type="warning">鎵嬪姩</el-button>
-							<el-button @click="requestOperate('onlineWrk4')" type="warning">鎭㈠鑱旀満浠诲姟</el-button>
-							<el-button @click="requestOperate('onlineWrk3')" type="warning">娓呴櫎鑱旀満浠诲姟</el-button>
-							<el-button @click="requestOperate('onlineWrk1')" type="warning">鐢宠瀹屾垚浠诲姟</el-button>
+<!--							<el-button @click="requestOperate('auto')" type="warning">鑱旀満</el-button>-->
+<!--							<el-button @click="requestOperate('semiAutomatic')" type="warning">鍗婅嚜鍔�</el-button>-->
+<!--							<el-button @click="requestOperate('hand')" type="warning">鎵嬪姩</el-button>-->
+<!--							<el-button @click="requestOperate('onlineWrk4')" type="warning">鎭㈠鑱旀満浠诲姟</el-button>-->
+<!--							<el-button @click="requestOperate('onlineWrk3')" type="warning">娓呴櫎鑱旀満浠诲姟</el-button>-->
+<!--							<el-button @click="requestOperate('onlineWrk1')" type="warning">鐢宠瀹屾垚浠诲姟</el-button>-->
 							<br/>
 							<br/>
-							<el-button @click="requestOperate('onlineWrk2')" type="warning">鐢宠鍙栨秷浠诲姟</el-button>
+<!--							<el-button @click="requestOperate('onlineWrk2')" type="warning">鐢宠鍙栨秷浠诲姟</el-button>-->
 						</div>
 					</div>
 				</el-card>
@@ -164,6 +168,8 @@
 								</el-descriptions-item>
 								<el-descriptions-item label="鍗囬檷鏃堕暱(H)">{{ tableData[currentIndex].yduration }}
 								</el-descriptions-item>
+								<el-descriptions-item label="寮傚父鎻愮ず">{{ tableData[currentIndex].errorCrn }}
+								</el-descriptions-item>
 							</el-descriptions>
 						</div>
 					</div>

--
Gitblit v1.9.1