From da318049f50dc33d38d38d8a8393ed1a9b91f7a6 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 9 Nov 2023 14:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=B7=A5=E8=89=BA=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/reset.css | 4 +- src/components/header.vue | 21 +- .../shunhe/LogisticsProcess}/canvas.vue | 47 +- .../index.vue} | 178 ++++-- .../shunhe/LogisticsProcess}/workshop.vue | 594 ++++++++++-------- src/router/index.js | 2 +- 6 files changed, 481 insertions(+), 365 deletions(-) rename src/{components => pages/shunhe/LogisticsProcess}/canvas.vue (62%) rename src/pages/shunhe/{LogisticsProcess.vue => LogisticsProcess/index.vue} (89%) rename src/{components => pages/shunhe/LogisticsProcess}/workshop.vue (67%) diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index ada25e7..cdd533c 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -82,9 +82,7 @@ li { /* 顺安大屏尺寸1920*1200 */ html, body { /* width: 100%; - height: 100%; - min-width: 1440px; - min-height: 1040px; */ + height: 100%; */ width: 1920px; height: 1200px; /* 顺和大屏尺寸 */ diff --git a/src/components/header.vue b/src/components/header.vue index 662f303..7288a69 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -66,16 +66,19 @@ export default { diff --git a/src/components/canvas.vue b/src/pages/shunhe/LogisticsProcess/canvas.vue similarity index 62% rename from src/components/canvas.vue rename to src/pages/shunhe/LogisticsProcess/canvas.vue index a7d7b36..ecec3b4 100644 --- a/src/components/canvas.vue +++ b/src/pages/shunhe/LogisticsProcess/canvas.vue @@ -1,6 +1,6 @@ @@ -10,21 +10,16 @@ export default { data () { return { af: undefined, - // points: [{x1: 650, y1: 885, x2: 650, y2: 852}, {x1: 577, y1: 815, x2: 548, y2: 815}, {x1: 719, y1: 815, x2: 754, y2: 815}, {x1: 305, y1: 560, x2: 305, y2: 545}, {x1: 419, y1: 510, x2: 419, y2: 490}, {x1: 455, y1: 282, x2: 548, y2: 282}, {x1: 830, y1: 395, x2: 830, y2: 474}, {x1: 830, y1: 499, x2: 830, y2: 561}, {x1: 830, y1: 516, x2: 488, y2: 516}, {x1: 488, y1: 516, x2: 488, y2: 560}], - points: [{x1: 305, y1: 560, x2: 305, y2: 545}, {x1: 419, y1: 510, x2: 419, y2: 490}, {x1: 455, y1: 282, x2: 548, y2: 282}, {x1: 830, y1: 395, x2: 830, y2: 474}, {x1: 830, y1: 499, x2: 830, y2: 561}, {x1: 830, y1: 516, x2: 488, y2: 516}, {x1: 488, y1: 516, x2: 488, y2: 560}], - dot1: {x1: 650, y1: 885, x2: 650, y2: 852}, - dot2: {x1: 577, y1: 815, x2: 548, y2: 815}, - dot3: {x1: 719, y1: 815, x2: 754, y2: 815}, - dot4: {x1: 305, y1: 560, x2: 305, y2: 545}, - dot5: {x1: 419, y1: 510, x2: 419, y2: 490}, - dot6: {x1: 455, y1: 282, x2: 548, y2: 282}, - line1: 1, + points: [{x1: 305, y1: 563, x2: 305, y2: 550}, {x1: 419, y1: 514, x2: 419, y2: 494}, {x1: 453, y1: 282, x2: 550, y2: 282}, {x1: 830, y1: 395, x2: 830, y2: 474}, {x1: 830, y1: 499, x2: 830, y2: 563}, {x1: 830, y1: 516, x2: 488, y2: 516}, {x1: 488, y1: 516, x2: 488, y2: 563}], + dot4: {x1: 305, y1: 563, x2: 305, y2: 550}, + dot5: {x1: 419, y1: 514, x2: 419, y2: 494}, + dot6: {x1: 453, y1: 282, x2: 550, y2: 282}, line2: 1, line3: 1, dot7: {x1: 830, y1: 395, x2: 830, y2: 474}, - dot8: {x1: 830, y1: 499, x2: 830, y2: 561}, + dot8: {x1: 830, y1: 499, x2: 830, y2: 563}, dot9: {x1: 830, y1: 516, x2: 488, y2: 516}, - dot10: {x1: 488, y1: 516, x2: 488, y2: 560}, + dot10: {x1: 488, y1: 516, x2: 488, y2: 563}, line4: 1 } }, @@ -62,32 +57,6 @@ export default { let canvas = document.getElementById('myCanvas') let ctx = canvas.getContext('2d') ctx.clearRect(0, 0, canvas.width, canvas.height) - // if (this.line1 === 1) { - // this.dot1.y1 -= 1 - // this.drawPoint(ctx, this.dot1.x1, this.dot1.y1) - // if (this.dot1.y1 === this.dot1.y2) { - // this.dot1.y1 = 885 - // this.line1 = 2 - // } - // } - // if (this.line1 === 2) { - // this.dot2.x1 -= 1 - // this.drawPoint(ctx, this.dot2.x1, this.dot2.y1) - // // this.line1 = 3 - // if (this.dot2.x1 === this.dot2.x2) { - // this.dot2.x1 = 577 - // this.line1 = 3 - // } - // } - // if (this.line1 === 3) { - // this.dot3.x1 += 1 - // this.drawPoint(ctx, this.dot3.x1, this.dot3.y1) - // // this.line1 = 2 - // if (this.dot3.x1 === this.dot3.x2) { - // this.dot3.x1 = 719 - // this.line1 = 1 - // } - // } if (this.line2 === 1) { this.dot4.y1 -= 1 this.drawPoint(ctx, this.dot4.x1, this.dot4.y1) diff --git a/src/pages/shunhe/LogisticsProcess.vue b/src/pages/shunhe/LogisticsProcess/index.vue similarity index 89% rename from src/pages/shunhe/LogisticsProcess.vue rename to src/pages/shunhe/LogisticsProcess/index.vue index 1fafbd1..16c06b0 100644 --- a/src/pages/shunhe/LogisticsProcess.vue +++ b/src/pages/shunhe/LogisticsProcess/index.vue @@ -34,7 +34,7 @@
当日工序生产统计
-
+
混料
@@ -232,9 +232,9 @@