From 2c08bfb96d6523dfbf5ae543e94495c151aadbf1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 三月 2025 17:53:18 +0800
Subject: [PATCH] 大屏嵌入历史任务，生产统计显示
---
UI-Project/src/views/Returns/upreturns2.vue | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 441f232..07a1c36 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -17,7 +17,7 @@
const blinda = ref(false)
const ReportData = ref(true);
const blindb = ref(false)
-const dialoglea = ref(false)
+const blindbd = ref(false)
const canSelectProjecta = ref(true);
const canSelectProjectb = ref(true);
const canSelectProjectc = ref(false);
@@ -73,11 +73,17 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
- tableDataa.value = data.list[0].slice(2, 4);
if (data.list!=null) {
- tableDataa.value = data.list[0].slice(2, 4);
+ const processedData = [...data.list[0].slice(2, 4)];
+ if (processedData.length > 0) {
+ processedData[0] = { ...processedData[0], workstationId: 1 };
+ }
+ if (processedData.length > 1) {
+ processedData[1] = { ...processedData[1], workstationId: 2 };
+ }
+ tableDataa.value = processedData;
}else {
- tableDataa.value = ''
+ tableDataa.value = []
}
if (data.LoadTwoervice != null) {
cuttingMachineStatusColor.value = data.LoadTwoervice[0] == 1 ? 'green' : '#911005';
@@ -379,6 +385,12 @@
console.error('鍙戠敓閿欒:', error);
}
};
+// 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindbd.value = true;
+ iframeUrl.value = `${window.location.origin}/#/Returns/upreturnhistory`;
+};
function getStatusType2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -423,6 +435,7 @@
<el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
style="margin-top: 5px;margin-left: 20px;">
<el-option :label="$t('Mounting.all')" value="0"></el-option>
@@ -488,6 +501,17 @@
</div>
</div>
</div>
+ <!-- 鍘嗗彶浠诲姟 -->
+ <el-dialog v-model="blindbd" top="10vh" width="95%">
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="700px"
+ frameborder="0"
+ ></iframe>
+ </el-dialog>
<el-dialog v-model="blind" top="30vh" width="25%" :title="$t('basicData.startfilm')">
<template #footer>
<div id="dialog-footer">
--
Gitblit v1.8.0