From 85e341d7aaf755f74ac89e9bdaa5f2acdc00f2b5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 三月 2025 15:18:57 +0800
Subject: [PATCH] 修改磨边色块数据源，大屏表格字段名
---
UI-Project/src/views/hollow/hollowslicecage.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 122c8a6..f62845b 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -300,9 +300,14 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
const handleMessage = (data) => {
if(data.bigStorageCageUsageSummary!=null){
- tableDatass.value = data.bigStorageCageUsageSummary[0]
+ const summaries = data.bigStorageCageUsageSummary[0];
+ const updatedData = summaries.map(summary => ({
+ ...summary,
+ totalNumber: summary.layer * summary.sumCount,
+ }));
+ tableDatass.value = updatedData;
}else{
- tableDatass.value = ''
+ tableDatass.value = []
}
if (data.inkageEntity != null) {
inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
@@ -330,8 +335,8 @@
console.log(data.bigStorageCageDetailsOutTask[0])
adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
} else {
- tableDatac.value = '',
- adjusta.value = ''
+ tableDatac.value = [],
+ adjusta.value = []
}
if (data.scanGlass != null) {
scanGlass.value = data.scanGlass[0];
@@ -346,25 +351,25 @@
tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
adjust.value = data.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
}else{
- tableDatad.value = ''
+ tableDatad.value = []
}
if(data.temperingGlassInfoList!=null){
tableDatab.value = data.temperingGlassInfoList[0]
console.log(tableDatab.value)
}else{
- tableDatab.value = ''
+ tableDatab.value = []
}
console.log(data.bigStorageCageUsage);
if(data.bigStorageCageUsage!=null){
tableDatae.value = data.bigStorageCageUsage[0]
}else{
- tableDatae.value = ''
+ tableDatae.value = []
}
if(data.carPostion!=null){
carPosition.value = data.carPostion[0]
}else{
- carPosition.value = ''
+ carPosition.value = []
}
if(data.temperingSwitch!=null){
ganghua.value = data.temperingSwitch[0]
@@ -788,7 +793,7 @@
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
<el-table-column prop="sumCount" align="center" :label="$t('searchOrder.totallogarithms')" min-width="120" />
<el-table-column prop="pairCount" align="center" :label="$t('searchOrder.numberpairs')" min-width="120" />
- <el-table-column prop="sumCount" align="center" :label="$t('hellow.totalnumber')" min-width="120" />
+ <el-table-column prop="totalNumber" align="center" :label="$t('hellow.totalnumber')" min-width="120" />
<el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="120" />
<el-table-column prop="slotCount" align="center" :label="$t('searchOrder.numberoccupied')" min-width="120" />
</el-table>
@@ -958,7 +963,7 @@
</div>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="90%">
+<el-dialog v-model="blindb" top="5vh" width="95%">
<iframe
:src="iframeUrl"
marginwidth="2000px"
--
Gitblit v1.8.0