From 1e18d2f1734062a38176e22113f2b65ad8aa2024 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 19 十月 2023 10:11:37 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/commandManage/commandManage.html |   44 +++++++++++++++++++++-----------------------
 1 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/main/webapp/views/commandManage/commandManage.html b/src/main/webapp/views/commandManage/commandManage.html
index b5d5949..81e2487 100644
--- a/src/main/webapp/views/commandManage/commandManage.html
+++ b/src/main/webapp/views/commandManage/commandManage.html
@@ -10,6 +10,11 @@
 		<script type="text/javascript" src="../../static/wcs/js/common.js"></script>
 		<script type="text/javascript" src="../../static/wcs/js/vue.min.js"></script>
 		<script type="text/javascript" src="../../static/wcs/js/element.js"></script>
+		<style>
+			.el-table .success-row {
+				background: #d5ffc0;
+			}
+		</style>
 	</head>
 
 	<body>
@@ -35,18 +40,20 @@
 							<el-button type="primary" @click="resetParam">閲嶇疆</el-button>
 						</el-form-item>
 					</el-form>
-					<el-table ref="singleTable" :data="tableData" style="width: 100%;">
+					<el-table ref="singleTable" :data="tableData" style="width: 100%;" :row-class-name="tableRowClassName">
 						<el-table-column label="鎿嶄綔" width="100">
 							<template slot-scope="scope">
 								<el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
 									<el-button icon="el-icon-more" size="mini" type="primary"></el-button>
 									<el-dropdown-menu slot="dropdown">
 										<el-dropdown-item command="showTask">鏌ョ湅浠诲姟</el-dropdown-item>
+										<el-dropdown-item command="executeCommand">鎵ц鎸囦护</el-dropdown-item>
+										<el-dropdown-item command="completeCommand">瀹屾垚鎸囦护</el-dropdown-item>
 									</el-dropdown-menu>
 								</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>
@@ -66,9 +73,11 @@
 						</el-table-column>
 						<el-table-column show-overflow-tooltip property="startTime$" label="寮�濮嬫椂闂�">
 						</el-table-column>
-						<el-table-column show-overflow-tooltip property="endTime$" label="缁撴潫鏃堕棿">
+						<el-table-column show-overflow-tooltip property="executeTime$" label="鎵ц鏃堕棿">
 						</el-table-column>
-						<el-table-column show-overflow-tooltip property="command" label="鍛戒护鎶ユ枃">
+						<el-table-column show-overflow-tooltip property="completeTime$" label="瀹屾垚鏃堕棿">
+						</el-table-column>
+						<el-table-column show-overflow-tooltip property="command" label="鍛戒护鎶ユ枃" width="250">
 						</el-table-column>
 					</el-table>
 
@@ -98,7 +107,8 @@
 						task_no: null,
 						status: null,
 						wrk_no: null
-					}
+					},
+					commandStep: -1
 				},
 				created() {
 					this.init()
@@ -110,12 +120,14 @@
 					init() {
 						let taskNo = getQueryVariable('taskNo')
 						let wrkNo = getQueryVariable('wrkNo')
+						let commandStep = getQueryVariable('commandStep')
 						if (taskNo != false) {
 							this.tableSearchParam.task_no = taskNo
 						}
 						if (wrkNo != false) {
 							this.tableSearchParam.wrk_no = wrkNo
 						}
+						this.commandStep = parseInt(commandStep)
 
 						this.getTableData()
 					},
@@ -166,26 +178,12 @@
 						}
 						this.getTableData()
 					},
-					handleCommand(command, row) {
-						switch (command) {
-							case "showTask":
-								//鏌ョ湅浠诲姟
-								this.showTask(row)
-								break;
+					tableRowClassName({row, rowIndex}) {
+						if (rowIndex === this.commandStep) {
+							return 'success-row';
 						}
+						return '';
 					},
-					showTask(row) {
-						//鏌ョ湅浠诲姟
-						$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,
-							success: function(layero, index) {}
-						});
-					}
 				}
 			})
 		</script>

--
Gitblit v1.9.1