From 0069b25d77cf2dd36b030fa4c86d4f3738f552e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 13 五月 2025 08:44:37 +0800
Subject: [PATCH] 跑库测试程序

---
 src/main/webapp/views/commandManage/commandManage.html |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/views/commandManage/commandManage.html b/src/main/webapp/views/commandManage/commandManage.html
index fe8ee81..a95fb72 100644
--- a/src/main/webapp/views/commandManage/commandManage.html
+++ b/src/main/webapp/views/commandManage/commandManage.html
@@ -53,7 +53,7 @@
 								</el-dropdown>
 							</template>
 						</el-table-column>
-						<el-table-column property="id" label="鎸囦护缂栧彿">
+						<el-table-column property="id" label="#ID">
 						</el-table-column>
 						<el-table-column property="wrkNo" label="宸ヤ綔鍙�">
 						</el-table-column>
@@ -63,7 +63,7 @@
 						</el-table-column>
 						<el-table-column show-overflow-tooltip property="durationTime" label="鎸佺画鏃堕暱">
 						</el-table-column>
-						<el-table-column property="commandType" label="鎸囦护绫诲瀷">
+						<el-table-column property="commandType$" label="鎸囦护绫诲瀷">
 						</el-table-column>
 						<el-table-column property="device" label="璁惧">
 						</el-table-column>
@@ -106,7 +106,10 @@
 					tableSearchParam: {
 						task_no: null,
 						status: null,
-						wrk_no: null
+						wrk_no: null,
+						barcode: null,
+						start_point: null,
+						target_point : null
 					},
 					commandStep: -1
 				},
@@ -178,6 +181,12 @@
 						}
 						this.getTableData()
 					},
+					tableRowClassName({row, rowIndex}) {
+						if (rowIndex === this.commandStep) {
+							return 'success-row';
+						}
+						return '';
+					},
 					handleCommand(command, row) {
 						switch (command) {
 							case "showTask":
@@ -195,22 +204,18 @@
 						}
 					},
 					showTask(row) {
-						//鏌ョ湅浠诲姟
+						let wrkNo = row.wrkNo == null ? "" : row.wrkNo
+						console.log(wrkNo)
+						//鏌ョ湅鎸囦护
 						$layui.layer.open({
 							type: 2,
 							title: '浠诲姟绠$悊',
 							maxmin: true,
 							area: [top.detailWidth, top.detailHeight],
 							shadeClose: true,
-							content: '../taskWrk/taskWrk.html?taskNo=' + row.taskNo + "&wrkNo=" + row.wrkNo,
+							content: '../taskWrk/taskWrk.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
 							success: function(layero, index) {}
 						});
-					},
-					tableRowClassName({row, rowIndex}) {
-						if (rowIndex === this.commandStep) {
-							return 'success-row';
-						}
-						return '';
 					},
 					executeCommand(row) {
 						//鎵ц鎸囦护
@@ -271,7 +276,7 @@
 								}
 							}
 						});
-					}
+					},
 				}
 			})
 		</script>

--
Gitblit v1.9.1