From 8fbd5cde54e121b98e9cac4eb2923aa8a315c152 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 三月 2025 16:12:47 +0800
Subject: [PATCH] 添加流程卡进度语言
---
UI-Project/src/views/hollow/hollowslicecage.vue | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index df6d7bc..1d328cd 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -6,7 +6,6 @@
import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {ElMessage, ElMessageBox} from 'element-plus'
-
const dialogFormVisibleaDownGlasss = ref(false)
const scanGlass = ref([])
const {t} = useI18n()
@@ -27,6 +26,7 @@
const tableDataf = ref([])
const tableDatae = ref([])
const carPosition = ref([])
+const tableDatass = ref([])
const ganghua = ref('')
const diaodu = ref('')
const flowCardId = ref('')
@@ -56,6 +56,7 @@
const cell7=ref(true);
const cell8=ref(true);
const cell9=ref(true);
+const blindb = ref(false)
const selectedRow = ref(null);
const temperingengineerId=ref('');
const handlePageChange2 = (newPage) => {
@@ -298,6 +299,11 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
const handleMessage = (data) => {
+ if(data.bigStorageCageUsageSummary!=null){
+ tableDatass.value = data.bigStorageCageUsageSummary[0]
+ }else{
+ tableDatass.value = ''
+ }
if (data.inkageEntity != null) {
inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
}
@@ -570,6 +576,11 @@
left,
};
};
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindb.value = true;
+ iframeUrl.value = `${window.location.origin}/#/hollow/hellowslicecagehistory`;
+};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
});
@@ -623,6 +634,7 @@
<template>
<div style="height: 600px;">
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary" @click="handlexiang">{{ $t('searchOrder.cageinformation') }}</el-button>
+ <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
<div id="dotClass">
<div>{{ $t('searchOrder.inkageEntity') }}</div>
@@ -772,13 +784,13 @@
<el-card style="flex: 1;margin-left: 1020px;margin-top: -670px;" v-loading="loading">
<div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 550px;">
<el-table height="550px" ref="table" border
- :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.totallogarithms')" min-width="120" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.numberpairs')" min-width="120" />
- <el-table-column prop="targetSlot" align="center" :label="$t('hellow.totalnumber')" min-width="120" />
- <el-table-column prop="startSlot" align="center" :label="$t('hellow.realpieces')" min-width="120" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.numberoccupied')" min-width="120" />
+ :data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <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="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>
</div>
</el-card>
@@ -945,6 +957,17 @@
</div>
</div>
</el-dialog>
+ <!-- 鍘嗗彶浠诲姟 -->
+<el-dialog v-model="blindb" top="10vh" width="90%">
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="750px"
+ frameborder="0"
+ ></iframe>
+ </el-dialog>
</template>
<style>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
--
Gitblit v1.8.0