From 3c4b851a7b5f199c745a4796e6560466aabcc2c2 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 03 十一月 2025 10:56:57 +0800
Subject: [PATCH] 点击确认上片后弹出自定义弹窗，并设置定时关闭功能
---
UI-Project/src/views/Returns/upreturns.vue | 17 ++++++++++++++++-
UI-Project/src/views/Returns/upreturns2.vue | 23 +++++++++++++++++++----
UI-Project/src/lang/en.js | 1 +
UI-Project/src/lang/py.js | 1 +
UI-Project/src/lang/zh.js | 1 +
UI-Project/src/lang/kr.js | 1 +
6 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 20dfcf7..abbd603 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -36,6 +36,7 @@
basicData: {
untask: 'No task',
tonumber: 'Total number of films uploaded',
+ sectionUpperSuccessful:'Upper section operation successful锛�',
finishnumber: 'Completed quantity',
rackreset: 'Rack reset',
prackreset: 'Is the rack reset锛�',
diff --git a/UI-Project/src/lang/kr.js b/UI-Project/src/lang/kr.js
index 6eb2e94..770fcf0 100644
--- a/UI-Project/src/lang/kr.js
+++ b/UI-Project/src/lang/kr.js
@@ -36,6 +36,7 @@
basicData:{
untask:'鞛戩梾 鞐嗢潓',
tonumber:'齑� 鞓來檾 靾�',
+ sectionUpperSuccessful:'靸侂秬 臁办瀾 靹标车锛�',
finishnumber:'鞕勲霅� 靾橂焿',
rackreset:'靿橅攧 鞛劋鞝�',
prackreset:'靿橅攧臧� 鞛劋鞝曤悩電旍 鞐秬锛�',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index ae255c4..125841f 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -36,6 +36,7 @@
basicData: {
untask:'鏃犱换鍔�',
tonumber:'涓婄墖鎬绘暟閲�',
+ sectionUpperSuccessful:'涓婄墖鎿嶄綔鎴愬姛锛�',
finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index c8a4644..a6c60df 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -36,6 +36,7 @@
basicData:{
untask:'鏃犱换鍔�',
tonumber:'涓婄墖鎬绘暟閲�',
+ sectionUpperSuccessful:'涓婄墖鎿嶄綔鎴愬姛锛�',
finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 250acf1..c8219cd 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -185,7 +185,22 @@
state: 1,
})
if (response.code == 200) {
- ElMessage.success(response.message);
+ let timeoutId = setTimeout(() => {
+ // 妯℃嫙鎸変笅纭鎸夐挳
+ const confirmBtn = document.querySelector('.el-message-box__btns .el-button--primary');
+ if (confirmBtn) {
+ confirmBtn.click();
+ }
+ }, 5000)
+ await ElMessageBox.alert(' ', t('basicData.sectionUpperSuccessful'), {
+ confirmButtonText: t('searchOrder.sure'),
+ type: 'success',
+ center: true,
+ customClass: 'center-message-box',
+ });
+ // 娓呴櫎瀹氭椂鍣�
+ clearTimeout(timeoutId);
+ // 鎵ц纭鍚庣殑閫昏緫
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 1229c9b..7ab8d1b 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -248,17 +248,32 @@
// 寮�濮嬩笂鐗�
const handleon = async () => {
let filmRemove = window.localStorage.getItem('filmRemove')
- let engineeringIda = window.localStorage.getItem('engineeringIda')
+ let engineeringId = window.localStorage.getItem('engineeringIda')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
- stationCell: 6,
+ stationCell: 5,
filmRemove: filmRemove,
- engineerId: engineeringIda,
+ engineerId: engineeringId,
state: 1,
})
if (response.code == 200) {
- ElMessage.success(response.message);
+ let timeoutId = setTimeout(() => {
+ // 妯℃嫙鎸変笅纭鎸夐挳
+ const confirmBtn = document.querySelector('.el-message-box__btns .el-button--primary');
+ if (confirmBtn) {
+ confirmBtn.click();
+ }
+ }, 5000)
+ await ElMessageBox.alert(' ', t('basicData.sectionUpperSuccessful'), {
+ confirmButtonText: t('searchOrder.sure'),
+ type: 'success',
+ center: true,
+ customClass: 'center-message-box',
+ });
+ // 娓呴櫎瀹氭椂鍣�
+ clearTimeout(timeoutId);
+ // 鎵ц纭鍚庣殑閫昏緫
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
--
Gitblit v1.8.0