From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/largescreen/largescreen.vue | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index 93f75d8..43b4e09 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -1,6 +1,6 @@
<template>
<div style="height: 500px;">
- <el-card style="flex: 1;margin-left: 1px;margin-top: 10px;margin-right: 1px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 1px;margin-top: 10px;margin-right: 1px;" >
<el-scrollbar height="800px">
<div style="font-size: 20px;font-weight: bold;">{{ $t('large.loading') }}{{ temperingtotal }}</div>
<div id="top" style="height: 150px;display: flex; justify-content: center; align-items: center;">
@@ -56,7 +56,7 @@
<el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="100" />
<el-table-column fixed="right" :label="$t('large.operate')" align="center" width="100">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleBinda(scope.row)">{{ $t('large.mes') }}</el-button>
+ <el-button type="text" plain @click="handleBinda(scope.row)">{{ $t('large.mes') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -75,7 +75,7 @@
<el-table-column prop="width" align="center" :label="$t('large.width')" min-width="100" />
<el-table-column prop="height" align="center" :label="$t('large.height')" min-width="100" />
<el-table-column prop="area" align="center" :label="$t('large.are')" min-width="100" />
- <el-table-column prop="quantity" align="center" :label="$t('large.number')" min-width="110" />
+ <el-table-column prop="quantity" align="center" :label="$t('large.tionnumber')" min-width="110" />
<el-table-column prop="numberPatches" align="center" :label="$t('large.numberpatches')" min-width="110" />
<el-table-column prop="receivedQuantity" align="center" :label="$t('large.innumber')" min-width="110" />
<el-table-column prop="terminationStatus" align="center" :label="$t('large.productstatus')" min-width="110" />
@@ -169,7 +169,6 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableData.value = response.data;
- console.log(tableData.value);
} else {
ElMessage.error(response.message);
}
@@ -187,7 +186,7 @@
case 2:
return 'success';
}
-}
+}
function getStatusText(warehousing) {
switch (warehousing) {
case 0:
@@ -381,7 +380,6 @@
}
});
onBeforeUnmount(() => {
-console.log("鍏抽棴浜�")
closeWebSocket();
closeWebSocket2();
closeWebSocket3();
--
Gitblit v1.8.0