From af58489899e11ea5c22b54f663e1f51e45b53bdf Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 十月 2025 16:51:37 +0800
Subject: [PATCH] 1、修改中空关系表查询映射关系
---
UI-Project/src/views/Returns/upreturns.vue | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 610d14a..9b5d3c3 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -18,12 +18,13 @@
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);
const tableDatax = ref([])
const tableDatad = ref([])
-const upstatus = ref(t('basicData.machineaa'));
+const upstatus = ref(t('basicData.machine'));
const cuttingMachineStatusColor = ref('#911005');
const tableDataa = ref<any[]>([]);
const tableDatab = ref<any[]>([]);
@@ -68,8 +69,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 +86,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 +94,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();
@@ -124,11 +126,11 @@
//閫夋嫨宸ョ▼棰勮纭
const handlesure = async () => {
if (!selectedProjectNo.value) {
- ElMessage.error('璇烽�夋嫨宸ョ▼锛�');
+ ElMessage.error(t('basicData.plselectproject'))
return
}
if (!filmRemove.value) {
- ElMessage.error('璇烽�夋嫨闄よ啘鏂瑰紡锛�');
+ ElMessage.error(t('Mounting.removalmethod'))
return
}
try {
@@ -405,11 +407,11 @@
function getStatusText2(filmRemove) {
switch (filmRemove) {
case 0:
- return t('Mounting.noremoval');
+ return t('Mounting.noremoval');//涓嶉櫎鑶�
// case 1:
// return t('Mounting.coarselyground');
case 2:
- return t('Mounting.removal');
+ return t('Mounting.removal');//闄よ啘
}
}
</script>
@@ -459,6 +461,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' }"
@@ -472,6 +475,7 @@
<el-table-column align="center" :label="$t('Mounting.state')" min-width="80" prop="state">
<template #default="scope">
<el-tag :type="scope.row.state === 100 ? 'success' : 'warning'" @click="toggleEnableState(scope.row)">
+ <!-- 绛夊緟涓細0 閫氳繃锛�100 -->
{{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
</el-tag>
</template>
@@ -479,10 +483,11 @@
</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;">
- <img src="../../assets/shangpianji.png" alt=""
+ <img src="/shangpianji.png" alt=""
style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 3%;">
<el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="700"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
@@ -578,6 +583,7 @@
<el-form-item :label="$t('Mounting.removalmethoda')" :required="true">
<el-select v-model="filmRemove" clearable :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
+ <!-- 涓嶉櫎鑶滐細0 闄よ啘锛�2 -->
<!-- <el-option :label="$t('Mounting.coarselyground')" value="1"></el-option> -->
<el-option :label="$t('Mounting.removal')" value="2"></el-option>
</el-select>
@@ -642,4 +648,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