From 70f3eaaff56713687a9fcf96910548fed6553da5 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 10 三月 2025 14:06:25 +0800
Subject: [PATCH] 原片仓储新增历史任务弹窗及功能
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 368 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 303 insertions(+), 65 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index d669cbc..9785f41 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -15,22 +15,33 @@
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;
const edgOneTasks = ref([])
const edgTwoTasks = ref([])
const engineeringOne = ref([])
-const engineeringTow = ref([])
+const engineeringTwo = ref([])
const socketUrl1 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreen`;
const handleMessage1 = (data) => {
edgOneTasks.value = data.edgOneTasks[0];
edgTwoTasks.value = data.edgTwoTasks[0];
engineeringOne.value = data.engineeringOne[0];
- engineeringTow.value = data.engineeringTow[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,22 +51,21 @@
const handleMessage2 = (data) => {
temperingTaskType.value = data.temperingTaskType[0];
temperingGlassInfoList.value = data.temperingGlassInfoList[0];
+ if(numBoxes3.value !=temperingTaskType.value){
+ numBoxes3.value =temperingTaskType.value;
+ boxStart3();
+ }
+
};
-const handleBinda = async (row) => {
- blinda.value = true;
- await fetchFlowCardId(row.orderId);
-};
-const fetchFlowCardId = async (orderId) => {
+const tableDatad = ref([]);
+const patternUsage = async () => {
try {
- const response = await request.post('/loadGlass/order/order/selectOrderdetail', {
- orderId: orderId
- })
+ 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);
- tableData.value = response.data;
- console.log(tableData.value);
+ tableDatad.value = response.data;
} else {
ElMessage.error(response.message);
}
@@ -64,13 +74,41 @@
console.error(error);
}
}
+const ptnusage=ref({
+ width: '',
+ height: '',
+ thickness: '',
+ 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) => {
blindb.value = true;
- historical()
+ // historical()
};
// 鍦ㄧ粍浠舵寕杞芥椂璁剧疆榛樿鏃堕棿鑼冨洿
onMounted(() => {
+ boxStart();
+ boxStart2();
+ boxStart3();
+ requestAnimationFrame(animate);
socket = initializeWebSocket(socketUrl, handleMessage);
socket1 = initializeWebSocket(socketUrl1, handleMessage1);
socket2 = initializeWebSocket(socketUrl2, handleMessage2);
@@ -93,17 +131,216 @@
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">
- <img src="../../assets/screen.png" alt="Screen"
- style="max-width: 48%; max-height: 100%; margin-top: 50px; float: left; position: relative;" />
+ <div class="img-screen" alt="Screen">
+ <!-- 閽㈠寲鑹插潡 -->
+ <div v-if="temperingGlassInfoList>0" class="tempering" style="width: 50px;height: 22px;top: 354px;left: 228px;position: absolute;background-color: red;"></div>
+ <div v-if="temperingGlassInfoList>1" class="tempering" style="width: 50px;height: 22px;top: 354px;left: 284px;position: absolute;background-color: red;"></div>
+ <!-- 鍒囧壊鍙拌壊鍧� -->
+ <div v-if="engineeringOne.length>1" class="slicing" style="width: 50px;height: 22px;top: 575px;left: 453px;position: absolute;background-color: red;"></div>
+ <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 / 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>
+ </div> -->
+ </div>
<div class="clickable-area" @click="handlehistorical"
- style="position: relative; width: 175px; height: 240px; top: 570px; left: 310px;"></div>
+ 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"
@@ -111,43 +348,40 @@
<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>
<!-- 鐐瑰嚮涓嬫柟寮圭獥 -->
<el-dialog v-model="blindb" top="10vh" width="90%">
- <div style="display: flex;">
- <el-select
- :placeholder="$t('basicData.coatingtypes')"
- clearable
- style="width: 270px;margin-left: 10px;"
- v-model="taskStat">
- <el-option
- v-for="item in optionsa"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- <!-- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span> -->
- <!-- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
+ <div style="display: flex;">
+ <el-input v-model="ptnusage.width" placeholder="璇疯緭鍏ュ搴�" style="width: 270px;margin-left: 10px;" clearable></el-input>
+ <el-input v-model="ptnusage.height" placeholder="璇疯緭鍏ラ珮搴�" style="width: 270px;margin-left: 10px;" clearable></el-input>
+ <el-input v-model="ptnusage.thickness" placeholder="璇疯緭鍏ュ帤搴�" style="width: 270px;margin-left: 10px;" clearable></el-input>
+ <el-input v-model="ptnusage.films" placeholder="璇疯緭鍏ヨ啘绯�" style="width: 270px;margin-left: 10px;" clearable></el-input>
+ <!-- <el-select :placeholder="$t('basicData.coatingtypes')" clearable style="width: 270px;margin-left: 10px;"
+ v-model="taskStat">
+ <el-option v-for="item in optionsa" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select> -->
+ <!-- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span> -->
+ <!-- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
:end-placeholder="$t('reportmanage.endtime')">
</el-date-picker> -->
- <!-- <el-date-picker
+ <!-- <el-date-picker
v-model="timeRange"
type="datetimerange"
range-separator="鑷�"
@@ -156,43 +390,26 @@
value-format="YYYY-MM-DD hh:mm:ss"
:end-placeholder="$t('reportmanage.endtime')">
</el-date-picker> -->
- <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="patternUsage()">{{
$t('reportmanage.inquire')
}}</el-button>
</div>
<el-table ref="table" style="margin-top: 20px;height: 650px;" :data="tableDatad"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
- <el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
- <el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
- <el-table-column prop="startCell" align="center" :label="$t('processCard.layer')" min-width="120" />
- <el-table-column align="center" :label="$t('film.taskstatus')" min-width="80" prop="taskState">
- <template #default="scope">
- <el-tag :type="getStatusTypeb(scope.row.taskState)">
- {{ getStatusTextb(scope.row.taskState) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column align="center" :label="$t('film.enabletype')" min-width="80" prop="taskType">
- <template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.taskType)">
- {{ getStatusTexta(scope.row.taskType) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="120" />
- <el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
+ <el-table-column prop="patternWidth" align="center" :label="$t('瀹�')" min-width="80" />
+ <el-table-column prop="patternHeight" align="center" :label="$t('楂�')" min-width="80" />
+ <el-table-column prop="patternThickness" align="center" :label="$t('鍘氬害')" min-width="80" />
+ <el-table-column prop="filmsId" align="center" :label="$t('鑶滅郴')" min-width="120" />
+ <el-table-column prop="totalCount" align="center" :label="$t('鎬绘暟閲�')" min-width="120" />
+ <el-table-column prop="count" align="center" :label="$t('绗煎唴鏁伴噺')" min-width="120" />
+ <el-table-column prop="finishCount" align="center" :label="$t('涓婄墖鏁伴噺')" min-width="120" />
+ <el-table-column prop="damageCount" align="center" :label="$t('鐮存崯鏁伴噺')" min-width="120" />
</el-table>
- <template #footer>
- <div id="dialog-footer">
- <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
</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.orderId')" min-width="110" />
+ <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" />
<el-table-column prop="processId" align="center" :label="$t('large.cardnumber')" min-width="110" />
<el-table-column prop="orderNumber" align="center" :label="$t('large.serialnumber')" min-width="110" />
@@ -255,6 +472,23 @@
height: 460px;
}
+.img-screen {
+ max-width: 48%;
+ max-height: 100%;
+ margin-top: 50px;
+ float: left;
+ position: relative;
+ background-image: url('../../assets/screen.png');
+ width: 808px;
+ height: 841px;
+ background-size: contain;
+ background-repeat: no-repeat;
+ background-position: center;
+ /* width: 100%;
+ height: 0;
+ padding-bottom: 50%; */
+}
+
.clickable-area {
cursor: pointer;
/* 鎸囩ず杩欐槸涓�涓彲鐐瑰嚮鐨勫尯鍩� */
@@ -267,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