From d55b5b015eef8c31d9dea6587dc6fd0e02818cd1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 31 十月 2025 08:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns.vue | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 624cb88..250acf1 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -18,6 +18,7 @@
const blindb = ref(false)
const blindbd = ref(false)
const ReportData = ref(true);
+const isLoading = ref(true);
const canSelectProjecta = ref(true);
const canSelectProjectb = ref(true);
const canSelectProjectc = ref(false);
@@ -36,6 +37,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
@@ -59,6 +73,7 @@
};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ selectGong()
});
onUnmounted(() => {
if (socket) {
@@ -68,8 +83,7 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassOne`;
const handleMessage = (data: any) => {
- console.log(data.stationList);
-
+ isLoading.value = true;
if (data.inkageState != null) {
cuttingMachineStatusColor.value = data.inkageState[0] === 1 ? 'green' : '#911005';
}
@@ -86,6 +100,7 @@
tableDataa.value = []
}
if (data.upPattenUsages.length != 0) {
+ isLoading.value = false;
tableData.value = data.upPattenUsages[0]
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
@@ -93,12 +108,13 @@
canSelectProjectc.value = true;
}
else {
+ isLoading.value = false;
canSelectProjecta.value = true;
canSelectProjectb.value = true;
canSelectProjectc.value = false;
tableData.value = [];
window.localStorage.setItem('engineeringIda', '')
- }
+ }
};
onBeforeUnmount(() => {
closeWebSocket();
@@ -201,6 +217,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);
}
@@ -459,6 +479,7 @@
</el-select>
<el-button :disabled="!ReportData" type="primary" style="margin-left: 10px;" @click="selectReportData()">{{
$t('Mounting.setparameters') }}</el-button>
+ <div v-loading="isLoading" class="loading-container" :element-loading-text="$t('searchOrder.loadingText')" >
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="400" ref="table" :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }"
@@ -480,6 +501,7 @@
</el-table>
</div>
</el-card>
+ </div>
<div style="display: flex;margin-left:5%">
<div style="width: 55%;float: left;margin-left: 300px;">
<div style="display: flex;">
@@ -644,4 +666,12 @@
margin-top: 20px;
margin-bottom: 10px;
}
+.loading-container {
+ position: relative;
+ height: 100%;
+}
+/* 纭繚閬僵灞傚湪鏈�椤跺眰 */
+.el-loading-mask {
+ z-index: 2000 !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0