From e0dabde622e384c2dc5849f65acab82d0b8a0adb Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期三, 16 十月 2024 14:43:51 +0800
Subject: [PATCH] 新增堆垛机封装类
---
WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue b/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue
index 007219d..ced7068 100644
--- a/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue
+++ b/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue
@@ -52,16 +52,21 @@
></el-step>
</el-steps>
</div>
- <el-row height="50">
- <el-col :span="12">
- <div class="grid-content content-text">
+ <el-row height="50" v-show="previousShow || nextShow">
+ <el-col :span="8">
+ <div v-show="previousShow" class="grid-content content-text">
<el-button type="danger" @click="previous"
>鍥炴粴鍒颁笂涓�姝�</el-button
>
</div>
</el-col>
- <el-col :span="12">
- <div class="grid-content content-text">
+ <el-col :span="8">
+ <div v-show="recoveryShow" class="grid-content content-text">
+ <el-button type="primary" @click="recovery">浠诲姟鎸傝捣鎭㈠</el-button>
+ </div>
+ </el-col>
+ <el-col :span="8">
+ <div v-show="nextShow" class="grid-content content-text">
<el-button type="warning" @click="next">璺宠浆鍒颁笅涓�姝�</el-button>
</div>
</el-col>
@@ -74,15 +79,21 @@
:row-class-name="tableRowClassName"
>
<el-table-column type="index" width="50"> </el-table-column>
- <el-table-column prop="taskNum" label="浠诲姟鍙�" width="120">
+ <el-table-column prop="taskNum" label="浠诲姟鍙�" width="90">
</el-table-column>
- <el-table-column prop="taskState" label="浠诲姟鐘舵��" width="120">
+ <el-table-column prop="taskState" label="浠诲姟鐘舵��" width="90">
+ </el-table-column>
+ <el-table-column prop="currentAddress" label="褰撳墠浣嶇疆" width="90">
+ </el-table-column>
+ <el-table-column prop="nextAddress" label="涓嬩竴浣嶇疆" width="90">
</el-table-column>
<el-table-column prop="isManual" label="鏄惁浜哄伐鎿嶄綔" width="120">
</el-table-column>
- <el-table-column prop="isNormal" label="鏄惁姝ｅ父" width="120">
+ <el-table-column prop="isNormal" label="鏄惁姝ｅ父" width="90">
</el-table-column>
<el-table-column prop="description" label="鎻忚堪"> </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" width="180">
+ </el-table-column>
<el-table-column prop="remark" label="澶囨敞" width="180">
</el-table-column>
</el-table>
@@ -105,6 +116,9 @@
viewType: 1,
height: "200px",
tableData: [],
+ previousShow: false,
+ nextShow: false,
+ recoveryShow: true,
};
},
methods: {
@@ -116,6 +130,14 @@
} else {
this.getDetailDatas();
}
+
+ this.$emit("parentCall", ($vue) => {
+ var previousButton = $vue.buttons.find((x) => x.value == "Previous");
+ this.previousShow = previousButton != null;
+
+ var nextButton = $vue.buttons.find((x) => x.value == "Next");
+ this.nextShow = nextButton != null;
+ });
},
getSteps() {
this.http
@@ -155,6 +177,19 @@
this.getSteps();
});
},
+ recovery(){
+ this.http
+ .post(
+ "/api/Task/TaskStatusRecovery?taskNum=" + this.row.taskNum,
+ {},
+ true
+ )
+ .then((x) => {
+ if (!x.status) return this.$message.error(x.message);
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.getSteps();
+ });
+ },
next() {
this.http
.post(
@@ -178,7 +213,8 @@
}
},
tableRowClassName({ row, rowIndex }) {
- if (row.isNormal) {
+ if (!row.isNormal) {
+ return "error-row";
} else if (row.isManual) {
return "warning-row";
}
@@ -210,7 +246,7 @@
</style>
<style>
.el-table .warning-row {
- background: #e6a23c;
+ background: #fcf1e2;
}
.el-table .success-row {
@@ -218,6 +254,6 @@
}
.el-table .error-row {
- background: #f56c6c;
+ background: #fde2e2;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3