From 3c32000216972a73cef885933ddb3e5ccc888749 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 13 五月 2025 14:26:13 +0800
Subject: [PATCH] 大屏样式修改，色块个数查询限制为当天
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 6cfe1e4..fc6eada 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -64,17 +64,17 @@
temperingGlassInfoList.value = data.temperingGlassInfoList[0];
if (numBoxes3.value != temperingTaskType.value) {
numBoxes3.value = temperingTaskType.value;
- // initBoxes(boxes3, numBoxes3, 'secondleft');
+ initBoxes(boxes3, numBoxes3, 'secondleft');
}
- if (temperingGlassInfoList.value > 1) {
+ if (temperingGlassInfoList.value >= 1) {
if (numBoxes4.value != 1) {
numBoxes4.value = 1;
- // initBoxes(boxes4, numBoxes4, 'right');
+ initBoxes(boxes4, numBoxes4, 'right');
}
} else {
if (numBoxes4.value != 0) {
numBoxes4.value = 0;
- // initBoxes(boxes4, numBoxes4, 'right');
+ initBoxes(boxes4, numBoxes4, 'right');
}
}
@@ -451,6 +451,22 @@
}
}
+const exportToExcel = async () => {
+ try {
+ window.open('http://192.168.0.39:10011/largenScreen/exportDailyProduction', '_blank');
+ // const response = await request.get('/cacheGlass/largenScreen/exportDailyProduction');
+ // if (response.code == 200) {
+ // ElMessage.success(response.message);
+ // tableDatad.value = response.data;
+ // } else {
+ // ElMessage.error(response.message);
+ // }
+ }
+ catch (error) {
+ console.error(error);
+ }
+}
+
const tableData = ref([]);
const dynamicColumns = ref([]);
const flowCardDetail = async (orderId) => {
@@ -539,10 +555,10 @@
closeWebSocket(socket5);
}
});
-const numBoxes = ref(1);
-const numBoxes2 = ref(1);
-const numBoxes3 = ref(1);
-const numBoxes4 = ref(1);
+const numBoxes = ref(0);
+const numBoxes2 = ref(0);
+const numBoxes3 = ref(0);
+const numBoxes4 = ref(0);
const speed = 0.1;
const delayFrames = 600;
@@ -581,11 +597,11 @@
});
} else {
// 閲嶇疆宸叉湁鐨� box 鏁版嵁
- existing[i].x = 0;
- existing[i].y = 0;
- existing[i].direction = direction;
- existing[i].delay = i * delayFrames;
- existing[i].frameCount = 0;
+ // existing[i].x = 0;
+ // existing[i].y = 0;
+ // existing[i].direction = direction;
+ // existing[i].delay = i * delayFrames;
+ // existing[i].frameCount = 0;
}
}
if (existing.length > count) {
@@ -640,7 +656,13 @@
if (box.frameCount % 2 === 0 && box.el) {
box.el.style.top = `${box.y}px`;
if (box.x > 0) {
- box.el.style.right = `${box.x}px`;
+
+ if(box.direction=="right"){
+ box.el.style.right = `-${box.x}px`;
+
+ }else{
+ box.el.style.right = `${box.x}px`;
+ }
box.el.style.left = '';
} else {
box.el.style.left = `${box.x}px`;
@@ -889,7 +911,7 @@
<div style="width: 50%;">
<div class="img-screen" alt="Screen">
<div>
- <el-button type="primary" style="top:40px;left:670px;position: absolute;" @click="handlehistorical11()">{{
+ <el-button type="primary" style="top:40px;left:670px;position: absolute;" @click="exportToExcel()">{{
$t('large.statistics') }}</el-button>
</div>
<!-- 閽㈠寲鍗婇�忔槑鑹插潡 -->
--
Gitblit v1.8.0