From f74b51190a77c560949abd4628c5f33cd7e734ac Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 14 九月 2024 08:22:50 +0800
Subject: [PATCH] 设备交互结构模板，设备常用前端接口
---
UI-Project/src/views/Marking/marking.vue | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/UI-Project/src/views/Marking/marking.vue b/UI-Project/src/views/Marking/marking.vue
index 8b76033..b561b18 100644
--- a/UI-Project/src/views/Marking/marking.vue
+++ b/UI-Project/src/views/Marking/marking.vue
@@ -18,12 +18,9 @@
//鑾峰彇鏁版嵁
const load = async() => {
try {
- const response = await request.post('/deviceInteraction/tasking/findCraftTasking',
+ const response = await request.post('/deviceInteraction/tasking/findMachineTask',
{
- "glassId": 0,
- "state": "绾夸笂",
- "workState": "宸ヤ綔",
- "currentCraft": "鎵撶（"
+ "id": 11
}); // 鏇挎崲涓轰綘鐨凙PI绔偣
if (response.code === 200) {
findCraftTaskingData.value= response.data;
@@ -34,8 +31,18 @@
// console.error('Error fetching rects :', error);
}
}
-//淇敼宸ヤ綔鐘舵�� 銆愬け璐�/宸ヤ綔/瀹屾垚銆�
+//淇敼宸ヤ綔鐘舵�� 銆愬け璐�/姝ｅ湪宸ヤ綔/瀹屽伐銆�
const workStatus = async(row,state) => {
+ let url;
+ if(state=="澶辫触"){
+ url="/deviceInteraction/tasking/loseMachineTask";
+ }else if(state=="姝ｅ湪宸ヤ綔"){
+ url="/deviceInteraction/tasking/startMachineTask";
+ }else if(state=="瀹屽伐"){
+ url="/deviceInteraction/tasking/finishMachineTask";
+ }else{
+ return;
+ }
ElMessageBox.confirm(
t('marking.tips'),
t('delivery.prompt'),
@@ -47,10 +54,9 @@
)
.then(() => {
//寮�濮嬩慨鏀�
- request.post("/deviceInteraction/tasking/updateCraftTasking",
+ request.post(url,
{
- "glassId": row.glassId,
- "workState": state
+ "id": 11
}).then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
if (res.code === 200) {
ElMessage.success(res.message);
@@ -73,7 +79,10 @@
const machineStatus = async(row,state) => {
}
+//鐮存崯
+const damagedTask = async(row) => {
+}
//涓嬬嚎(鎷胯蛋)
const downLine = async(row,state) => {
ElMessageBox.confirm(
@@ -144,8 +153,9 @@
<el-table-column prop="workState" label="鐘舵��" />
<el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
<template #default="scope">
- <el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '鐮存崯')">鐮存崯</el-button>
+ <el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '澶辫触')">閲嶅彂</el-button>
<el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '瀹屽伐')">瀹屽伐</el-button>
+ <el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '鐮存崯')">鐮存崯</el-button>
<el-button size="mini" link type="primary" plain @click="downLine(scope.row, '涓嬬嚎')">涓嬬嚎</el-button>
</template>
</el-table-column>
--
Gitblit v1.8.0