From 3b69c53a60ba0bf36c44ff500b9f0ca622fef181 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 05 三月 2025 17:03:47 +0800
Subject: [PATCH] 添加大屏订单数据，添加往ERP传输现补数据功能
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 242 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 235 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 4390eac..9785f41 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -15,9 +15,11 @@
let socket = null;
const rawGlassStorageDetailList = ref([])
+const orderDTOS = ref([])
const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/largenScreen`;
const handleMessage = (data) => {
rawGlassStorageDetailList.value = data.rawGlassStorageDetailList[0]
+ orderDTOS.value = data.orderDTOS[0]
};
let socket1 = null;
@@ -31,6 +33,15 @@
edgTwoTasks.value = data.edgTwoTasks[0];
engineeringOne.value = data.engineeringOne[0];
engineeringTwo.value = data.engineeringTwo[0];
+ if(numBoxes.value != edgOneTasks.value.length){
+ numBoxes.value = edgOneTasks.value.length;
+ boxStart();
+ }
+ if(numBoxes2.value != edgTwoTasks.value.length){
+ numBoxes2.value = edgTwoTasks.value.length;
+ boxStart2();
+ }
+
};
let socket2 = null;
@@ -40,7 +51,13 @@
const handleMessage2 = (data) => {
temperingTaskType.value = data.temperingTaskType[0];
temperingGlassInfoList.value = data.temperingGlassInfoList[0];
+ if(numBoxes3.value !=temperingTaskType.value){
+ numBoxes3.value =temperingTaskType.value;
+ boxStart3();
+ }
+
};
+
const tableDatad = ref([]);
const patternUsage = async () => {
@@ -64,6 +81,22 @@
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) => {
@@ -72,6 +105,10 @@
};
// 鍦ㄧ粍浠舵寕杞芥椂璁剧疆榛樿鏃堕棿鑼冨洿
onMounted(() => {
+ boxStart();
+ boxStart2();
+ boxStart3();
+ requestAnimationFrame(animate);
socket = initializeWebSocket(socketUrl, handleMessage);
socket1 = initializeWebSocket(socketUrl1, handleMessage1);
socket2 = initializeWebSocket(socketUrl2, handleMessage2);
@@ -94,9 +131,169 @@
console.log("鍏抽棴浜�")
closeWebSocket();
});
+
+const numBoxes = ref(5);
+const numBoxes2 = ref(5);
+const numBoxes3 = ref(5); // 鍙姩鎬佷慨鏀圭殑 div 鏁伴噺
+const speed = 0.1;
+const maxX = 200; // 缁堢偣X鍧愭爣
+const maxY = -80; // 缁堢偣Y鍧愭爣
+const maxX2 = 250; // 缁堢偣X鍧愭爣
+const maxY2 = -165; // 缁堢偣Y鍧愭爣
+const maxX3 = 100; // 缁堢偣X鍧愭爣
+const maxY3 = -55; // 缁堢偣Y鍧愭爣
+const delayFrames = 600; // 姣忎釜 div 鐨勫欢杩熷抚鏁�
+
+const boxes = ref([]);
+const boxes2 = ref([]);
+const boxes3 = ref([]);
+
+// 鍒濆鍖� div 鏁版嵁
+const boxStart = () => {
+ boxes.value = [];
+ for (let i = 0; i < numBoxes.value; i++) {
+ boxes.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'up',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? 'red' : 'blue',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+}
+}
+const boxStart2 = () => {
+ boxes2.value = [];
+ for (let i = 0; i < numBoxes2.value; i++) {
+ boxes2.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'up',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? 'red' : 'blue',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+}
+}
+
+const boxStart3 = () => {
+ boxes3.value = [];
+ for (let i = 0; i < numBoxes3.value; i++) {
+ boxes3.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'left',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? 'red' : 'blue',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+}
+}
+
+
+
+const animate = () => {
+ boxes.value.forEach((box) => {
+ if (box.delay > 0) {
+ box.delay--;
+ return;
+ }
+
+ if (box.direction === 'up') {
+ box.y -= speed;
+ if (box.y <= maxY) {
+ // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
+ box.direction = 'left';
+ }
+ } else if (box.direction === 'left') {
+ box.x -= speed;
+ if (box.x <= -maxX) {
+ box.x = 0;
+ box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
+ box.direction = 'up';
+ }
+ }
+
+ box.style = {
+ ...box.style,
+ transform: `translate(${box.x}px, ${box.y}px)`
+ };
+ });
+
+ boxes2.value.forEach((box) => {
+ if (box.delay > 0) {
+ box.delay--;
+ return;
+ }
+
+ if (box.direction === 'up') {
+ box.y -= speed;
+ if (box.y <= maxY2) {
+ // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
+ box.direction = 'left';
+ }
+ } else if (box.direction === 'left') {
+ box.x -= speed;
+ if (box.x <= -maxX2) {
+ box.x = 0;
+ box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
+ box.direction = 'up';
+ }
+ }
+ box.style = {
+ ...box.style,
+ transform: `translate(${box.x}px, ${box.y}px)`
+ };
+ });
+
+ boxes3.value.forEach((box) => {
+ if (box.delay > 0) {
+ box.delay--;
+ return;
+ }
+
+ if (box.direction === 'up') {
+ box.y -= speed;
+ if (box.y <= maxY3) {
+ // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
+ box.direction = 'left';
+ box.x = 0;
+ box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
+ }
+ } else if (box.direction === 'left') {
+ box.x -= speed;
+ if (box.x <= -maxX3) {
+
+ box.direction = 'up';
+ }
+ }
+ box.style = {
+ ...box.style,
+ transform: `translate(${box.x}px, ${box.y}px)`
+ };
+ });
+ requestAnimationFrame(animate);
+};
+
</script>
<template>
<div style="height: 500px;">
+
<div class="awatch">
<div class="img-screen" alt="Screen">
<!-- 閽㈠寲鑹插潡 -->
@@ -107,7 +304,33 @@
<div v-if="engineeringTwo.length>1" class="slicing" style="width: 50px;height: 22px;top: 625px;left: 453px;position: absolute;background-color: red;"></div>
<!-- 鍘熺墖浠撳偍鑹插潡 -->
<div class="raw" style="width: 31px;height: 32px;top: 571px;left: 300px;position: absolute;">
- <div v-for="(item,index) in rawGlassStorageDetailList.slice(0,7)" :key="index" :style='"width: "+item.remainQuantity+"px;height: 5px;background-color: red;"'></div>
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(0,7)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <div class="raw" style="width: 31px;height: 47px;top: 610px;left: 300px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(8,17)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <div class="raw" style="width: 31px;height: 13px;top: 675px;left: 300px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(18,20)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <div class="raw" style="width: 31px;height: 22px;top: 657px;left: 370px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(21,25)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <div class="raw" style="width: 31px;height: 9px;top: 561px;left: 370px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(26,27)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <div class="raw" style="width: 31px;height: 9px;top: 612px;left: 370px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(28,29)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <!-- 纾ㄨ竟鑹插潡 -->
+ <div class="container" style="position: relative;width: 20px;height: 20px;top: 572px;left: 645px;border: 1px solid #000;position: absolute;">
+ <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>
+ <!-- 閽㈠寲杩愬姩鑹插潡 -->
+ <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>
<!-- <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>
@@ -117,7 +340,7 @@
style="position: relative;width: 110px;height: 140px;top: 603px;left: 297px;"></div>
</div>
<div style="height: 190px;width: 48%;float: right;">
- <el-table height="500" ref="table" @selection-change="handleSelectionChange" :data="tableDatac"
+ <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" />
<el-table-column prop="customerName" align="center" :show-overflow-tooltip="true"
@@ -125,19 +348,20 @@
<el-table-column prop="project" align="center" :label="$t('large.project')" min-width="50" />
<el-table-column prop="area" align="center" :label="$t('large.are')" min-width="50" />
<el-table-column prop="quantity" align="center" :label="$t('large.quantity')" min-width="50" />
- <el-table-column align="center" :label="$t('large.warehousing')" min-width="50" prop="warehousing">
+ <el-table-column prop="percent" align="center" :label="$t('large.percent')" min-width="50" />
+ <!-- <el-table-column align="center" :label="$t('large.warehousing')" min-width="50" prop="warehousing">
<template #default="scope">
<el-tag :type="getStatusType(scope.row.warehousing)">
{{ getStatusText(scope.row.warehousing) }}
</el-tag>
</template>
- </el-table-column>
- <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="100" />
+ </el-table-column> -->
+ <!-- <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="100" />
<el-table-column fixed="right" :label="$t('large.operate')" align="center" width="100">
<template #default="scope">
<el-button size="mini" type="text" plain @click="handleBinda(scope.row)">{{ $t('large.mes') }}</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</div>
</div>
@@ -183,7 +407,7 @@
</el-table>
</el-dialog>
<el-dialog v-model="blinda" top="5vh" width="85%">
- <el-table height="650" ref="table" @selection-change="handleSelectionChange" :data="tableData"
+ <el-table height="650" ref="table" :data="tableData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="orderId" fixed align="center" :label="$t('large.orderId1')" min-width="110" />
<el-table-column prop="project" align="center" :label="$t('large.project')" min-width="110" />
@@ -277,4 +501,8 @@
/* .awatch{
height: 460px;
/* max-width: 100%; */
+
+.box {
+ transition: transform 0.016s linear;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0