From 2407125f702cf5d73f5a225133a5f790feb5f5fe Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 12 十二月 2023 16:14:00 +0800
Subject: [PATCH] 从开始生产到收到报功的点击时间限制至少1分钟间隔和文案修改
---
src/views/dashboard/components/DeviceStatusInfo.vue | 2 +-
src/views/dashboard/components/TaskControl.vue | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/views/dashboard/components/DeviceStatusInfo.vue b/src/views/dashboard/components/DeviceStatusInfo.vue
index 6e8461d..c66539b 100644
--- a/src/views/dashboard/components/DeviceStatusInfo.vue
+++ b/src/views/dashboard/components/DeviceStatusInfo.vue
@@ -48,7 +48,7 @@
</template>
<template v-else>
- <span>涓嶅湪闆嗙兢涓�</span>
+ <span>鏈姞鍏ラ泦缇�</span>
</template>
</span>
</span>
diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index fc7f199..cb9d2e2 100644
--- a/src/views/dashboard/components/TaskControl.vue
+++ b/src/views/dashboard/components/TaskControl.vue
@@ -157,6 +157,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
}
--
Gitblit v1.8.0