From 7edf66cafb871c5fb28911dfb02611ef5c9910b2 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 06 二月 2024 17:05:49 +0800
Subject: [PATCH] 登录请求接口取消、设备切换图标和弹窗关闭按钮增大
---
src/views/dashboard/components/TaskControl.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index fc7f199..ea82cb1 100644
--- a/src/views/dashboard/components/TaskControl.vue
+++ b/src/views/dashboard/components/TaskControl.vue
@@ -59,7 +59,7 @@
import { useDateFormat } from '@vueuse/core'
import TaskControlModal from '@/views/dashboard/components/TaskControlModal.vue'
import { CircleCloseFilled } from '@element-plus/icons-vue'
-import { apiReportWork, finishTask } from '@/api'
+import { apiReportWork, procedureUpdate } from '@/api'
import { ElMessage } from 'element-plus'
import ReportProductionModal from '@/views/dashboard/components/ReportProductionModal.vue'
import { usePLCStore } from '@/stores/plc'
@@ -103,7 +103,11 @@
return true
}
}
- finishTask({ id: task!.value.Procedure.ID }).then(
+ procedureUpdate({
+ isFinish: true,
+ isProcessing: false,
+ workOrderProcedureID: Number(task!.value.Procedure.ID)
+ }).then(
(res) => {
ElMessage({
message: '鎿嶄綔鎴愬姛锛�',
@@ -157,6 +161,23 @@
})
return true
}
+ // 浠庡紑濮嬬敓浜у埌鎶ュ伐鐨勭偣鍑绘椂闂翠笉鑳藉皬浜�1鍒嗛挓
+ if (task?.value && task.value?.Procedure?.realStartTime) {
+ let realStartTime = task.value?.Procedure?.realStartTime
+ if (realStartTime) {
+ realStartTime = realStartTime * 1000
+ let time = Date.now()
+ let differ = Math.abs(time - realStartTime) / 1000
+ if (differ < 60) {
+ ElMessage({
+ message: '宸ュ簭鍒堕�犳椂闂村お鐭紝璇锋鏌ワ紒',
+ type: 'warning'
+ })
+ return true
+ }
+ }
+ }
+
if (workers.value[0].workerId) {
showReportModal.value = true
}
@@ -173,9 +194,10 @@
// 鏈変汉鍛樻墠鍙互鎶ュ伐
if (workers.value[0].workerId) {
apiReportWork({
- procedureId: task.value?.Procedure.ID,
+ workOrderProcedureID: Number(task.value?.Procedure.ID),
reportAmount: amount,
- workerID: workers.value[0].workerId
+ workerID: workers.value[0].workerId,
+ workerName: workers.value[0].workerName
})
.then((res) => {
if (res.code === 200) {
--
Gitblit v1.8.0