From 83f738105416c9b11e3b7c5246a0980e41b6650e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 十月 2025 16:59:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns2.vue | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 7cf671e..5ae91af 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -15,6 +15,7 @@
const dialogFormVisible = ref(false)
const blind = ref(false)
const blinda = ref(false)
+const isLoading = ref(true);
const ReportData = ref(true);
const blindb = ref(false)
const blindbd = ref(false)
@@ -73,6 +74,8 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassTwo`;
const handleMessage = (data: any) => {
+ isLoading.value = true;
+
if (data.stationList.length != 0) {
const processedData = [...data.stationList[0]];
if (processedData.length > 0) {
@@ -89,6 +92,7 @@
cuttingMachineStatusColor.value = data.inkageState[0] === 1 ? 'green' : '#911005';
}
if (data.upPattenUsages.length != 0) {
+ isLoading.value = false;
tableData.value = data.upPattenUsages[0]
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
@@ -96,6 +100,7 @@
canSelectProjectc.value = true;
}
else {
+ isLoading.value = false;
tableData.value = [];
canSelectProjecta.value = true;
canSelectProjectb.value = true;
@@ -453,6 +458,7 @@
<el-option :label="$t('Mounting.pass')" value="100"></el-option>
</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
@@ -486,6 +492,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;">
@@ -645,4 +652,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