From d41ce9c4703807bf2607a74b8305c1d78aed4ec1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 22 九月 2025 13:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hollowslicecage.vue | 40 +++++++++++++++++-----------------------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index c6d5241..6dded87 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -75,13 +75,13 @@
add.value = true;
};
// 缂虹墖璇︽儏
-const handleMissingFilms = (row) => {
- currentPage2.value = 1;
- const { flowCardId } = row;
- currentLack.flowCardId = row.flowCardId;
- dialogFormVisibleb.value = true;
- fetchFlowBind(flowCardId, currentPage2.value);
-};
+// const handleMissingFilms = (row) => {
+// currentPage2.value = 1;
+// const { flowCardId } = row;
+// currentLack.flowCardId = row.flowCardId;
+// dialogFormVisibleb.value = true;
+// fetchFlowBind(flowCardId, currentPage2.value);
+// };
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
fetchFlowBind(currentLack.flowCardId, currentPage2.value);
@@ -425,8 +425,8 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
const handleMessage = (data) => {
- if(data.bigStorageCageUsageSummary!=null){
- const summaries = data.bigStorageCageUsageSummary[0];
+ if(data.lackDetailsList!=null){
+ const summaries = data.lackDetailsList[0];
const updatedData = summaries.map(summary => ({
...summary,
totalNumber: summary.layer * summary.sumCount,
@@ -886,26 +886,20 @@
<div style="width: 100%; height: 100%; overflow: hidden;">
<el-table
ref="table"
- border
:data="tableDatass"
:header-cell-style="{background:'#F2F3F5', color:'#1D2129'}"
- show-summary
- :summary-method="getSummaries"
max-height="calc(500px - 35px)"
style="width: 100%;"
>
<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="totalNumber" align="center" :label="$t('hellow.totalnumber')" min-width="100" />
- <el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="120" />
- <el-table-column fixed="right" :label="$t('hellow.operate')" align="center">
- <template #default="scope">
- <el-button type="text" plain @click="handleMissingFilms(scope.row)">
- {{ $t('hellow.missingfilms') }}
- </el-button>
- </template>
- </el-table-column>
+ <el-table-column prop="layer" align="center" :label="$t('reportmanage.layer')" min-width="40" />
+ <el-table-column prop="glassType" align="center" :label="$t('large.serialnumber')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80" />
+ <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80" />
+ <el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="80" />
+ <el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80" />
+ <el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80" />
+ <el-table-column prop="damageCount" align="center" :label="$t('large.brokenNum')"/>
</el-table>
</div>
</el-card>
--
Gitblit v1.8.0