From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
src/main/webapp/views/commandManage/commandManage.html | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/commandManage/commandManage.html b/src/main/webapp/views/commandManage/commandManage.html
index fe8ee81..539c90c 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>
@@ -178,6 +178,12 @@
}
this.getTableData()
},
+ tableRowClassName({row, rowIndex}) {
+ if (rowIndex === this.commandStep) {
+ return 'success-row';
+ }
+ return '';
+ },
handleCommand(command, row) {
switch (command) {
case "showTask":
@@ -195,22 +201,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 +273,7 @@
}
}
});
- }
+ },
}
})
</script>
--
Gitblit v1.9.1