From 77ec4c2a6f2a39968ad947cb731a99afe2bac611 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 10 四月 2025 14:52:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 7169291..f57c2f4 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -429,15 +429,16 @@
iframeUrl10.value = `${window.location.origin}/#/largescreendisplay/statistics`;
};
const transposedData = computed(() => {
- const keys = Object.keys(productionVO.value[0] || {});
+ const keys = Object.keys(fieldNames); // 鎸� fieldNames 鐨勯『搴�
return keys.map(key => {
const row = { name: fieldNames[key] || key };
productionVO.value.forEach((item, index) => {
- row[`value${index}`] = item[key];
+ row[`value${index}`] = item[key] ?? ''; // 澶勭悊鍙兘涓嶅瓨鍦ㄧ殑閿�
});
return row;
});
});
+
const fieldNames = {
date: t('large.date'),
countOutOne: t('large.countOutOne'),
@@ -457,43 +458,43 @@
</script>
<template>
<div style="height: 500px;">
- <el-dialog v-model="iframe1" top="10vh" width="95%">
+ <el-dialog v-model="iframe1" top="5vh" width="95%" @close="iframeUrl1=''">
<iframe :src="iframeUrl1" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
frameborder="0"></iframe>
</el-dialog>
- <el-dialog v-model="iframe2" top="10vh" width="95%">
+ <el-dialog v-model="iframe2" top="5vh" width="95%" @close="iframeUrl2=''">
<iframe :src="iframeUrl2" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
frameborder="0"></iframe>
</el-dialog>
- <el-dialog v-model="iframe3" top="10vh" width="95%">
+ <el-dialog v-model="iframe3" top="5vh" width="95%" @close="iframeUrl3=''">
<iframe :src="iframeUrl3" marginwidth="2000px" marginheight="2000px" width="100%" height="700"
frameborder="0"></iframe>
</el-dialog>
- <el-dialog v-model="iframe4" top="10vh" width="95%">
+ <el-dialog v-model="iframe4" top="5vh" width="95%" @close="iframeUrl4=''">
<iframe :src="iframeUrl4" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
- <el-dialog v-model="iframe5" top="10vh" width="95%">
+ <el-dialog v-model="iframe5" top="5vh" width="95%" @close="iframeUrl5=''">
<iframe :src="iframeUrl5" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
- <el-dialog v-model="iframe6" top="10vh" width="95%">
+ <el-dialog v-model="iframe6" top="5vh" width="95%" @close="iframeUrl6=''">
<iframe :src="iframeUrl6" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
- <el-dialog v-model="iframe7" top="10vh" width="95%">
+ <el-dialog v-model="iframe7" top="5vh" width="95%" @close="iframeUrl7=''">
<iframe :src="iframeUrl7" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
- <el-dialog v-model="iframe8" top="10vh" width="95%">
+ <el-dialog v-model="iframe8" top="5vh" width="95%" @close="iframeUrl8=''">
<iframe :src="iframeUrl8" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
- <el-dialog v-model="iframe9" top="10vh" width="95%">
+ <el-dialog v-model="iframe9" top="5vh" width="95%" @close="iframeUrl9=''">
<iframe :src="iframeUrl9" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
- <el-dialog v-model="iframe10" top="10vh" width="95%">
+ <el-dialog v-model="iframe10" top="5vh" width="95%" @close="iframeUrl10=''">
<iframe :src="iframeUrl10" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
@@ -512,6 +513,9 @@
@click="handlehistorical1">{{
$t('large.historicaltasks1') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
+ @click="blindc=true">{{
+ $t('large.order') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
@click="handlehistorical2">{{
$t('large.historicaltasks2') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
@@ -524,20 +528,17 @@
@click="handlehistorical5">{{
$t('large.historicaltasks5') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
- @click="handlehistorical6">{{
- $t('large.historicaltasks6') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
@click="handlehistorical7">{{
$t('large.historicaltasks7') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
@click="handlehistorical8">{{
$t('large.historicaltasks8') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
+ @click="handlehistorical6">{{
+ $t('large.historicaltasks6') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
@click="handlehistorical9">{{
$t('large.historicaltasks9') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
- @click="blindc=true">{{
- $t('large.order') }}</el-button>
</div>
</div>
<div class="img-screen" alt="Screen">
@@ -630,7 +631,7 @@
</div>
</div>
</div>
- <el-dialog v-model="blindc" top="10vh" width="90%">
+ <el-dialog v-model="blindc" top="5vh" width="90%">
<el-table height="700" ref="table" :data="orderDTOS"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="orderId" align="center" :label="$t('large.orderId')" min-width="50" />
--
Gitblit v1.8.0