From da30bfc3795305f0bbd400d196bcf4c30612c37f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 10 十二月 2025 17:01:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Returns/upreturns.vue | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 9b5d3c3..1209c8b 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -3,7 +3,6 @@
import { useRouter } from "vue-router"
import { ElMessage, ElMessageBox } from 'element-plus'
import { useI18n } from 'vue-i18n'
-import { host, WebSocketHost } from '@/utils/constants'
import request from "@/utils/request"
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
const router = useRouter()
@@ -37,6 +36,19 @@
const titleSelectJson = ref({
engineerId: [],
})
+const selectGong = async () => {
+ try {
+ const response = await request.post('/loadGlass/loadglassdevicetaskhistory/queryAllMessage',{
+ redisRequest: 'loadGlassRequestOne',
+ stationCell: 5,
+ tableName: 'LOAD_GLASS_DEVICE_ONE_TASK',
+ webSocketName: 'loadGlassOne'
+});
+ if (response.code == 200) {
+ }
+ } catch (error) {
+ }
+};
request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
state: null,
stationCell: 5
@@ -60,6 +72,7 @@
};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ selectGong()
});
onUnmounted(() => {
if (socket) {
@@ -67,7 +80,7 @@
}
});
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassOne`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/loadGlass/api/talk/loadGlassOne`;
const handleMessage = (data: any) => {
isLoading.value = true;
if (data.inkageState != null) {
@@ -171,7 +184,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;
@@ -203,6 +231,10 @@
if (response.code == 200) {
ElMessage.success(response.message);
blinda.value = false;
+ canSelectProjecta.value = true;
+ canSelectProjectb.value = true;
+ canSelectProjectc.value = false;
+ tableData.value = response.data;
} else {
ElMessage.error(response.message);
}
--
Gitblit v1.8.0