From 2453a589a623b2448a8cc940d8dce3da6698c50c Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 05 二月 2024 14:15:49 +0800
Subject: [PATCH] 获取设备列表、切换设备列表、开始生产接口和逻辑修改、结束任务联调、工艺信息联调、切换任务联调
---
src/views/dashboard/components/TaskControlModal.vue | 70 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/src/views/dashboard/components/TaskControlModal.vue b/src/views/dashboard/components/TaskControlModal.vue
index 6b7355d..c4c6db6 100644
--- a/src/views/dashboard/components/TaskControlModal.vue
+++ b/src/views/dashboard/components/TaskControlModal.vue
@@ -7,7 +7,7 @@
<div class="modal-content">
<template v-if="['鍒濆鍖�', '璁℃椂涓�', '鍑嗗鐢熶骇', '涓嬪彂鍙傛暟涓�'].includes(state.value as string)">
<div class="content-title">
- <div class="content-title-item">褰撳墠浠诲姟锛歿{ task?.Procedure.procedure.procedureName || '' }}</div>
+ <div class="content-title-item">褰撳墠浠诲姟锛歿{ task?.Procedure?.procedure?.procedureName || '' }}</div>
<div class="content-title-item">
鐢熶骇鏁伴噺锛�
<div class="leaf-shape">
@@ -26,11 +26,11 @@
<div class="info-item">浜у搧鍚嶇О锛歿{ task.Order.productName || '' }}</div>
<div class="info-item">鏁伴噺锛歿{ task.Order.amount || 0 }}{{ task.Order.unit }}</div>
<div class="info-item">浜よ揣鏃ユ湡锛歿{ task.Order.deliverDate || '' }}</div>
- <div class="info-item">宸ユ椂锛� {{ task.Procedure.procedure.workHours || '' }}</div>
+ <div class="info-item">宸ユ椂锛� {{ task?.Procedure?.procedure?.workHours || '' }}</div>
<div class="info-item">
- 璁″垝鏃堕棿锛� {{ formatDate(task.Procedure.startTime) || '' }}
+ 璁″垝鏃堕棿锛� {{ formatDate(task?.Procedure?.startTime) || '' }}
-
- {{ formatDate(task.Procedure.endTime) }}
+ {{ formatDate(task?.Procedure?.endTime) }}
</div>
<div class="info-item">瀹㈡埛鍚嶇О锛歿{ task.Order.customer || '' }}</div>
@@ -157,7 +157,7 @@
import { ref, toRefs, watch } from 'vue'
import BigButton from '@/views/dashboard/components/BigButton.vue'
import { CHANNEL_NAME_MAP } from '@/common/constants'
-import { getCraftParams, sendProcessParams } from '@/api'
+import { procedureUpdate, sendProcessParams } from '@/api'
import { useCountDown } from '@/common/composable'
import { storeToRefs } from 'pinia'
import { useTasksStore } from '@/stores/tasks'
@@ -210,18 +210,6 @@
if (taskId) {
craftParams.value = []
getCraftParamsTip.value = ''
-
- getCraftParams({ id: taskId }).then(
- (res) => {
- craftParams.value = res.data.Params ?? []
- getCraftParamsTip.value = ''
- },
- (err) => {
- console.error(err)
- craftParams.value = []
- getCraftParamsTip.value = '鑾峰彇宸ヨ壓鍙傛暟澶辫触锛�'
- }
- )
}
}
@@ -341,22 +329,38 @@
function startProduce() {
send('寮�濮嬬敓浜�')
- sendProcessParams({
- procedureId: task!.value!.Procedure.ID
- })
- .then(
- (res) => {
- deliveryTip.value = '涓嬪彂鎴愬姛'
- send('鎴愬姛')
- countdown3s.startCountdown()
- },
- (err) => {
- console.error(err)
- deliveryTip.value = err.msg ? err.msg : '鎶辨瓑锛屽伐搴忎笅鍙戝け璐ワ紒'
- send('澶辫触')
- }
- )
- .finally(() => {})
+ procedureUpdate({
+ isFinish: false,
+ isProcessing: true,
+ workOrderProcedureID: Number(task!.value!.Procedure.ID)
+ }).then(
+ (res) => {
+ deliveryTip.value = '涓嬪彂鎴愬姛'
+ send('鎴愬姛')
+ countdown3s.startCountdown()
+ },
+ (err) => {
+ console.error(err)
+ deliveryTip.value = err.msg ? err.msg : '鎶辨瓑锛屽伐搴忎笅鍙戝け璐ワ紒'
+ send('澶辫触')
+ }
+ )
+ // sendProcessParams({
+ // procedureId: task!.value!.Procedure.ID
+ // })
+ // .then(
+ // (res) => {
+ // deliveryTip.value = '涓嬪彂鎴愬姛'
+ // send('鎴愬姛')
+ // countdown3s.startCountdown()
+ // },
+ // (err) => {
+ // console.error(err)
+ // deliveryTip.value = err.msg ? err.msg : '鎶辨瓑锛屽伐搴忎笅鍙戝け璐ワ紒'
+ // send('澶辫触')
+ // }
+ // )
+ // .finally(() => {})
}
/**
--
Gitblit v1.8.0