diff --git a/src/assets/js/mork2.js b/src/assets/js/mork2.js index ebd0844..8ad52cb 100644 --- a/src/assets/js/mork2.js +++ b/src/assets/js/mork2.js @@ -564,6 +564,10 @@ export const homepageEquipment = () => { { 'equipment': '码垛机械手5', 'status': '1' + }, + { + 'equipment': '码垛机械手6', + 'status': '1' } ], 'unloadLocation': [ @@ -638,14 +642,6 @@ export const homepageEquipment = () => { { 'equipment': '压机9下料位2', 'status': '3' - }, - { - 'equipment': '压机10下料位1', - 'status': '2' - }, - { - 'equipment': '压机10下料位2', - 'status': '3' } ], 'pressMachine': [ @@ -684,10 +680,6 @@ export const homepageEquipment = () => { { 'equipment': '压机9', 'status': '4' - }, - { - 'equipment': '压机10', - 'status': '1' } ], 'loadLocation': [ @@ -730,6 +722,14 @@ export const homepageEquipment = () => { { 'equipment': '压机10上料位1', 'status': '1' + }, + { + 'equipment': '压机11上料位1', + 'status': '1' + }, + { + 'equipment': '压机12上料位1', + 'status': '1' } ] }, diff --git a/src/components/canvas.vue b/src/components/canvas.vue index 294673f..5be81a2 100644 --- a/src/components/canvas.vue +++ b/src/components/canvas.vue @@ -8,7 +8,8 @@ export default { data () { return { - 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: 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}, @@ -55,32 +56,32 @@ 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.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/components/workshop.vue b/src/components/workshop.vue index b870d53..3ebe2e8 100644 --- a/src/components/workshop.vue +++ b/src/components/workshop.vue @@ -27,12 +27,17 @@
-
+
+
+
+
+
+
-
+
@@ -250,30 +255,30 @@
-
+
-
+
+
+ +
+
+ +
-
- - - - -
@@ -344,22 +337,19 @@
-
+
-
+
-
- -
-
+
@@ -408,7 +398,7 @@
-
+
@@ -487,7 +477,7 @@ export default { conveyorLine: [], gantryRobot: [], kiln: [], - emptyVehicleConveyorLine: {}, + // emptyVehicleConveyorLine: {}, coolingConveyorLine: [], trayStacker: {}, vconveyorLine: [], @@ -517,14 +507,15 @@ export default { res.press.palletizingRobot.map((e, i) => { let loadLocation1 = res.press.loadLocation[2 * i].status let loadLocation2 = res.press.loadLocation[2 * i + 1].status - let pressMachine1 = res.press.pressMachine[2 * i].status - let pressMachine2 = res.press.pressMachine[2 * i + 1].status - let unloadLocation1 = res.press.unloadLocation[4 * i] - let unloadLocation2 = res.press.unloadLocation[4 * i + 1] - let unloadLocation3 = res.press.unloadLocation[4 * i + 2] - let unloadLocation4 = res.press.unloadLocation[4 * i + 3] - this.press.push({equipment: e.equipment, status: e.status, palletizingRobot: e.palletizingRobot, loadLocation1: loadLocation1, loadLocation2: loadLocation2, pressMachine1: pressMachine1, pressMachine2: pressMachine2, unloadLocation: [unloadLocation1, unloadLocation2, unloadLocation3, unloadLocation4]}) + let pressMachine1 = i < 3 ? res.press.pressMachine[2 * i].status : res.press.pressMachine[i + 3].status + let pressMachine2 = i < 3 ? res.press.pressMachine[2 * i + 1].status : '' + let unloadLocation1 = i < 3 ? res.press.unloadLocation[4 * i] : res.press.unloadLocation[4 * i - (i - 3) * 2] + let unloadLocation2 = i < 3 ? res.press.unloadLocation[4 * i + 1] : res.press.unloadLocation[4 * i - (i - 3) * 2 + 1] + let unloadLocation3 = i < 3 ? res.press.unloadLocation[4 * i + 2] : {} + let unloadLocation4 = i < 3 ? res.press.unloadLocation[4 * i + 3] : {} + this.press.push({equipment: e.equipment, status: e.status, palletizingRobot: e.palletizingRobot, loadLocation1: loadLocation1, loadLocation2: loadLocation2, pressMachine1: pressMachine1, pressMachine2: pressMachine2, unloadLocation: i < 3 ? [unloadLocation1, unloadLocation2, unloadLocation3, unloadLocation4] : [unloadLocation1, unloadLocation2]}) }) + console.log(this.press) // 窑前货架 this.frontWarehouse = [...res.frontWarehouse.storageLocation] // 窑后货架 @@ -533,7 +524,7 @@ export default { this.conveyorLine = [...res.dry.conveyorLine] this.gantryRobot = [...res.dry.gantryRobot] this.kiln = [...res.dry.kiln] - this.emptyVehicleConveyorLine = [...res.dry.emptyVehicleConveyorLine][0] + // this.emptyVehicleConveyorLine = [...res.dry.emptyVehicleConveyorLine][0] this.coolingConveyorLine = [...res.dry.coolingConveyorLine] // 托盘输送线 this.trayStacker = [...res.vehicleConveyorLine.trayStacker][0] @@ -662,6 +653,9 @@ export default { _wh(calc(100% + 10px), 90%) .yao_1 left 3% + opacity 0.2 + .yao_layer3 + background-color #bfbfbf .yao_2 left 14% .yao_3 @@ -817,24 +811,29 @@ export default { position absolute left: 5%; top 3% - _wh(28%, 36%) + _wh(28%, 32%) .yj_1600_block_2 left 38% .weilan_1600_wrap _wh(100%, 66%) top auto bottom 0 -.slw_1600_wrap_1 +.slw_1600_wrap _wh(19%, auto) - left: -13%; +.slw_1600_wrap_1 + left: -9%; top: 7%; - transform: rotate(90deg); .slw_1600_wrap_2 - top 26% + left 9% + top 7% +.slw_1600_wrap_3 + left: -9%; + top: 23%; +.slw_1600_wrap_4 + left 9% + top 23% .yj_1600_wrap_1 - _wh(45%, 26%) - left 5% -.yj_1600_wrap_2 + _wh(69%, auto) left auto right 0 .qzj_1600_wrap @@ -849,8 +848,8 @@ export default { top 10% .robot_1600_wrap _wh(1%, 1%) - left: 52%; - top: 70%; + left: 49%; + top: 73%; img position: absolute; width: 5000%; @@ -861,21 +860,15 @@ export default { _wh(17%, auto) .ktp_1600_wrap_1 left: 10%; - top: 37%; + top: 60%; .ktp_1600_wrap_2 left: auto; right: 10%; - top: 37%; -.ktp_1600_wrap_3 - left: 10%; - top: 74%; -.ktp_1600_wrap_4 - left: auto; - right: 10%; - top: 74%; + top: 60%; .yj_1250_block left auto right 1% + opacity 0.2 .yj_2500_block _wh(34%, 52%) left auto @@ -933,7 +926,7 @@ export default { top: -600%; left: -3200%; .ktp_2500_wrap - _wh(12%,auto) + _wh(14%,auto) .ktp_2500_wrap_1 left 10% top 3% @@ -1031,14 +1024,14 @@ export default { left: 61%; top: 57%; box-shadow -5px 5px 8px rgba(0,135,172,0.6) - _wh(18.5%, 16%) + _wh(18.5%, 13%) border-bottom-right-radius 0 .blue_line_2 left: auto right 0 - top: 73% + top: 70% box-shadow -5px 5px 8px rgba(0,135,172,0.6) - _wh(20.5%, 16%) + _wh(20.5%, 19%) border-top-left-radius 0 .rotate_1 animation rotate_1 1.5s linear 1.5s infinite alternate-reverse