From d62a5f34ef60949ef6bef74fd9c48c20b4e65d83 Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期五, 09 八月 2024 13:19:37 +0800 Subject: [PATCH] 钢化模块旋转更改,下片台 --- UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 1 UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 25 ++++++ UI-Project/package-lock.json | 158 ++++++++++++++++++++++++++++++++------- UI-Project/package.json | 1 UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 38 ++++---- UI-Project/src/views/UnLoadGlass/PrintFlow.vue | 3 6 files changed, 178 insertions(+), 48 deletions(-) diff --git a/UI-Project/package-lock.json b/UI-Project/package-lock.json index d8cc8aa..2dc562d 100644 --- a/UI-Project/package-lock.json +++ b/UI-Project/package-lock.json @@ -23,6 +23,7 @@ "vue-draggable-plus": "^0.5.0", "vue-echarts": "^6.7.3", "vue-i18n": "^9.10.1", + "vue-print-nb": "^1.7.5", "vue-router": "^4.2.4", "vxe-table": "^4.5.15", "xe-utils": "^3.5.14", @@ -46,25 +47,28 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", + "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", + "version": "7.25.3", + "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.25.3.tgz", + "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==", + "dependencies": { + "@babel/types": "^7.25.2" + }, "bin": { "parser": "bin/babel-parser.js" }, @@ -73,12 +77,12 @@ } }, "node_modules/@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.25.2", + "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.25.2.tgz", + "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==", "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-string-parser": "^7.24.8", + "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -1310,6 +1314,21 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "optional": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", @@ -1416,6 +1435,14 @@ "version": "1.15.1", "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.1.tgz", "integrity": "sha512-P5Cjvb0UG1ZVNiDPj/n4V+DinttXG6K8n7vM/HQf0C25K3YKQTQY6fsr/sEGsJGpQ9exmPxluHxKBc0mLKU1lQ==" + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } }, "node_modules/source-map-js": { "version": "1.0.2", @@ -1750,6 +1777,37 @@ "vue": "^3.0.0" } }, + "node_modules/vue-print-nb": { + "version": "1.7.5", + "resolved": "https://registry.npmmirror.com/vue-print-nb/-/vue-print-nb-1.7.5.tgz", + "integrity": "sha512-iNbNyUVRWz0Ha1UTiCKxMPtHLUDGgNI8e8xmD3xqm9RlXIUeX9bT7DgNAfY8vPzqyFRHqGjxLI1rycKH366ziQ==", + "dependencies": { + "vue": "^2.6.11" + } + }, + "node_modules/vue-print-nb/node_modules/@vue/compiler-sfc": { + "version": "2.7.16", + "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz", + "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==", + "dependencies": { + "@babel/parser": "^7.23.5", + "postcss": "^8.4.14", + "source-map": "^0.6.1" + }, + "optionalDependencies": { + "prettier": "^1.18.2 || ^2.0.0" + } + }, + "node_modules/vue-print-nb/node_modules/vue": { + "version": "2.7.16", + "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.16.tgz", + "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==", + "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.", + "dependencies": { + "@vue/compiler-sfc": "2.7.16", + "csstype": "^3.1.0" + } + }, "node_modules/vue-router": { "version": "4.2.5", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.5.tgz", @@ -1848,27 +1906,30 @@ "dev": true }, "@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==" + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", + "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==" }, "@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==" + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==" }, "@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==" + "version": "7.25.3", + "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.25.3.tgz", + "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==", + "requires": { + "@babel/types": "^7.25.2" + } }, "@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.25.2", + "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.25.2.tgz", + "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==", "requires": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-string-parser": "^7.24.8", + "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" } }, @@ -2752,6 +2813,12 @@ "source-map-js": "^1.0.2" } }, + "prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "optional": true + }, "proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", @@ -2816,6 +2883,11 @@ "version": "1.15.1", "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.1.tgz", "integrity": "sha512-P5Cjvb0UG1ZVNiDPj/n4V+DinttXG6K8n7vM/HQf0C25K3YKQTQY6fsr/sEGsJGpQ9exmPxluHxKBc0mLKU1lQ==" + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-js": { "version": "1.0.2", @@ -3014,6 +3086,36 @@ "@vue/devtools-api": "^6.5.0" } }, + "vue-print-nb": { + "version": "1.7.5", + "resolved": "https://registry.npmmirror.com/vue-print-nb/-/vue-print-nb-1.7.5.tgz", + "integrity": "sha512-iNbNyUVRWz0Ha1UTiCKxMPtHLUDGgNI8e8xmD3xqm9RlXIUeX9bT7DgNAfY8vPzqyFRHqGjxLI1rycKH366ziQ==", + "requires": { + "vue": "^2.6.11" + }, + "dependencies": { + "@vue/compiler-sfc": { + "version": "2.7.16", + "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz", + "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==", + "requires": { + "@babel/parser": "^7.23.5", + "postcss": "^8.4.14", + "prettier": "^1.18.2 || ^2.0.0", + "source-map": "^0.6.1" + } + }, + "vue": { + "version": "2.7.16", + "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.16.tgz", + "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==", + "requires": { + "@vue/compiler-sfc": "2.7.16", + "csstype": "^3.1.0" + } + } + } + }, "vue-router": { "version": "4.2.5", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.5.tgz", diff --git a/UI-Project/package.json b/UI-Project/package.json index 3a98cb7..aa27172 100644 --- a/UI-Project/package.json +++ b/UI-Project/package.json @@ -23,6 +23,7 @@ "vue-draggable-plus": "^0.5.0", "vue-echarts": "^6.7.3", "vue-i18n": "^9.10.1", + "vue-print-nb": "^1.7.5", "vue-router": "^4.2.4", "vxe-table": "^4.5.15", "xe-utils": "^3.5.14", diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue index 5a991d4..520c064 100644 --- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue +++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue @@ -39,17 +39,17 @@ heighta = rect.height; } if (rect.angle === 0) { - adjustedWidth = widtha * 0.12; - adjustedHeight = heighta * 0.1; - adjustedWidtha = widtha; - adjustedHeighta = heighta; - newX = 5087 - (rect.yCoordinate + widtha); - } else { adjustedWidth = heighta * 0.12; adjustedHeight = widtha * 0.1; adjustedWidtha = heighta; adjustedHeighta = widtha; newX = 5087 - (rect.yCoordinate + heighta); + } else { + adjustedWidth = widtha * 0.12; + adjustedHeight = heighta * 0.1; + adjustedWidtha = widtha; + adjustedHeighta = heighta; + newX = 5087 - (rect.yCoordinate + widtha); } // if (rect.angle === 0) { // adjustedWidth = heighta * 0.12; @@ -90,17 +90,17 @@ heighta = rect.height; } if (rect.angle === 0) { - adjustedWidth = widtha * 0.12; - adjustedHeight = heighta * 0.1; - adjustedWidtha = widtha; - adjustedHeighta = heighta; - newX = 5087 - (rect.yCoordinate + widtha); - } else { adjustedWidth = heighta * 0.12; adjustedHeight = widtha * 0.1; adjustedWidtha = heighta; adjustedHeighta = widtha; newX = 5087 - (rect.yCoordinate + heighta); + } else { + adjustedWidth = widtha * 0.12; + adjustedHeight = heighta * 0.1; + adjustedWidtha = widtha; + adjustedHeighta = heighta; + newX = 5087 - (rect.yCoordinate + widtha); } // if (rect.angle === 0) { // adjustedWidth = heighta * 0.12; @@ -413,7 +413,7 @@ </div> </el-card> </div> - + <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;"> <el-button type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;"> {{ $t('order.dilapidation') }} @@ -427,8 +427,8 @@ background-color: #529b2e; text-align: center; display: inline-block; - /* align-items:center; */ - /* justify-content:center; */ + /* align-items:center; */ + /* justify-content:center; */ margin-left: 20px; } #boxb{ @@ -437,16 +437,16 @@ /* display:flex; */ text-align: center; display: inline-block; - align-items:center; - justify-content:center; + align-items:center; + justify-content:center; margin-left: 20px; } #box{ border: 1px solid black; background-color: #337ecc; display:flex; - align-items:center; - justify-content:center; + align-items:center; + justify-content:center; } #home-card { width: 100%; diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue index a9139da..12bb518 100644 --- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue +++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue @@ -47,6 +47,7 @@ { x: 140, y: 280, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' } } ]); + watchEffect(() => { // 瑙﹀彂鏁版嵁鍙樺寲鏃堕噸鏂版覆鏌� }); @@ -60,6 +61,7 @@ return rack.x + (rack.width - item.width) / 2; } }; + const calculateItemYPosition = (rack, item, index) => { if (index === 0) { return rack.y + (rack.height - item.height) / 2; @@ -69,9 +71,12 @@ return rack.y + rack.height - item.height; } }; + + const fetchFlowCardId = async () => { try { const response = await request.get('unLoadGlass/downWorkStation/getwo2'); + if (response.code === 200) { console.log(response); // 閬嶅巻鍝嶅簲鏁版嵁骞舵浛鎹acks鏁扮粍涓殑item灞炴�� @@ -86,14 +91,22 @@ height: itemData.item.height === 0 ? "" : 90 }; console.log(itemData.item.fullCardColor); + if (index === 2 && itemData.item.width > 0) { newItem.width = 100; newItem.height = 20; } + rack.item = newItem; + console.log(racks.value); // 鎵撳嵃鏇存柊鍚庣殑 racks 鍊� } }); + + + + + } else { ElMessage.error(response.msg); } @@ -101,11 +114,14 @@ console.error(error); } }; + let socket = null; const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass3`; // 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺 const handleMessage = (data) => { + // 鏇存柊 tableData 鐨勬暟鎹� + data.glassinfo2[0].forEach((itemData, index) => { if (index < racks.value.length) { const rack = racks.value[index]; @@ -117,11 +133,14 @@ height: itemData.item.height === 0 ? "" : 90, downGlassInfoList:itemData.item.downGlassInfoList }; + if (index === 2 && itemData.item.width > 0) { newItem.width = 100; newItem.height = 20; } + rack.item = newItem; + //console.log("鏄剧ず鍥�2",racks.value); // 鎵撳嵃鏇存柊鍚庣殑 racks 鍊� } }); @@ -148,7 +167,9 @@ <td>${info.height}</td> </tr>`; }); + tableContent += '</table>'; + Swal.fire({ title: t('reportWork.glassinformation'), // title: '鐜荤拑淇℃伅', @@ -158,6 +179,7 @@ } }); }; + const showRectInfo = (rack) => { const content = rack.item.content; console.log(rack.item.downGlassInfoList[0].flowCardId) @@ -166,9 +188,12 @@ const downGlassInfoList = rack.item.downGlassInfoList; console.log(downGlassInfoList) showCustomAlert(downGlassInfoList); + } + }; </script> + <style scoped> .glass-rack { /* margin-left: 20px; */ diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue index 7188fdb..594a31e 100644 --- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue +++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue @@ -368,7 +368,8 @@ #printFlowCard { text-align: center; -//font-weight: bolder; height: 600px; +font-weight: bolder; + height: 600px; } #contentTable { diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue index 6f7522a..a538d4b 100644 --- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue +++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue @@ -14,6 +14,7 @@ import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService'; import { WebSocketHost, host } from '@/utils/constants' import PrintFlow from './PrintFlow.vue' +import print from 'fromwe-print-nb' const dialogFormVisiblea = ref(false) const dialogFormVisiblea2 = ref(false) const dialogFormVisibleaDownGlass = ref(false) -- Gitblit v1.8.0