From 2e05d43a7da078224a40e6620544969799504a9f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 10 三月 2025 16:48:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Slicecage/slicecage.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 9f4da0c..2927c05 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -35,6 +35,7 @@
const tableDatae = ref([])
const tableDatax = ref([])
const tableDatas = ref([])
+const tableDatass = ref([])
const tableDatalack = ref([])
const tableDataspecify = ref([])
const tableDatacagedetails = ref([])
@@ -779,6 +780,11 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
const handleMessage = (data) => {
+ if(data.bigStorageSummary!=null){
+ tableDatass.value = data.bigStorageSummary[0]
+ }else{
+ tableDatass.value = ''
+ }
if (data.inkageEntity != null) {
inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
}
@@ -1238,15 +1244,14 @@
<el-card style="flex: 1;margin-left: 1220px;margin-top: -510px;" v-loading="loading">
<div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 420px;">
<el-table height="420px" ref="table" border
- :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" align="center" :label="$t('Mounting.project')" min-width="140" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.totalfurnaces')" min-width="120" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.cagesnumber')" min-width="120" />
- <el-table-column prop="targetSlot" align="center" :label="$t('large.are')" min-width="120" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.fullfurnaces')" min-width="120" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="120" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.progress')" min-width="120" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.temperingpriority')" min-width="120" />
+ :data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="engineerId" align="center" :label="$t('Mounting.project')" min-width="140" />
+ <el-table-column prop="countTemp" align="center" :label="$t('searchOrder.totalfurnaces')" min-width="120" />
+ <el-table-column prop="countGlass" align="center" :label="$t('searchOrder.cagesnumber')" min-width="120" />
+ <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="120" />
+ <el-table-column prop="fullTemp" align="center" :label="$t('searchOrder.fullfurnaces')" min-width="120" />
+ <el-table-column prop="countSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="120" />
+ <el-table-column prop="percent" align="center" :label="$t('searchOrder.progress')" min-width="120" />
</el-table>
</div>
</el-card>
--
Gitblit v1.8.0