From ed01c3b91928b1b375e43451db995d4950e20072 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 10 三月 2025 16:48:30 +0800
Subject: [PATCH] 修改大屏动画
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 108 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 85 insertions(+), 23 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 30649eb..72773a2 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -47,6 +47,7 @@
let socket2 = null;
const temperingTaskType = ref([])
const temperingGlassInfoList = ref([])
+const temperingGlassInfoOutList = ref([])
const socketUrl2 = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/largenScreen`;
const handleMessage2 = (data) => {
temperingTaskType.value = data.temperingTaskType[0];
@@ -55,7 +56,25 @@
numBoxes3.value =temperingTaskType.value;
boxStart3();
}
-
+ temperingGlassInfoOutList.value = data.temperingGlassInfoOutList[0];
+ if(numBoxes4.value !=temperingGlassInfoOutList.value){
+ numBoxes4.value =temperingGlassInfoOutList.value;
+ boxStart3();
+ }
+};
+
+let socket3 = null;
+const bigStorageCageUsage = ref([])
+const socketUrl3 = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/largenScreen`;
+const handleMessage3 = (data) => {
+ bigStorageCageUsage.value = data.bigStorageCageUsage[0];
+};
+
+let socket4 = null;
+const hollowBigStorageCageUsage = ref([])
+const socketUrl4 = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/largenScreen`;
+const handleMessage4 = (data) => {
+ hollowBigStorageCageUsage.value = data.hollowBigStorageCageUsage[0];
};
@@ -81,22 +100,6 @@
films: ''
})
-// const tableDatac = ref([]);
-// const patternUsage = async () => {
-// try {
-// const response = await request.post('/glassStorage/rawGlassStorageDetails/patternUsage?width=' + ptnusage.value.width + '&height=' + ptnusage.value.height + '&thickness=' + ptnusage.value.thickness + '&films=' + ptnusage.value.films);
-// if (response.code == 200) {
-// ElMessage.success(response.message);
-// tableDatad.value = response.data;
-// } else {
-// ElMessage.error(response.message);
-// }
-// }
-// catch (error) {
-// console.error(error);
-// }
-// }
-
// 鐐瑰嚮涓嬫柟寮圭獥
const handlehistorical = (row) => {
@@ -108,10 +111,13 @@
boxStart();
boxStart2();
boxStart3();
+ boxStart4();
requestAnimationFrame(animate);
socket = initializeWebSocket(socketUrl, handleMessage);
socket1 = initializeWebSocket(socketUrl1, handleMessage1);
socket2 = initializeWebSocket(socketUrl2, handleMessage2);
+ socket3 = initializeWebSocket(socketUrl3, handleMessage3);
+ socket4 = initializeWebSocket(socketUrl4, handleMessage4);
const endTime = dayjs().startOf('minute'); // 褰撳墠鏃堕棿锛岀簿纭埌鍒嗛挓
const startTime = endTime.subtract(1, 'day').startOf('minute'); // 褰撳墠鏃堕棿鐨勫墠涓�澶╋紝绮剧‘鍒板垎閽�
// 璁剧疆鏃堕棿鑼冨洿涓� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]
@@ -125,6 +131,8 @@
closeWebSocket(socket);
closeWebSocket(socket1);
closeWebSocket(socket2);
+ closeWebSocket(socket3);
+ closeWebSocket(socket4);
}
});
onBeforeUnmount(() => {
@@ -134,7 +142,8 @@
const numBoxes = ref(5);
const numBoxes2 = ref(5);
-const numBoxes3 = ref(5); // 鍙姩鎬佷慨鏀圭殑 div 鏁伴噺
+const numBoxes3 = ref(5);
+const numBoxes4 = ref(1);
const speed = 0.1;
const maxX = 200; // 缁堢偣X鍧愭爣
const maxY = -73; // 缁堢偣Y鍧愭爣
@@ -142,11 +151,14 @@
const maxY2 = -165; // 缁堢偣Y鍧愭爣
const maxX3 = 100; // 缁堢偣X鍧愭爣
const maxY3 = -75; // 缁堢偣Y鍧愭爣
+const maxX4 = 60; // 缁堢偣X鍧愭爣
+const maxY4 = 0; // 缁堢偣Y鍧愭爣
const delayFrames = 600; // 姣忎釜 div 鐨勫欢杩熷抚鏁�
const boxes = ref([]);
const boxes2 = ref([]);
const boxes3 = ref([]);
+const boxes4 = ref([]);
// 鍒濆鍖� div 鏁版嵁
const boxStart = () => {
@@ -205,6 +217,24 @@
}
}
+const boxStart4 = () => {
+ boxes4.value = [];
+ for (let i = 0; i < numBoxes4.value; i++) {
+ boxes4.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'right',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? 'red' : 'blue',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+}
+}
const animate = () => {
@@ -287,6 +317,27 @@
transform: `translate(${box.x}px, ${box.y}px)`
};
});
+
+ boxes4.value.forEach((box) => {
+ if (box.delay > 0) {
+ box.delay--;
+ return;
+ }
+
+ if (box.direction === 'right') {
+ box.x += speed;
+ if (box.x >= maxX4) {
+ // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
+ box.x = 0;
+ box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
+ }
+ }
+ box.style = {
+ ...box.style,
+ transform: `translate(${box.x}px, ${box.y}px)`
+ };
+ });
+
requestAnimationFrame(animate);
};
@@ -326,15 +377,26 @@
<div v-for="(box, index) in boxes" :key="index" class="box" :style="box.style"></div>
</div>
<div class="container" style="position: relative;width: 20px;height: 20px;top: 625px;left: 700px;border: 1px solid #000;position: absolute;">
- <div v-for="(box, index) in boxes2" :key="index" class="box1" :style="box.style"></div>
+ <div v-for="(box, index) in boxes2" :key="index" class="box" :style="box.style"></div>
</div>
<!-- 閽㈠寲杩愬姩鑹插潡 -->
<div class="container" style="position: relative;width: 20px;height: 20px;top: 438px;left: 196px;border: 1px solid #000;position: absolute;">
- <div v-for="(box, index) in boxes3" :key="index" class="box1" :style="box.style"></div>
+ <div v-for="(box, index) in boxes3" :key="index" class="box" :style="box.style"></div>
</div>
- <!-- <div class="raw" style="width: 31px;height: 32px;top: 571px;left: 300px;position: absolute;background-color: red;">
- <div v-for="(item,index) in rawGlassStorageDetailList.slice(0,7)" :key="index" :style='"width: "+item.remainQuantity+"px;height: 5px;background-color: red;"'></div>
- </div> -->
+ <div class="container" style="position: relative;width: 20px;height: 20px;top: 355px;left: 496px;border: 1px solid #000;position: absolute;">
+ <div v-for="(box, index) in boxes4" :key="index" class="box" :style="box.style"></div>
+ </div>
+ <!-- 閽㈠寲鍓嶅ぇ鐞嗙墖鑹插潡 -->
+ <div class="container" v-for="(item,index) in bigStorageCageUsage.slice(0,1)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 447px;left: 314px;position: absolute;background-color: red;"'></div>
+ <div class="container" v-for="(item,index) in bigStorageCageUsage.slice(1,2)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 463px;left: 314px;position: absolute;background-color: red;"'></div>
+ <div class="container" v-for="(item,index) in bigStorageCageUsage.slice(2,3)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 478px;left: 314px;position: absolute;background-color: red;"'></div>
+ <div class="container" v-for="(item,index) in bigStorageCageUsage.slice(3,4)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 493px;left: 314px;position: absolute;background-color: red;"'></div>
+ <!-- 涓┖鍓嶅ぇ鐞嗙墖鑹插潡 -->
+ <div class="container" v-for="(item,index) in hollowBigStorageCageUsage.slice(0,1)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 337px;left: 671px;position: absolute;background-color: red;"'></div>
+ <div class="container" v-for="(item,index) in hollowBigStorageCageUsage.slice(1,2)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 353px;left: 671px;position: absolute;background-color: red;"'></div>
+ <div class="container" v-for="(item,index) in hollowBigStorageCageUsage.slice(2,3)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 369px;left: 671px;position: absolute;background-color: red;"'></div>
+ <div class="container" v-for="(item,index) in hollowBigStorageCageUsage.slice(3,4)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 385px;left: 671px;position: absolute;background-color: red;"'></div>
+ <div class="container" v-for="(item,index) in hollowBigStorageCageUsage.slice(4,5)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 401px;left: 671px;position: absolute;background-color: red;"'></div>
</div>
<div class="clickable-area" @click="handlehistorical"
style="position: relative;width: 110px;height: 140px;top: 603px;left: 297px;"></div>
--
Gitblit v1.8.0