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 | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 101 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/views/commandManage/commandManage.html b/src/main/webapp/views/commandManage/commandManage.html
index b5d5949..a95fb72 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>
@@ -56,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>
@@ -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>
@@ -97,8 +106,12 @@
tableSearchParam: {
task_no: null,
status: null,
- wrk_no: null
- }
+ wrk_no: null,
+ barcode: null,
+ start_point: null,
+ target_point : null
+ },
+ commandStep: -1
},
created() {
this.init()
@@ -110,12 +123,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 +181,102 @@
}
this.getTableData()
},
+ tableRowClassName({row, rowIndex}) {
+ if (rowIndex === this.commandStep) {
+ return 'success-row';
+ }
+ return '';
+ },
handleCommand(command, row) {
switch (command) {
case "showTask":
//鏌ョ湅浠诲姟
this.showTask(row)
break;
+ case "executeCommand":
+ //鎵ц鎸囦护
+ this.executeCommand(row)
+ break;
+ case "completeCommand":
+ //瀹屾垚鎸囦护
+ this.completeCommand(row)
+ break;
}
},
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) {}
});
- }
+ },
+ executeCommand(row) {
+ //鎵ц鎸囦护
+ let that = this
+ $.ajax({
+ url: baseUrl + "/commandInfo/executeCommand",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ id: row.id
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "鎵ц鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
+ completeCommand(row) {
+ //瀹屾垚鎸囦护
+ let that = this
+ $.ajax({
+ url: baseUrl + "/commandInfo/completeCommand",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ id: row.id
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "瀹屾垚鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
}
})
</script>
--
Gitblit v1.9.1